diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-27 19:53:55 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-27 19:53:55 +0000 |
commit | 1b4ec7b954ba2d8efae2f383697babe54b795f67 (patch) | |
tree | 4c051c4a8702f4256f83f0e55182e27b2ed5b840 /java/com/android/incallui/calllocation/impl/res/values/styles.xml | |
parent | cae28c6d5c04a79fb058043ce0c3e043e610309a (diff) | |
parent | d637af51091dc86a197da6520484e10a356a421b (diff) |
Merge changes I0f1ed20a,Ia68d3b13,I72047d59,Ieff3c7fb,I53c3896a, ...
* changes:
Added method to set Save and Redo buttons enabled/disabled Added logic to setState() method to change state of buttons
Update emergency call map and device number UI.
Fix SpeedDialUiItem.getDefaultVoiceChannel
Fix an AOSP build error caused by version codes
Update connection label.
Remove redundant version checks and annotations in the assisted dialing package.
Diffstat (limited to 'java/com/android/incallui/calllocation/impl/res/values/styles.xml')
-rw-r--r-- | java/com/android/incallui/calllocation/impl/res/values/styles.xml | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/java/com/android/incallui/calllocation/impl/res/values/styles.xml b/java/com/android/incallui/calllocation/impl/res/values/styles.xml deleted file mode 100644 index 45e9c98d4..000000000 --- a/java/com/android/incallui/calllocation/impl/res/values/styles.xml +++ /dev/null @@ -1,47 +0,0 @@ -<!-- - ~ Copyright (C) 2018 The Android Open Source Project - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License - --> -<resources> - - <style name="LocationAddressTitleTextStyle"> - <item name="android:textSize">14sp</item> - <item name="android:textColor">#dd000000</item> - <item name="android:fontFamily">sans-serif-medium</item> - </style> - - <style name="LocationAddressTextStyle"> - <item name="android:textSize">16sp</item> - <item name="android:textColor">#dd000000</item> - <item name="android:fontFamily">sans-serif</item> - </style> - - <style name="LocationLatLongTextStyle"> - <item name="android:textSize">14sp</item> - <item name="android:textColor">#88000000</item> - <item name="android:fontFamily">sans-serif</item> - </style> - - <style name="LocationLoadingTextStyle"> - <item name="android:textSize">14sp</item> - <item name="android:textColor">#dd000000</item> - <item name="android:fontFamily">sans-serif</item> - </style> - - <style name="LocationErrorTextStyle"> - <item name="android:textSize">14sp</item> - <item name="android:textColor">#dd000000</item> - <item name="android:fontFamily">sans-serif</item> - </style> -</resources> |