diff options
author | Eric Erfanian <erfanian@google.com> | 2017-06-08 00:59:55 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-08 00:59:55 +0000 |
commit | c67d658e7daa453fe9ad9fd1a37f81eaf2048c44 (patch) | |
tree | b9bbc285430ffb5363a70eb27e382c38f5a85b7a /java/com/android/dialer/theme/res/values | |
parent | 75233ff03785f24789b32039ac2c208805b7e506 (diff) | |
parent | 274b6d320edb3c33e7b3a95c43a811829486a777 (diff) |
Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47
am: 274b6d320e
Change-Id: Iecf4325f314bf6c3324187e6406c8aae4675dd63
Diffstat (limited to 'java/com/android/dialer/theme/res/values')
-rw-r--r-- | java/com/android/dialer/theme/res/values/strings.xml | 6 | ||||
-rw-r--r-- | java/com/android/dialer/theme/res/values/themes.xml | 43 |
2 files changed, 49 insertions, 0 deletions
diff --git a/java/com/android/dialer/theme/res/values/strings.xml b/java/com/android/dialer/theme/res/values/strings.xml index a14693f51..af61d3596 100644 --- a/java/com/android/dialer/theme/res/values/strings.xml +++ b/java/com/android/dialer/theme/res/values/strings.xml @@ -30,6 +30,12 @@ used in the Launcher icon. --> <string name="launcherActivityLabel">Phone</string> + <!-- Text presented to the user explaining that we have enabled the camera permission automatically --> + <string name="camera_privacy_text">Camera permission enabled</string> + + <!-- text on a button, Video call, as in to place a video call. --> + <string name="video_call">Video call</string> + <!-- Label shown on the 'positive' button for the dialog. Indicates that the call will proceed --> <string name="call">Call</string> </resources> diff --git a/java/com/android/dialer/theme/res/values/themes.xml b/java/com/android/dialer/theme/res/values/themes.xml index 0d0c45f90..124682692 100644 --- a/java/com/android/dialer/theme/res/values/themes.xml +++ b/java/com/android/dialer/theme/res/values/themes.xml @@ -1,4 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2017 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="DialerThemeBase" parent="@style/Theme.AppCompat.Light.DarkActionBar"> @@ -19,6 +34,20 @@ <item name="actionBarSize">@dimen/action_bar_height</item> </style> + <!-- Should be kept in sync with the theme above (minus anything related to actionbars --> + <style name="DialerThemeBase.NoActionBar" parent="@style/Theme.AppCompat.Light.NoActionBar"> + <item name="android:textColorPrimary">@color/dialer_primary_text_color</item> + <item name="android:textColorSecondary">@color/dialer_secondary_text_color</item> + <!-- This is used for title bar color in recents --> + <item name="android:colorPrimary">@color/titlebar_in_recents_background_color</item> + <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item> + <item name="android:colorControlActivated">@color/dialer_theme_color</item> + <item name="android:colorButtonNormal">@color/dialer_theme_color</item> + <item name="android:colorAccent">@color/dialtacts_theme_color</item> + <item name="android:alertDialogTheme">@style/AlertDialogTheme</item> + <item name="android:textAppearanceButton">@style/DialerButtonTextStyle</item> + </style> + <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar"> <item name="android:windowNoTitle">true</item> <item name="android:windowBackground">@android:color/transparent</item> @@ -26,4 +55,18 @@ <item name="android:windowIsTranslucent">true</item> <item name="android:windowAnimationStyle">@android:style/Animation</item> </style> + + <style name="PrimaryText"> + <item name="android:textColor">#DE000000</item> + <item name="android:textSize">16sp</item> + <item name="android:ellipsize">end</item> + <item name="android:maxLines">1</item> + </style> + + <style name="SecondaryText"> + <item name="android:textColor">#8A000000</item> + <item name="android:textSize">14sp</item> + <item name="android:ellipsize">end</item> + <item name="android:maxLines">1</item> + </style> </resources> |