diff options
author | Svetoslav <svetoslavganov@google.com> | 2015-11-20 15:11:31 -0800 |
---|---|---|
committer | Svetoslav <svetoslavganov@google.com> | 2015-11-20 15:11:31 -0800 |
commit | b11aef442f414e38f76a7faba573683d362b3c0f (patch) | |
tree | 82f59ef7e6bdca86dbdd052e11601a633fac6c4a /res | |
parent | 06225387771dfeb2cb53cc2914ee8ba54ff5bcf6 (diff) | |
parent | 56ac33bf1e57858d0b442dc4cf935aa0c1ddb931 (diff) | |
download | android_packages_apps_PackageInstaller-b11aef442f414e38f76a7faba573683d362b3c0f.tar.gz android_packages_apps_PackageInstaller-b11aef442f414e38f76a7faba573683d362b3c0f.tar.bz2 android_packages_apps_PackageInstaller-b11aef442f414e38f76a7faba573683d362b3c0f.zip |
resolve merge conflicts of 56ac33bf1e to master.
Change-Id: I1439964d551cdc6b829fc99edd8b2c138dc1abf5
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/header_background.xml | 21 | ||||
-rw-r--r-- | res/drawable/ic_dialog_alert_material.xml | 25 | ||||
-rw-r--r-- | res/drawable/ic_more_items.xml | 29 | ||||
-rw-r--r-- | res/layout/app_details.xml | 8 | ||||
-rw-r--r-- | res/layout/grant_permissions.xml | 19 | ||||
-rw-r--r-- | res/layout/header.xml | 15 | ||||
-rw-r--r-- | res/layout/install_confirm.xml | 3 | ||||
-rw-r--r-- | res/layout/permission_description.xml | 5 | ||||
-rw-r--r-- | res/layout/permissions_frame.xml | 4 | ||||
-rw-r--r-- | res/layout/preference_permissions.xml | 2 | ||||
-rw-r--r-- | res/layout/preference_permissions_switch.xml | 2 | ||||
-rw-r--r-- | res/layout/uninstall_confirm.xml | 3 | ||||
-rw-r--r-- | res/values-television/colors.xml | 7 | ||||
-rw-r--r-- | res/values-television/styles.xml | 37 | ||||
-rwxr-xr-x | res/values/colors.xml | 31 | ||||
-rwxr-xr-x | res/values/styles.xml | 31 | ||||
-rw-r--r-- | res/values/themes.xml | 10 |
17 files changed, 141 insertions, 111 deletions
diff --git a/res/drawable/header_background.xml b/res/drawable/header_background.xml deleted file mode 100644 index 77db9e03..00000000 --- a/res/drawable/header_background.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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. ---> - -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?android:attr/colorControlHighlight"> - <item android:drawable="@color/header_background_color" /> -</ripple> - diff --git a/res/drawable/ic_dialog_alert_material.xml b/res/drawable/ic_dialog_alert_material.xml new file mode 100644 index 00000000..8bd2e0ba --- /dev/null +++ b/res/drawable/ic_dialog_alert_material.xml @@ -0,0 +1,25 @@ +<!-- +Copyright (C) 2014 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0" + android:tint="?attr/colorControlNormal"> + <path + android:pathData="M1,21l22,0L12,2L1,21zM13,18l-2,0l0,-2l2,0L13,18zM13,14l-2,0l0,-4l2,0L13,14z" + android:fillColor="@android:color/white"/> +</vector> diff --git a/res/drawable/ic_more_items.xml b/res/drawable/ic_more_items.xml new file mode 100644 index 00000000..5fdcdcef --- /dev/null +++ b/res/drawable/ic_more_items.xml @@ -0,0 +1,29 @@ +<?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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="#000000" + android:pathData="M3 13h2v-2H3v2zm0 4h2v-2H3v2zm0-8h2V7H3v2zm4 4h14v-2H7v2zm0 4h14v-2H7v2zM7 +7v2h14V7H7z" /> + <path + android:pathData="M0 0h24v24H0z" /> +</vector>
\ No newline at end of file diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml index 6a330c74..8f7d2cff 100644 --- a/res/layout/app_details.xml +++ b/res/layout/app_details.xml @@ -4,9 +4,9 @@ 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. @@ -32,7 +32,7 @@ installation screens android:layout_width="32dip" android:layout_height="32dip" android:layout_marginStart="8dip" - android:background="@color/transparent" + android:background="@android:color/transparent" android:layout_alignParentStart="true" android:gravity="start" android:scaleType="centerCrop"/> @@ -61,6 +61,6 @@ installation screens android:layout_width="match_parent" android:layout_height="wrap_content" /> </FrameLayout> - + </RelativeLayout> diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml index b3565240..086a541a 100644 --- a/res/layout/grant_permissions.xml +++ b/res/layout/grant_permissions.xml @@ -18,6 +18,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" > + <LinearLayout android:id="@+id/dialog_container" android:layout_width="fill_parent" @@ -46,7 +47,7 @@ android:visibility="gone"> </CheckBox> - <com.android.internal.widget.ButtonBarLayout + <com.android.packageinstaller.permission.ui.ButtonBarLayout android:id="@+id/button_group" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -62,8 +63,8 @@ android:paddingBottom="4dp" android:paddingEnd="12dp" android:singleLine="true" - style="@android:style/TextAppearance.Material.Body2" - android:textColor="@color/grant_permissions_progress_color" + style="?android:attr/textAppearanceSmall" + android:textColor="?android:attr/textColorSecondary" android:visibility="invisible"> </TextView> @@ -72,14 +73,16 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_weight="1" - android:visibility="invisible" /> + android:visibility="invisible" > + </Space> <Button android:id="@+id/permission_deny_button" android:layout_width="wrap_content" android:layout_height="wrap_content" style="?android:attr/buttonBarButtonStyle" - android:text="@string/grant_dialog_button_deny" /> + android:text="@string/grant_dialog_button_deny" > + </Button> <Button android:id="@+id/permission_allow_button" @@ -87,9 +90,11 @@ android:layout_height="wrap_content" style="?android:attr/buttonBarButtonStyle" android:layout_marginStart="8dip" - android:text="@string/grant_dialog_button_allow" /> + android:text="@string/grant_dialog_button_allow" > + </Button> - </com.android.internal.widget.ButtonBarLayout> + </com.android.packageinstaller.permission.ui.ButtonBarLayout> </LinearLayout> + </com.android.packageinstaller.permission.ui.ManualLayoutFrame> diff --git a/res/layout/header.xml b/res/layout/header.xml index 0e000a4d..f158e442 100644 --- a/res/layout/header.xml +++ b/res/layout/header.xml @@ -17,9 +17,8 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" - android:background="@drawable/header_background" - android:gravity="center_vertical" - android:theme="@style/Theme.Header.Settings" > + android:background="?android:attr/colorPrimary" + android:gravity="center_vertical" > <ImageView android:id="@+id/icon" android:layout_width="@dimen/header_subsettings_margin_start" @@ -31,12 +30,11 @@ android:id="@+id/name" android:layout_height="wrap_content" android:layout_width="match_parent" - android:layout_toStartOf="@+id/app_settings" android:layout_marginStart="@dimen/header_subsettings_margin_start" android:layout_alignWithParentIfMissing="true" android:layout_centerVertical="true" android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@android:color/white" + android:textColor="?android:attr/textColorPrimaryInverse" android:textAlignment="viewStart" /> <ImageView @@ -52,11 +50,4 @@ android:src="@drawable/ic_info" style="?android:attr/borderlessButtonStyle" /> - <View - android:id="@+id/row_divider" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?android:attr/listDivider" /> - </RelativeLayout> - diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml index 86ea1652..72d5e377 100644 --- a/res/layout/install_confirm.xml +++ b/res/layout/install_confirm.xml @@ -31,9 +31,10 @@ android:id="@+id/install_confirm_question" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingStart="16dip" + android:paddingEnd="16dip" android:text="@string/install_confirm_question" android:textAppearance="?android:attr/textAppearanceMedium" - style="@style/padded" android:paddingTop="4dip" /> <ImageView diff --git a/res/layout/permission_description.xml b/res/layout/permission_description.xml index 3f1cf434..c9b60d64 100644 --- a/res/layout/permission_description.xml +++ b/res/layout/permission_description.xml @@ -26,15 +26,14 @@ android:layout_height="36dip" android:layout_marginTop="3dp" android:tint="?android:attr/colorAccent" - android:scaleType="fitCenter" /> + android:scaleType="fitCenter" > + </ImageView> <TextView android:id="@+id/permission_message" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toRightOf="@id/permission_icon" - android:lineSpacingMultiplier="1.024" - android:fontFamily="@*android:string/font_family_body_2_material" android:paddingStart="16dip" android:paddingEnd="8dip" style="?android:attr/textAppearanceMedium"> diff --git a/res/layout/permissions_frame.xml b/res/layout/permissions_frame.xml index 8f1f2789..156af57e 100644 --- a/res/layout/permissions_frame.xml +++ b/res/layout/permissions_frame.xml @@ -30,8 +30,8 @@ android:layout_height="match_parent" android:text="@string/no_permissions" android:gravity="center" - android:textAppearance="@android:style/TextAppearance.Large" - /> + style="?android:attr/textAppearanceLarge"> + </TextView> </FrameLayout> diff --git a/res/layout/preference_permissions.xml b/res/layout/preference_permissions.xml index 67b4469c..631d56bd 100644 --- a/res/layout/preference_permissions.xml +++ b/res/layout/preference_permissions.xml @@ -37,7 +37,7 @@ android:paddingEnd="20dp" android:paddingTop="4dp" android:paddingBottom="4dp"> - <com.android.internal.widget.PreferenceImageView + <com.android.packageinstaller.permission.ui.PreferenceImageView android:id="@android:id/icon" android:layout_width="24dp" android:layout_height="24dp" diff --git a/res/layout/preference_permissions_switch.xml b/res/layout/preference_permissions_switch.xml index cf444d96..78d2a4ef 100644 --- a/res/layout/preference_permissions_switch.xml +++ b/res/layout/preference_permissions_switch.xml @@ -37,7 +37,7 @@ android:paddingEnd="20dp" android:paddingTop="4dp" android:paddingBottom="4dp"> - <com.android.internal.widget.PreferenceImageView + <com.android.packageinstaller.permission.ui.PreferenceImageView android:id="@android:id/icon" android:layout_width="36dp" android:layout_height="36dp" diff --git a/res/layout/uninstall_confirm.xml b/res/layout/uninstall_confirm.xml index f604023f..78270f60 100644 --- a/res/layout/uninstall_confirm.xml +++ b/res/layout/uninstall_confirm.xml @@ -40,9 +40,10 @@ android:id="@+id/activity_text" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingStart="16dip" + android:paddingEnd="16dip" android:textColor="?android:attr/textColorSecondary" android:textAppearance="?android:attr/textAppearanceMedium" - style="@style/padded" android:visibility="gone" /> <!-- The snippet (title & icon) about the application being uninstalled. --> diff --git a/res/values-television/colors.xml b/res/values-television/colors.xml index eb6bfa7d..08209600 100644 --- a/res/values-television/colors.xml +++ b/res/values-television/colors.xml @@ -15,6 +15,13 @@ --> <resources> + + <color name="lb_content_title_text_color">#FFF1F1F1</color> + <color name="lb_content_breadcrumb_text_color">#88F1F1F1</color> + <color name="lb_content_description_text_color">#88F1F1F1</color> + <color name="lb_action_fragment_background">#FF111111</color> + <color name="lb_dialog_activity_background">#77000000</color> + <color name="grant_permissions_background_color">#ff263238</color> <color name="grant_permissions_app_color">@color/grant_permissions_white_text_alpha_100</color> <color name="grant_permissions_progress_color">@color/grant_permissions_white_text_alpha_100</color> diff --git a/res/values-television/styles.xml b/res/values-television/styles.xml new file mode 100644 index 00000000..5f712f7d --- /dev/null +++ b/res/values-television/styles.xml @@ -0,0 +1,37 @@ +<?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. +--> + +<resources> + + <style name="PreferenceThemeOverlay.v14.Permissions"> + <item name="preferenceStyle">@style/Preference.Permissions</item> + <item name="preferenceCategoryStyle">@style/Preference.Category.Permissions</item> + <item name="switchPreferenceStyle">@style/Preference.SwitchPreference.Permissions</item> + </style> + + <style name="Preference.Permissions"> + <item name="layout">@layout/preference_permissions</item> + </style> + + <style name="Preference.Category.Permissions"> + <item name="layout">@layout/preference_category_material</item> + </style> + + <style name="Preference.SwitchPreference.Permissions"> + <item name="layout">@layout/preference_permissions_switch</item> + </style> + +</resources> diff --git a/res/values/colors.xml b/res/values/colors.xml deleted file mode 100755 index 549f55fd..00000000 --- a/res/values/colors.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 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> - <color name="shadow">#cc222222</color> - <color name="transparent">#00000000</color> - <color name="header_background_color">#ff37474f</color> - <color name="grant_permissions_app_color">@*android:color/primary_text_default_material_light</color> - <color name="grant_permissions_progress_color">#60000000</color> - - <color name="lb_content_title_text_color">#FFF1F1F1</color> - <color name="lb_content_breadcrumb_text_color">#88F1F1F1</color> - <color name="lb_content_description_text_color">#88F1F1F1</color> - <color name="lb_action_fragment_background">#FF111111</color> - <color name="lb_dialog_activity_background">#77000000</color> - -</resources> - diff --git a/res/values/styles.xml b/res/values/styles.xml index 9c166971..7f6a4693 100755 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -15,37 +15,22 @@ --> <resources> - <style name="padded"> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - </style> - <style name="Theme.DialogWhenLarge" parent="@android:style/Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar"/> - <style name="Theme.AlertDialogActivity" parent="@android:style/Theme.DeviceDefault.Light.Panel"> - <item name="android:backgroundDimEnabled">true</item> - </style> - - <style name="Theme.Header.Settings" parent="@android:style/Theme.DeviceDefault.Settings"> - </style> - <style name="PreferenceThemeOverlay.v14.Permissions"> - <item name="preferenceStyle">@style/Preference.Permissions</item> - <item name="preferenceCategoryStyle">@style/Preference.Category.Permissions</item> - <item name="switchPreferenceStyle">@style/Preference.SwitchPreference.Permissions</item> + <style name="Theme.DialogWhenLarge" + parent="@android:style/Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar"> </style> - <style name="Preference.Permissions"> - <item name="layout">@layout/preference_permissions</item> - </style> - - <style name="Preference.Category.Permissions"> - <item name="layout">@layout/preference_category_material</item> + <style name="Theme.AlertDialogActivity" + parent="@android:style/Theme.DeviceDefault.Light.Panel"> + <item name="android:backgroundDimEnabled">true</item> </style> - <style name="Preference.SwitchPreference.Permissions"> - <item name="layout">@layout/preference_permissions_switch</item> + <style name="Theme.Header.Settings" + parent="@android:style/Theme.DeviceDefault.Settings"> </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 29565941..026c77fa 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -16,11 +16,13 @@ --> <resources> - <style name="Settings" parent="@android:style/Theme.DeviceDefault.Settings"> - <item name="android:actionBarStyle">@style/ActionBar</item> - <item name="preferenceTheme">@android:style/Theme.DeviceDefault.Settings</item> + + <style name="Settings" + parent="@android:style/Theme.DeviceDefault.Settings"> </style> <style name="GrantPermissions" - parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar" /> + parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"> + </style> + </resources> |