diff options
author | Anthony Hugh <ahugh@google.com> | 2015-08-21 20:57:03 +0000 |
---|---|---|
committer | Anthony Hugh <ahugh@google.com> | 2015-08-21 20:57:43 +0000 |
commit | 70d651e904e16723f4e55879f2e356e403fff61a (patch) | |
tree | ce45ca033b0df7041a441eea71268202773c0ea8 /res | |
parent | b7da1f5f9886ff8a4ad81b0d617d442c461ca1e5 (diff) | |
download | android_packages_apps_PackageInstaller-70d651e904e16723f4e55879f2e356e403fff61a.tar.gz android_packages_apps_PackageInstaller-70d651e904e16723f4e55879f2e356e403fff61a.tar.bz2 android_packages_apps_PackageInstaller-70d651e904e16723f4e55879f2e356e403fff61a.zip |
Revert "Implement base version of GrantPermissions dialog"
This reverts commit b7da1f5f9886ff8a4ad81b0d617d442c461ca1e5.
We can't reference vendor from this package. Need to add the references
manually.
Change-Id: I3ee31de110f24014100ce804b0659055b26f963b
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-watch-280dpi/ic_cc_cancel.png | bin | 14774 -> 0 bytes | |||
-rw-r--r-- | res/drawable-watch-280dpi/ic_cc_checkmark.png | bin | 14840 -> 0 bytes | |||
-rw-r--r-- | res/drawable-watch-hdpi/ic_cc_cancel.png | bin | 678 -> 0 bytes | |||
-rw-r--r-- | res/drawable-watch-hdpi/ic_cc_checkmark.png | bin | 760 -> 0 bytes | |||
-rw-r--r-- | res/drawable-watch-mdpi/ic_cc_cancel.png | bin | 535 -> 0 bytes | |||
-rw-r--r-- | res/drawable-watch-mdpi/ic_cc_checkmark.png | bin | 612 -> 0 bytes | |||
-rw-r--r-- | res/drawable-watch-xhdpi/ic_cc_cancel.png | bin | 312 -> 0 bytes | |||
-rw-r--r-- | res/drawable-watch-xhdpi/ic_cc_checkmark.png | bin | 421 -> 0 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 | 126 | ||||
-rw-r--r-- | res/values-watch/colors.xml | 26 | ||||
-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 | 46 |
17 files changed, 0 insertions, 311 deletions
diff --git a/res/drawable-watch-280dpi/ic_cc_cancel.png b/res/drawable-watch-280dpi/ic_cc_cancel.png Binary files differdeleted file mode 100644 index 249b8697..00000000 --- a/res/drawable-watch-280dpi/ic_cc_cancel.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_cc_checkmark.png b/res/drawable-watch-280dpi/ic_cc_checkmark.png Binary files differdeleted file mode 100644 index 94db9ab0..00000000 --- a/res/drawable-watch-280dpi/ic_cc_checkmark.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_cc_cancel.png b/res/drawable-watch-hdpi/ic_cc_cancel.png Binary files differdeleted file mode 100644 index a57893e1..00000000 --- a/res/drawable-watch-hdpi/ic_cc_cancel.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_cc_checkmark.png b/res/drawable-watch-hdpi/ic_cc_checkmark.png Binary files differdeleted file mode 100644 index 29f9ecd9..00000000 --- a/res/drawable-watch-hdpi/ic_cc_checkmark.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_cc_cancel.png b/res/drawable-watch-mdpi/ic_cc_cancel.png Binary files differdeleted file mode 100644 index 87fc65ab..00000000 --- a/res/drawable-watch-mdpi/ic_cc_cancel.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_cc_checkmark.png b/res/drawable-watch-mdpi/ic_cc_checkmark.png Binary files differdeleted file mode 100644 index 0989daa6..00000000 --- a/res/drawable-watch-mdpi/ic_cc_checkmark.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_cc_cancel.png b/res/drawable-watch-xhdpi/ic_cc_cancel.png Binary files differdeleted file mode 100644 index fec6ecb8..00000000 --- a/res/drawable-watch-xhdpi/ic_cc_cancel.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_cc_checkmark.png b/res/drawable-watch-xhdpi/ic_cc_checkmark.png Binary files differdeleted file mode 100644 index f98cc1ec..00000000 --- a/res/drawable-watch-xhdpi/ic_cc_checkmark.png +++ /dev/null diff --git a/res/drawable-watch/action_negative_bg.xml b/res/drawable-watch/action_negative_bg.xml deleted file mode 100644 index f1c33b54..00000000 --- a/res/drawable-watch/action_negative_bg.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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 deleted file mode 100644 index bc3e88ba..00000000 --- a/res/drawable-watch/action_positive_bg.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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 deleted file mode 100644 index 5b16f549..00000000 --- a/res/drawable-watch/cancel_button.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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 deleted file mode 100644 index 6a895ec6..00000000 --- a/res/drawable-watch/confirm_button.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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 deleted file mode 100644 index 80ed5b92..00000000 --- a/res/layout-watch/grant_permissions.xml +++ /dev/null @@ -1,126 +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. ---> -<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"> - <android.support.wearable.view.WearableFrameLayout - android:id="@+id/horizontal_button_bar" - android:layout_width="match_parent" - android:layout_height="72dp" - app:layout_heightRound="96dp"> - <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" - app:layout_marginLeftRound="36dp" - app:layout_marginTopRound="12dp" - 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" - app:layout_marginRightRound="36dp" - app:layout_marginTopRound="12dp" - android:background="@drawable/confirm_button"/> - </android.support.wearable.view.WearableFrameLayout> - - <android.support.wearable.view.WearableFrameLayout - 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> - </android.support.wearable.view.WearableFrameLayout> - </FrameLayout> - </LinearLayout> - </ScrollView> -</FrameLayout>
\ No newline at end of file diff --git a/res/values-watch/colors.xml b/res/values-watch/colors.xml deleted file mode 100644 index 614e8f14..00000000 --- a/res/values-watch/colors.xml +++ /dev/null @@ -1,26 +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. ---> - -<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> -</resources> diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml deleted file mode 100644 index 29a65fdc..00000000 --- a/res/values-watch/dimens.xml +++ /dev/null @@ -1,28 +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. ---> - -<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 deleted file mode 100644 index 3ec72e5e..00000000 --- a/res/values-watch/strings.xml +++ /dev/null @@ -1,29 +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. ---> - -<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 deleted file mode 100644 index fd49185f..00000000 --- a/res/values-watch/themes.xml +++ /dev/null @@ -1,46 +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 - --> - -<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> -</resources> |