diff options
author | Evan Severson <evanseverson@google.com> | 2019-04-19 11:01:46 -0700 |
---|---|---|
committer | Evan Severson <evanseverson@google.com> | 2019-04-23 11:23:40 -0700 |
commit | e65c591294e17feac8f18ea4688e95abd2b8f775 (patch) | |
tree | 41d07d3497d74c2c1b88b76ab239ab00d4c5a7f4 /res | |
parent | c04ff2e3f25b4c2bafd2098a99f634f3f23e0185 (diff) | |
download | android_packages_apps_PackageInstaller-e65c591294e17feac8f18ea4688e95abd2b8f775.tar.gz android_packages_apps_PackageInstaller-e65c591294e17feac8f18ea4688e95abd2b8f775.tar.bz2 android_packages_apps_PackageInstaller-e65c591294e17feac8f18ea4688e95abd2b8f775.zip |
Replace references to private APIs
This does not touch car
Test: Build and compare before/after screenshots of affected components
Bug: 130871088
Bug: 124489023
Change-Id: Ic0526f31941dc22f08a0e6d11a03e03c030d2cc8
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/ic_pin_drop.xml | 4 | ||||
-rw-r--r-- | res/drawable/list_divider.xml | 23 | ||||
-rw-r--r-- | res/values-h720dp/dimens.xml | 20 | ||||
-rw-r--r-- | res/values-night/themes.xml | 2 | ||||
-rw-r--r-- | res/values/colors.xml | 1 | ||||
-rw-r--r-- | res/values/dimens.xml | 5 | ||||
-rw-r--r-- | res/values/overlayable.xml | 4 | ||||
-rw-r--r-- | res/values/styles.xml | 8 | ||||
-rw-r--r-- | res/values/themes.xml | 4 |
9 files changed, 62 insertions, 9 deletions
diff --git a/res/drawable/ic_pin_drop.xml b/res/drawable/ic_pin_drop.xml index ceb32598..f28de800 100644 --- a/res/drawable/ic_pin_drop.xml +++ b/res/drawable/ic_pin_drop.xml @@ -21,9 +21,9 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="@*android:color/system_notification_accent_color" + android:fillColor="@color/system_notification_accent_color" android:pathData="M12,4c1.93,0 5,1.4 5,5.15 0,2.16 -1.72,4.67 -5,7.32 -3.28,-2.65 -5,-5.17 -5,-7.32C7,5.4 10.07,4 12,4m0,-2C8.73,2 5,4.46 5,9.15c0,3.12 2.33,6.41 7,9.85 4.67,-3.44 7,-6.73 7,-9.85C19,4.46 15.27,2 12,2z"/> <path - android:fillColor="@*android:color/system_notification_accent_color" + android:fillColor="@color/system_notification_accent_color" android:pathData="M12,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2a2,2 0,1 0,0 -4zM5,20h14v2H5v-2z"/> </vector> diff --git a/res/drawable/list_divider.xml b/res/drawable/list_divider.xml new file mode 100644 index 00000000..f9dc5510 --- /dev/null +++ b/res/drawable/list_divider.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2019 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. +--> + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:tint="?android:attr/colorForeground"> + <solid android:color="#1f000000" /> + <size + android:height="1dp" + android:width="1dp" /> +</shape> diff --git a/res/values-h720dp/dimens.xml b/res/values-h720dp/dimens.xml new file mode 100644 index 00000000..fd6407dd --- /dev/null +++ b/res/values-h720dp/dimens.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2019 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> + <!-- Dialog button bar height --> + <dimen name="alert_dialog_button_bar_height">54dp</dimen> +</resources> diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml index 0d82b0d2..1ee2d374 100644 --- a/res/values-night/themes.xml +++ b/res/values-night/themes.xml @@ -26,12 +26,12 @@ <!-- The following attributes change the behavior of the dialog, hence they should not be themed --> <item name="android:windowIsTranslucent">true</item> - <item name="android:windowCloseOnTouchOutside">@*android:bool/config_closeDialogWhenTouchOutside</item> </style> <style name="Theme.PermissionGrantDialog" parent="@android:style/Theme.DeviceDefault.Dialog"> <item name="android:colorBackground">@color/google_grey_800</item> + <item name="android:divider">@drawable/list_divider</item> </style> <style name="PermissionDialog" diff --git a/res/values/colors.xml b/res/values/colors.xml index cf9562fc..a5e85e16 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -18,4 +18,5 @@ <resources> <color name="bigIconColor">#C8CCCE</color> <color name="google_grey_800">#3C4043</color> + <color name="system_notification_accent_color">#ff607D8B</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index ecdf6dc6..bac131a6 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -45,6 +45,11 @@ <dimen name="wear_permission_review_pref_padding">8dp</dimen> <dimen name="wear_permission_review_icon_size">24dp</dimen> + <!-- Dialog button bar width --> + <dimen name="alert_dialog_button_bar_width">64dp</dimen> + <!-- Dialog button bar height --> + <dimen name="alert_dialog_button_bar_height">48dp</dimen> + <!-- Incident report confirmation --> <dimen name="incident_image_width">150dp</dimen> <dimen name="incident_image_height">200dp</dimen> diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml index 4021e618..3ccbacbe 100644 --- a/res/values/overlayable.xml +++ b/res/values/overlayable.xml @@ -186,6 +186,10 @@ <item type="style" name="AccessibilityServiceDialogItemSummary" /> <!-- END ACCESSIBILITY SERVICE DIALOG ITEM --> + <!-- START LOCATION ACCESS CHECK PIN DROP --> + <item type="color" name="system_notification_accent_color" /> + <!-- END LOCATION ACCESS CHECK PIN DROP --> + <!-- START SETTINGSLIB BARCHARTPREFERENCE --> <item type="style" name="SettingsBarChart" /> <item type="style" name="SettingsBarChartTitle" /> diff --git a/res/values/styles.xml b/res/values/styles.xml index bc91f0dd..9da063d7 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -36,7 +36,6 @@ <item name="android:layout_height">wrap_content</item> <item name="android:background">?android:attr/windowBackground</item> <item name="android:orientation">vertical</item> - <item name="android:divider">@*android:drawable/list_divider_material</item> <item name="android:showDividers">middle</item> </style> @@ -84,7 +83,6 @@ <item name="android:layout_width">match_parent</item> <item name="android:layout_height">wrap_content</item> <item name="android:orientation">vertical</item> - <item name="android:divider">@*android:drawable/list_divider_material</item> <item name="android:showDividers">middle</item> </style> @@ -95,7 +93,7 @@ </style> <style name="PermissionGrantButton" - parent="@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog"> + parent="@android:style/Widget.DeviceDefault.Button.Borderless.Colored"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">56dp</item> <item name="android:paddingLeft">8dp</item> @@ -175,7 +173,9 @@ </style> <style name="PermissionReviewButton" - parent="@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog"> + parent="@android:style/Widget.DeviceDefault.Button.Borderless.Colored"> + <item name="android:minWidth">@dimen/alert_dialog_button_bar_width</item> + <item name="android:minHeight">@dimen/alert_dialog_button_bar_height</item> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> </style> diff --git a/res/values/themes.xml b/res/values/themes.xml index 3eb00b4e..4dd6e326 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -23,7 +23,7 @@ <item name="preferenceCategoryTitleTextAppearance">@style/TextAppearance.CategoryTitle</item> </style> <style name="TextAppearance.CategoryTitle" - parent="@*android:style/TextAppearance.DeviceDefault.Body2"> + parent="@android:style/TextAppearance.DeviceDefault.Medium"> <item name="android:textAllCaps">true</item> <item name="android:textSize">11sp</item> <!-- 0.8 Spacing, 0.8/11 = 0.072727273 --> @@ -49,7 +49,6 @@ <!-- The following attributes change the behavior of the dialog, hence they should not be themed --> <item name="android:windowIsTranslucent">true</item> - <item name="android:windowCloseOnTouchOutside">@*android:bool/config_closeDialogWhenTouchOutside</item> </style> <style name="Header.Settings" @@ -72,6 +71,7 @@ <style name="Theme.PermissionGrantDialog" parent="@android:style/Theme.DeviceDefault.Light.Dialog"> + <item name="android:divider">@drawable/list_divider</item> </style> <style name="PermissionDialog" |