diff options
author | Jason Monk <jmonk@google.com> | 2015-06-12 14:07:56 -0400 |
---|---|---|
committer | Jason Monk <jmonk@google.com> | 2015-06-12 14:10:48 -0400 |
commit | f589a098e175c9779aa4ba9d4c40eea6cdafde2e (patch) | |
tree | a71a756894be9adad7649ce0d98481a44b7319ae /res | |
parent | cd71d9aeabac2e7d5de7a5c84f09d4681411ebb4 (diff) | |
download | android_packages_apps_PackageInstaller-f589a098e175c9779aa4ba9d4c40eea6cdafde2e.tar.gz android_packages_apps_PackageInstaller-f589a098e175c9779aa4ba9d4c40eea6cdafde2e.tar.bz2 android_packages_apps_PackageInstaller-f589a098e175c9779aa4ba9d4c40eea6cdafde2e.zip |
Permissions theme fixing
- Mostly just paddings a whatnot for preferences.
- Also fix additional permissions screen (and its back arrow).
- Keep ManagePermissions preferences around so that summary reloads
aren't as painful on resume.
Bug: 21636268
Bug: 21642971
Change-Id: Ibeb96ce63017c90fc37a661a6d82218b57371fb3
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/preference.xml | 79 | ||||
-rw-r--r-- | res/layout/preference_app.xml | 79 | ||||
-rwxr-xr-x | res/values/styles.xml | 8 | ||||
-rw-r--r-- | res/values/themes.xml | 5 |
4 files changed, 170 insertions, 1 deletions
diff --git a/res/layout/preference.xml b/res/layout/preference.xml new file mode 100644 index 00000000..4f941f79 --- /dev/null +++ b/res/layout/preference.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> + +<!-- Based off frameworks/base/core/res/res/layout/preference_material.xml + except that this has the negative margin on the image removed + and has a set icon size (and some padding to realign). --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeightSmall" + android:gravity="center_vertical" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:background="?android:attr/activatedBackgroundIndicator" + android:clipToPadding="false"> + + <LinearLayout + android:id="@*android:id/icon_frame" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="start|center_vertical" + android:orientation="horizontal" + android:paddingEnd="32dp" + android:paddingTop="4dp" + android:paddingBottom="4dp"> + <com.android.internal.widget.PreferenceImageView + android:id="@android:id/icon" + android:layout_width="24dp" + android:layout_height="24dp" + android:scaleType="fitCenter" /> + </LinearLayout> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingTop="16dp" + android:paddingBottom="16dp"> + + <TextView android:id="@android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceListItem" + android:ellipsize="marquee" /> + + <TextView android:id="@android:id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@android:id/title" + android:layout_alignStart="@android:id/title" + android:textAppearance="?android:attr/textAppearanceListItemSecondary" + android:textColor="?android:attr/textColorSecondary" + android:maxLines="10" /> + + </RelativeLayout> + + <!-- Preference should place its actual preference widget here. --> + <LinearLayout android:id="@android:id/widget_frame" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="end|center_vertical" + android:paddingStart="16dp" + android:orientation="vertical" /> + +</LinearLayout> diff --git a/res/layout/preference_app.xml b/res/layout/preference_app.xml new file mode 100644 index 00000000..8dc8464e --- /dev/null +++ b/res/layout/preference_app.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> + +<!-- Based off frameworks/base/core/res/res/layout/preference_material.xml + except that this has the negative margin on the image removed + and has a set icon size (and some padding to align). --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeightSmall" + android:gravity="center_vertical" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:background="?android:attr/activatedBackgroundIndicator" + android:clipToPadding="false"> + + <LinearLayout + android:id="@*android:id/icon_frame" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="start|center_vertical" + android:orientation="horizontal" + android:paddingEnd="20dp" + android:paddingTop="4dp" + android:paddingBottom="4dp"> + <com.android.internal.widget.PreferenceImageView + android:id="@android:id/icon" + android:layout_width="36dp" + android:layout_height="36dp" + android:scaleType="fitCenter" /> + </LinearLayout> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingTop="16dp" + android:paddingBottom="16dp"> + + <TextView android:id="@android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceListItem" + android:ellipsize="marquee" /> + + <TextView android:id="@android:id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@android:id/title" + android:layout_alignStart="@android:id/title" + android:textAppearance="?android:attr/textAppearanceListItemSecondary" + android:textColor="?android:attr/textColorSecondary" + android:maxLines="10" /> + + </RelativeLayout> + + <!-- Preference should place its actual preference widget here. --> + <LinearLayout android:id="@android:id/widget_frame" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="end|center_vertical" + android:paddingStart="16dp" + android:orientation="vertical" /> + +</LinearLayout> diff --git a/res/values/styles.xml b/res/values/styles.xml index c67f043a..888f9d02 100755 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -26,4 +26,12 @@ <style name="Theme.Header.Settings" parent="@android:style/Theme.Material.Settings"> </style> + + <style name="Preference"> + <item name="android:layout">@layout/preference</item> + </style> + + <style name="ActionBar" parent="@android:style/Widget.Material.ActionBar.Solid"> + <item name="android:contentInsetStart">72dp</item> + </style> </resources> diff --git a/res/values/themes.xml b/res/values/themes.xml index 9e8f0298..83ca6ebb 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -16,7 +16,10 @@ --> <resources> - <style name="Settings" parent="@android:style/Theme.Material.Settings" /> + <style name="Settings" parent="@android:style/Theme.Material.Settings"> + <item name="android:actionBarStyle">@style/ActionBar</item> + <item name="@*android:preferenceStyle">@style/Preference</item> + </style> <style name="GrantPermissions" parent="@android:style/Theme.Material.DayNight.Dialog.NoActionBar" /> |