diff options
author | Anthony Hugh <ahugh@google.com> | 2015-08-21 23:32:37 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 23:32:37 +0000 |
commit | bbe5db6b8a4ab15a546902ca72dd912496129a2e (patch) | |
tree | 92ec5805ed0bcdbc0a42ffb7ef0c125d2d313464 /res | |
parent | a9f955d2cc04fe944c39e53e3e9f062883225522 (diff) | |
parent | 9478120abc48a8934e5de14f7cf49342cef5485c (diff) | |
download | android_packages_apps_PackageInstaller-bbe5db6b8a4ab15a546902ca72dd912496129a2e.tar.gz android_packages_apps_PackageInstaller-bbe5db6b8a4ab15a546902ca72dd912496129a2e.tar.bz2 android_packages_apps_PackageInstaller-bbe5db6b8a4ab15a546902ca72dd912496129a2e.zip |
am 9478120a: Implement base version of GrantPermissions dialog
* commit '9478120abc48a8934e5de14f7cf49342cef5485c':
Implement base version of GrantPermissions dialog
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-watch-280dpi/ic_cc_cancel.png | bin | 0 -> 14774 bytes | |||
-rw-r--r-- | res/drawable-watch-280dpi/ic_cc_checkmark.png | bin | 0 -> 14840 bytes | |||
-rw-r--r-- | res/drawable-watch-hdpi/ic_cc_cancel.png | bin | 0 -> 678 bytes | |||
-rw-r--r-- | res/drawable-watch-hdpi/ic_cc_checkmark.png | bin | 0 -> 760 bytes | |||
-rw-r--r-- | res/drawable-watch-mdpi/ic_cc_cancel.png | bin | 0 -> 535 bytes | |||
-rw-r--r-- | res/drawable-watch-mdpi/ic_cc_checkmark.png | bin | 0 -> 612 bytes | |||
-rw-r--r-- | res/drawable-watch-xhdpi/ic_cc_cancel.png | bin | 0 -> 312 bytes | |||
-rw-r--r-- | res/drawable-watch-xhdpi/ic_cc_checkmark.png | bin | 0 -> 421 bytes | |||
-rw-r--r-- | res/drawable-watch/action_negative_bg.xml | 21 | ||||
-rw-r--r-- | res/drawable-watch/action_positive_bg.xml | 21 | ||||
-rw-r--r-- | res/drawable-watch/cancel_button.xml | 7 | ||||
-rw-r--r-- | res/drawable-watch/confirm_button.xml | 7 | ||||
-rw-r--r-- | res/layout-watch/grant_permissions.xml | 121 | ||||
-rw-r--r-- | res/values-watch/colors.xml | 29 | ||||
-rw-r--r-- | res/values-watch/dimens.xml | 28 | ||||
-rw-r--r-- | res/values-watch/strings.xml | 29 | ||||
-rw-r--r-- | res/values-watch/themes.xml | 67 |
17 files changed, 330 insertions, 0 deletions
diff --git a/res/drawable-watch-280dpi/ic_cc_cancel.png b/res/drawable-watch-280dpi/ic_cc_cancel.png Binary files differnew file mode 100644 index 00000000..249b8697 --- /dev/null +++ b/res/drawable-watch-280dpi/ic_cc_cancel.png diff --git a/res/drawable-watch-280dpi/ic_cc_checkmark.png b/res/drawable-watch-280dpi/ic_cc_checkmark.png Binary files differnew file mode 100644 index 00000000..94db9ab0 --- /dev/null +++ b/res/drawable-watch-280dpi/ic_cc_checkmark.png diff --git a/res/drawable-watch-hdpi/ic_cc_cancel.png b/res/drawable-watch-hdpi/ic_cc_cancel.png Binary files differnew file mode 100644 index 00000000..a57893e1 --- /dev/null +++ b/res/drawable-watch-hdpi/ic_cc_cancel.png diff --git a/res/drawable-watch-hdpi/ic_cc_checkmark.png b/res/drawable-watch-hdpi/ic_cc_checkmark.png Binary files differnew file mode 100644 index 00000000..29f9ecd9 --- /dev/null +++ b/res/drawable-watch-hdpi/ic_cc_checkmark.png diff --git a/res/drawable-watch-mdpi/ic_cc_cancel.png b/res/drawable-watch-mdpi/ic_cc_cancel.png Binary files differnew file mode 100644 index 00000000..87fc65ab --- /dev/null +++ b/res/drawable-watch-mdpi/ic_cc_cancel.png diff --git a/res/drawable-watch-mdpi/ic_cc_checkmark.png b/res/drawable-watch-mdpi/ic_cc_checkmark.png Binary files differnew file mode 100644 index 00000000..0989daa6 --- /dev/null +++ b/res/drawable-watch-mdpi/ic_cc_checkmark.png diff --git a/res/drawable-watch-xhdpi/ic_cc_cancel.png b/res/drawable-watch-xhdpi/ic_cc_cancel.png Binary files differnew file mode 100644 index 00000000..fec6ecb8 --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_cc_cancel.png diff --git a/res/drawable-watch-xhdpi/ic_cc_checkmark.png b/res/drawable-watch-xhdpi/ic_cc_checkmark.png Binary files differnew file mode 100644 index 00000000..f98cc1ec --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_cc_checkmark.png diff --git a/res/drawable-watch/action_negative_bg.xml b/res/drawable-watch/action_negative_bg.xml new file mode 100644 index 00000000..f1c33b54 --- /dev/null +++ b/res/drawable-watch/action_negative_bg.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_enabled="false"> + <shape android:shape="oval"> + <solid android:color="@color/circular_button_disabled"/> + <size android:width="40dp" android:height="40dp" /> + </shape> + </item> + <item android:state_pressed="true"> + <shape android:shape="oval"> + <solid android:color="#757575"/> + <size android:width="40dp" android:height="40dp" /> + </shape> + </item> + <item> + <shape android:shape="oval"> + <solid android:color="#BDBDBD"/> + <size android:width="40dp" android:height="40dp" /> + </shape> + </item> +</selector> diff --git a/res/drawable-watch/action_positive_bg.xml b/res/drawable-watch/action_positive_bg.xml new file mode 100644 index 00000000..bc3e88ba --- /dev/null +++ b/res/drawable-watch/action_positive_bg.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_enabled="false"> + <shape android:shape="oval"> + <solid android:color="@color/circular_button_disabled"/> + <size android:width="40dp" android:height="40dp" /> + </shape> + </item> + <item android:state_pressed="true"> + <shape android:shape="oval"> + <solid android:color="#009688"/> + <size android:width="40dp" android:height="40dp" /> + </shape> + </item> + <item> + <shape android:shape="oval"> + <solid android:color="#00BFA5"/> + <size android:width="40dp" android:height="40dp" /> + </shape> + </item> +</selector> diff --git a/res/drawable-watch/cancel_button.xml b/res/drawable-watch/cancel_button.xml new file mode 100644 index 00000000..5b16f549 --- /dev/null +++ b/res/drawable-watch/cancel_button.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > + <item android:drawable="@drawable/action_negative_bg" /> + <item> + <bitmap android:src="@drawable/ic_cc_cancel" android:gravity="center" /> + </item> +</layer-list> diff --git a/res/drawable-watch/confirm_button.xml b/res/drawable-watch/confirm_button.xml new file mode 100644 index 00000000..6a895ec6 --- /dev/null +++ b/res/drawable-watch/confirm_button.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > + <item android:drawable="@drawable/action_positive_bg" /> + <item> + <bitmap android:src="@drawable/ic_cc_checkmark" android:gravity="center" /> + </item> +</layer-list> diff --git a/res/layout-watch/grant_permissions.xml b/res/layout-watch/grant_permissions.xml new file mode 100644 index 00000000..2d567068 --- /dev/null +++ b/res/layout-watch/grant_permissions.xml @@ -0,0 +1,121 @@ +<?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. +--> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/confirmation" + android:layout_width="match_parent" + android:layout_height="match_parent" + > + + <ScrollView + android:id="@+id/scrolling_container" + android:overScrollMode="never" + android:scrollbars="none" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:id="@+id/content" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/current_page_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginBottom="@dimen/grant_permissions_app_breadcrumb_margin_bottom" + android:textAppearance="@style/GrantPermissions.BreadcrumbText" /> + + <ImageView + android:id="@+id/icon" + android:layout_width="@dimen/grant_permissions_app_icon_size" + android:layout_height="@dimen/grant_permissions_app_icon_size" + android:tint="@color/grant_permissions_app_color" + android:layout_gravity="center" + android:layout_marginTop="@dimen/grant_permissions_app_icon_margin_top"/> + + <TextView + android:id="@+id/message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:textSize="20sp" + android:gravity="center" + android:fontFamily="sans-serif-condensed-light" + android:textAppearance="@style/GrantPermissions.TitleText"/> + + <!-- TODO: Change this to use a ViewStub instead of show/hiding the two layouts --> + <FrameLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/button_bar_container" + android:layout_gravity="bottom" + android:background="#FF606060"> + <FrameLayout + android:id="@+id/horizontal_button_bar" + android:layout_width="match_parent" + android:layout_height="72dp"> + <Button + android:id="@+id/horizontal_deny_button" + android:layout_width="54dp" + android:layout_height="54dp" + android:layout_gravity="top|left" + android:layout_marginLeft="16dp" + android:layout_marginTop="9dp" + android:background="@drawable/cancel_button"/> + + <Button + android:id="@+id/horizontal_allow_button" + android:layout_width="54dp" + android:layout_height="54dp" + android:layout_gravity="top|right" + android:layout_marginRight="16dp" + android:layout_marginTop="9dp" + android:background="@drawable/confirm_button"/> + </FrameLayout> + + <FrameLayout + android:id="@+id/vertical_button_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone"> + <LinearLayout + android:id="@+id/buttonPanel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <Button + android:id="@+id/vertical_allow_button" + style="@style/Widget.WearDiag.Button"/> + + <Button + android:id="@+id/vertical_deny_button" + style="@style/Widget.WearDiag.Button"/> + + <Button + android:id="@+id/vertical_deny_do_not_ask_again_button" + style="@style/Widget.WearDiag.Button"/> + </LinearLayout> + </FrameLayout> + </FrameLayout> + </LinearLayout> + </ScrollView> +</FrameLayout>
\ No newline at end of file diff --git a/res/values-watch/colors.xml b/res/values-watch/colors.xml new file mode 100644 index 00000000..903bfef5 --- /dev/null +++ b/res/values-watch/colors.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. +--> + +<resources> + <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> + <color name="grant_permissions_title_color">@color/grant_permissions_white_text_alpha_70</color> + + <color name="grant_permissions_white_text_alpha_100">@color/off_white</color> + <color name="grant_permissions_white_text_alpha_70">#b2eeeeee</color> + + <color name="off_white">#ffeeeeee</color> + + <!-- Copied from wearable support --> + <color name="circular_button_disabled">#757575</color> +</resources> diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml new file mode 100644 index 00000000..29a65fdc --- /dev/null +++ b/res/values-watch/dimens.xml @@ -0,0 +1,28 @@ +<?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> + <dimen name="grant_permissions_app_icon_size">32dp</dimen> + <dimen name="grant_permissions_app_icon_margin_top">8dp</dimen> + + <dimen name="grant_permissions_app_breadcrumb_margin_bottom">3dp</dimen> + + <dimen name="action_dialog_z">16dp</dimen> + + <!-- Confirmation Dialog --> + <dimen name="conf_diag_floating_height">16dp</dimen> + +</resources> diff --git a/res/values-watch/strings.xml b/res/values-watch/strings.xml new file mode 100644 index 00000000..161ff834 --- /dev/null +++ b/res/values-watch/strings.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. +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Title for the dialog button to deny a permission grant and never ask the user again. --> + <string name="grant_dialog_button_deny_dont_ask_again">Deny and don\'t ask again</string> + + <!-- Template for the current permission from the total number of permissions. --> + <string name="current_permission_template"> + <xliff:g id="current_permission_index" example="1">%1$s</xliff:g> / + <xliff:g id="permission_count" example="2">%2$s</xliff:g> + </string> + + <!-- Preference row title for showing system apps. --> + <string name="preference_show_system_apps">Show system apps</string> +</resources> diff --git a/res/values-watch/themes.xml b/res/values-watch/themes.xml new file mode 100644 index 00000000..7a27bf7c --- /dev/null +++ b/res/values-watch/themes.xml @@ -0,0 +1,67 @@ +<?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="Settings" parent="Theme.Leanback"> + <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Permissions</item> + </style> + + <style name="GrantPermissions" parent="Theme.Leanback"> + <item name="android:windowIsFloating">true</item> + <item name="android:windowAnimationStyle">@style/Animation.Snackbar</item> + <item name="android:windowElevation">@dimen/action_dialog_z</item> + </style> + + <style name="GrantPermissions.BreadcrumbText"> + <item name="android:fontFamily">sans-serif-condensed</item> + <item name="android:textSize">14sp</item> + <item name="android:textColor">@color/grant_permissions_progress_color</item> + </style> + + <style name="GrantPermissions.TitleText"> + <item name="android:fontFamily">sans-serif-light</item> + <item name="android:textSize">18sp</item> + <item name="android:textColor">@color/grant_permissions_title_color</item> + <item name="android:lineSpacingMultiplier">1.221</item> + </style> + + <style name="Animation.Snackbar" parent="@android:style/Animation"> + <item name="android:windowEnterAnimation">@anim/snackbar_enter</item> + <item name="android:windowExitAnimation">@anim/snackbar_exit</item> + </style> + + <!-- Copied from WearableSupport lib --> + <style name="TextAppearance.WearDiag" parent="android:TextAppearance.Medium"> + <item name="android:textColor">#FFFFFF</item> + <item name="android:textSize">16sp</item> + </style> + <style name="TextAppearance.WearDiag.Button"> + <item name="android:textSize">16sp</item> + </style> + <style name="Widget.WearDiag.Button" parent="@android:style/Widget.DeviceDefault.Button"> + <item name="android:fontFamily">sans-serif-condensed-light</item> + <item name="android:gravity">center_vertical|left</item> + <item name="android:textAppearance">@style/TextAppearance.WearDiag.Button</item> + <item name="android:background">@android:color/transparent</item> + <item name="android:minLines">1</item> + <item name="android:maxLines">3</item> + <item name="android:ellipsize">marquee</item> + <item name="android:layout_height">60dp</item> + <item name="android:layout_width">match_parent</item> + <item name="android:drawablePadding">12dp</item> + </style> +</resources> |