diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-23 20:14:25 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-23 20:14:25 +0000 |
commit | 9f99aac66f77e9024b0604288d769b93a4156e4c (patch) | |
tree | c88d2bdb0e11adbbd1a65ee0becfddea46e4ac3f /res/drawable | |
parent | 46d93e5227e18a0f1dbe407262370892c2842f1d (diff) | |
parent | e65c591294e17feac8f18ea4688e95abd2b8f775 (diff) | |
download | android_packages_apps_PackageInstaller-9f99aac66f77e9024b0604288d769b93a4156e4c.tar.gz android_packages_apps_PackageInstaller-9f99aac66f77e9024b0604288d769b93a4156e4c.tar.bz2 android_packages_apps_PackageInstaller-9f99aac66f77e9024b0604288d769b93a4156e4c.zip |
Merge changes Ic0526f31,I1d85d897 into qt-dev
* changes:
Replace references to private APIs
Make it so that the grant dialog's position can be changed
Diffstat (limited to 'res/drawable')
-rw-r--r-- | res/drawable/ic_pin_drop.xml | 4 | ||||
-rw-r--r-- | res/drawable/list_divider.xml | 23 |
2 files changed, 25 insertions, 2 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> |