diff options
| author | Michael Kwan <mkwan@google.com> | 2016-10-11 23:24:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-11 23:24:06 +0000 |
| commit | c087334878c685df0adb80bdd2c8a1c41439ac2c (patch) | |
| tree | df91556ed5877834d23de6e96cbe979410698524 /res | |
| parent | 3f0e1b2966ab600e18da79b7dbc4b501e0a00446 (diff) | |
| parent | a5d853c3bd4e4e84872fc802decd18e9c18408d2 (diff) | |
| download | android_packages_apps_PackageInstaller-c087334878c685df0adb80bdd2c8a1c41439ac2c.tar.gz android_packages_apps_PackageInstaller-c087334878c685df0adb80bdd2c8a1c41439ac2c.tar.bz2 android_packages_apps_PackageInstaller-c087334878c685df0adb80bdd2c8a1c41439ac2c.zip | |
Merge "Update permissions UI to match new watch UI." into cw-f-dev
Diffstat (limited to 'res')
126 files changed, 467 insertions, 443 deletions
diff --git a/res/color/btn_colored_background_material.xml b/res/color/btn_colored_background_material.xml new file mode 100644 index 00000000..a6cd0890 --- /dev/null +++ b/res/color/btn_colored_background_material.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 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. +--> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_enabled="false" + android:alpha="?android:disabledAlpha" + android:color="?android:colorButtonNormal" /> + <item android:color="?android:colorAccent" /> +</selector> 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-280dpi/ic_cc_deny.png b/res/drawable-watch-280dpi/ic_cc_deny.png Binary files differdeleted file mode 100644 index 1733669f..00000000 --- a/res/drawable-watch-280dpi/ic_cc_deny.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_calendar.png b/res/drawable-watch-280dpi/ic_permission_calendar.png Binary files differdeleted file mode 100644 index 602bddf0..00000000 --- a/res/drawable-watch-280dpi/ic_permission_calendar.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_calendardisable.png b/res/drawable-watch-280dpi/ic_permission_calendardisable.png Binary files differdeleted file mode 100644 index b855932e..00000000 --- a/res/drawable-watch-280dpi/ic_permission_calendardisable.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_call.png b/res/drawable-watch-280dpi/ic_permission_call.png Binary files differdeleted file mode 100644 index bcf4f868..00000000 --- a/res/drawable-watch-280dpi/ic_permission_call.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_calldisable.png b/res/drawable-watch-280dpi/ic_permission_calldisable.png Binary files differdeleted file mode 100644 index 4781e1fe..00000000 --- a/res/drawable-watch-280dpi/ic_permission_calldisable.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_camera.png b/res/drawable-watch-280dpi/ic_permission_camera.png Binary files differdeleted file mode 100644 index 3d27269f..00000000 --- a/res/drawable-watch-280dpi/ic_permission_camera.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_cameradisable.png b/res/drawable-watch-280dpi/ic_permission_cameradisable.png Binary files differdeleted file mode 100644 index 51fa2c38..00000000 --- a/res/drawable-watch-280dpi/ic_permission_cameradisable.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_contact.png b/res/drawable-watch-280dpi/ic_permission_contact.png Binary files differdeleted file mode 100644 index 3e26bfbb..00000000 --- a/res/drawable-watch-280dpi/ic_permission_contact.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_contactdisable.png b/res/drawable-watch-280dpi/ic_permission_contactdisable.png Binary files differdeleted file mode 100644 index 059b147c..00000000 --- a/res/drawable-watch-280dpi/ic_permission_contactdisable.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_location.png b/res/drawable-watch-280dpi/ic_permission_location.png Binary files differdeleted file mode 100644 index f002a9cf..00000000 --- a/res/drawable-watch-280dpi/ic_permission_location.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_locationdisable.png b/res/drawable-watch-280dpi/ic_permission_locationdisable.png Binary files differdeleted file mode 100644 index 98bbb869..00000000 --- a/res/drawable-watch-280dpi/ic_permission_locationdisable.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_mic.png b/res/drawable-watch-280dpi/ic_permission_mic.png Binary files differdeleted file mode 100644 index 1ed9c941..00000000 --- a/res/drawable-watch-280dpi/ic_permission_mic.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_micdisable.png b/res/drawable-watch-280dpi/ic_permission_micdisable.png Binary files differdeleted file mode 100644 index d74f59b9..00000000 --- a/res/drawable-watch-280dpi/ic_permission_micdisable.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_more.png b/res/drawable-watch-280dpi/ic_permission_more.png Binary files differdeleted file mode 100644 index f33e02bf..00000000 --- a/res/drawable-watch-280dpi/ic_permission_more.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_sensor.png b/res/drawable-watch-280dpi/ic_permission_sensor.png Binary files differdeleted file mode 100644 index 712c5d40..00000000 --- a/res/drawable-watch-280dpi/ic_permission_sensor.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_sensordisable.png b/res/drawable-watch-280dpi/ic_permission_sensordisable.png Binary files differdeleted file mode 100644 index 8faa436f..00000000 --- a/res/drawable-watch-280dpi/ic_permission_sensordisable.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_shield.png b/res/drawable-watch-280dpi/ic_permission_shield.png Binary files differdeleted file mode 100644 index 78d6742b..00000000 --- a/res/drawable-watch-280dpi/ic_permission_shield.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_shielddisable.png b/res/drawable-watch-280dpi/ic_permission_shielddisable.png Binary files differdeleted file mode 100644 index f0ef4134..00000000 --- a/res/drawable-watch-280dpi/ic_permission_shielddisable.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_sms.png b/res/drawable-watch-280dpi/ic_permission_sms.png Binary files differdeleted file mode 100644 index 39bb4b3e..00000000 --- a/res/drawable-watch-280dpi/ic_permission_sms.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_smsdisable.png b/res/drawable-watch-280dpi/ic_permission_smsdisable.png Binary files differdeleted file mode 100644 index e9375b1f..00000000 --- a/res/drawable-watch-280dpi/ic_permission_smsdisable.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_storage.png b/res/drawable-watch-280dpi/ic_permission_storage.png Binary files differdeleted file mode 100644 index 60ec50c7..00000000 --- a/res/drawable-watch-280dpi/ic_permission_storage.png +++ /dev/null diff --git a/res/drawable-watch-280dpi/ic_permission_storagedisable.png b/res/drawable-watch-280dpi/ic_permission_storagedisable.png Binary files differdeleted file mode 100644 index 987b8249..00000000 --- a/res/drawable-watch-280dpi/ic_permission_storagedisable.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 a18fe7ab..00000000 --- a/res/drawable-watch-hdpi/ic_cc_checkmark.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_cc_deny.png b/res/drawable-watch-hdpi/ic_cc_deny.png Binary files differdeleted file mode 100644 index bab22a3d..00000000 --- a/res/drawable-watch-hdpi/ic_cc_deny.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_calendar.png b/res/drawable-watch-hdpi/ic_permission_calendar.png Binary files differdeleted file mode 100644 index b7424699..00000000 --- a/res/drawable-watch-hdpi/ic_permission_calendar.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_calendardisable.png b/res/drawable-watch-hdpi/ic_permission_calendardisable.png Binary files differdeleted file mode 100644 index def76b03..00000000 --- a/res/drawable-watch-hdpi/ic_permission_calendardisable.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_call.png b/res/drawable-watch-hdpi/ic_permission_call.png Binary files differdeleted file mode 100644 index e14a6bd2..00000000 --- a/res/drawable-watch-hdpi/ic_permission_call.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_calldisable.png b/res/drawable-watch-hdpi/ic_permission_calldisable.png Binary files differdeleted file mode 100644 index e0f535ff..00000000 --- a/res/drawable-watch-hdpi/ic_permission_calldisable.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_camera.png b/res/drawable-watch-hdpi/ic_permission_camera.png Binary files differdeleted file mode 100644 index 7c1df6ba..00000000 --- a/res/drawable-watch-hdpi/ic_permission_camera.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_cameradisable.png b/res/drawable-watch-hdpi/ic_permission_cameradisable.png Binary files differdeleted file mode 100644 index 9637808a..00000000 --- a/res/drawable-watch-hdpi/ic_permission_cameradisable.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_contact.png b/res/drawable-watch-hdpi/ic_permission_contact.png Binary files differdeleted file mode 100644 index 532e3a2c..00000000 --- a/res/drawable-watch-hdpi/ic_permission_contact.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_contactdisable.png b/res/drawable-watch-hdpi/ic_permission_contactdisable.png Binary files differdeleted file mode 100644 index 32b45c53..00000000 --- a/res/drawable-watch-hdpi/ic_permission_contactdisable.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_location.png b/res/drawable-watch-hdpi/ic_permission_location.png Binary files differdeleted file mode 100644 index 3d6c0b9d..00000000 --- a/res/drawable-watch-hdpi/ic_permission_location.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_locationdisable.png b/res/drawable-watch-hdpi/ic_permission_locationdisable.png Binary files differdeleted file mode 100644 index c2475e21..00000000 --- a/res/drawable-watch-hdpi/ic_permission_locationdisable.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_mic.png b/res/drawable-watch-hdpi/ic_permission_mic.png Binary files differdeleted file mode 100644 index 8acb4c5f..00000000 --- a/res/drawable-watch-hdpi/ic_permission_mic.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_micdisable.png b/res/drawable-watch-hdpi/ic_permission_micdisable.png Binary files differdeleted file mode 100644 index a37a4e20..00000000 --- a/res/drawable-watch-hdpi/ic_permission_micdisable.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_more.png b/res/drawable-watch-hdpi/ic_permission_more.png Binary files differdeleted file mode 100644 index 08808bc4..00000000 --- a/res/drawable-watch-hdpi/ic_permission_more.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_sensor.png b/res/drawable-watch-hdpi/ic_permission_sensor.png Binary files differdeleted file mode 100644 index fd2939ab..00000000 --- a/res/drawable-watch-hdpi/ic_permission_sensor.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_sensordisable.png b/res/drawable-watch-hdpi/ic_permission_sensordisable.png Binary files differdeleted file mode 100644 index 487a4861..00000000 --- a/res/drawable-watch-hdpi/ic_permission_sensordisable.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_shield.png b/res/drawable-watch-hdpi/ic_permission_shield.png Binary files differdeleted file mode 100644 index cab08e47..00000000 --- a/res/drawable-watch-hdpi/ic_permission_shield.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_shielddisable.png b/res/drawable-watch-hdpi/ic_permission_shielddisable.png Binary files differdeleted file mode 100644 index 548ac56c..00000000 --- a/res/drawable-watch-hdpi/ic_permission_shielddisable.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_sms.png b/res/drawable-watch-hdpi/ic_permission_sms.png Binary files differdeleted file mode 100644 index dc3db2f9..00000000 --- a/res/drawable-watch-hdpi/ic_permission_sms.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_smsdisable.png b/res/drawable-watch-hdpi/ic_permission_smsdisable.png Binary files differdeleted file mode 100644 index 608c4d04..00000000 --- a/res/drawable-watch-hdpi/ic_permission_smsdisable.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_storage.png b/res/drawable-watch-hdpi/ic_permission_storage.png Binary files differdeleted file mode 100644 index 031d989f..00000000 --- a/res/drawable-watch-hdpi/ic_permission_storage.png +++ /dev/null diff --git a/res/drawable-watch-hdpi/ic_permission_storagedisable.png b/res/drawable-watch-hdpi/ic_permission_storagedisable.png Binary files differdeleted file mode 100644 index 08dc6625..00000000 --- a/res/drawable-watch-hdpi/ic_permission_storagedisable.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 02c22b19..00000000 --- a/res/drawable-watch-mdpi/ic_cc_checkmark.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_cc_deny.png b/res/drawable-watch-mdpi/ic_cc_deny.png Binary files differdeleted file mode 100644 index f3b29f7f..00000000 --- a/res/drawable-watch-mdpi/ic_cc_deny.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_calendar.png b/res/drawable-watch-mdpi/ic_permission_calendar.png Binary files differdeleted file mode 100644 index 6ae24429..00000000 --- a/res/drawable-watch-mdpi/ic_permission_calendar.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_calendardisable.png b/res/drawable-watch-mdpi/ic_permission_calendardisable.png Binary files differdeleted file mode 100644 index 639109fa..00000000 --- a/res/drawable-watch-mdpi/ic_permission_calendardisable.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_call.png b/res/drawable-watch-mdpi/ic_permission_call.png Binary files differdeleted file mode 100644 index d67a03a5..00000000 --- a/res/drawable-watch-mdpi/ic_permission_call.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_calldisable.png b/res/drawable-watch-mdpi/ic_permission_calldisable.png Binary files differdeleted file mode 100644 index 39760b74..00000000 --- a/res/drawable-watch-mdpi/ic_permission_calldisable.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_camera.png b/res/drawable-watch-mdpi/ic_permission_camera.png Binary files differdeleted file mode 100644 index 807a66f6..00000000 --- a/res/drawable-watch-mdpi/ic_permission_camera.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_cameradisable.png b/res/drawable-watch-mdpi/ic_permission_cameradisable.png Binary files differdeleted file mode 100644 index edf4f7a7..00000000 --- a/res/drawable-watch-mdpi/ic_permission_cameradisable.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_contact.png b/res/drawable-watch-mdpi/ic_permission_contact.png Binary files differdeleted file mode 100644 index 2e146e20..00000000 --- a/res/drawable-watch-mdpi/ic_permission_contact.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_contactdisable.png b/res/drawable-watch-mdpi/ic_permission_contactdisable.png Binary files differdeleted file mode 100644 index e3903516..00000000 --- a/res/drawable-watch-mdpi/ic_permission_contactdisable.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_location.png b/res/drawable-watch-mdpi/ic_permission_location.png Binary files differdeleted file mode 100644 index 3862b24c..00000000 --- a/res/drawable-watch-mdpi/ic_permission_location.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_locationdisable.png b/res/drawable-watch-mdpi/ic_permission_locationdisable.png Binary files differdeleted file mode 100644 index 1f875bd8..00000000 --- a/res/drawable-watch-mdpi/ic_permission_locationdisable.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_mic.png b/res/drawable-watch-mdpi/ic_permission_mic.png Binary files differdeleted file mode 100644 index 33327f0d..00000000 --- a/res/drawable-watch-mdpi/ic_permission_mic.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_micdisable.png b/res/drawable-watch-mdpi/ic_permission_micdisable.png Binary files differdeleted file mode 100644 index 7a1b39c4..00000000 --- a/res/drawable-watch-mdpi/ic_permission_micdisable.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_more.png b/res/drawable-watch-mdpi/ic_permission_more.png Binary files differdeleted file mode 100644 index a563f1a9..00000000 --- a/res/drawable-watch-mdpi/ic_permission_more.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_sensor.png b/res/drawable-watch-mdpi/ic_permission_sensor.png Binary files differdeleted file mode 100644 index 59e1c01f..00000000 --- a/res/drawable-watch-mdpi/ic_permission_sensor.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_sensordisable.png b/res/drawable-watch-mdpi/ic_permission_sensordisable.png Binary files differdeleted file mode 100644 index d8d55c6d..00000000 --- a/res/drawable-watch-mdpi/ic_permission_sensordisable.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_shield.png b/res/drawable-watch-mdpi/ic_permission_shield.png Binary files differdeleted file mode 100644 index 7773fa48..00000000 --- a/res/drawable-watch-mdpi/ic_permission_shield.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_shielddisable.png b/res/drawable-watch-mdpi/ic_permission_shielddisable.png Binary files differdeleted file mode 100644 index 42f452bf..00000000 --- a/res/drawable-watch-mdpi/ic_permission_shielddisable.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_sms.png b/res/drawable-watch-mdpi/ic_permission_sms.png Binary files differdeleted file mode 100644 index 11333ddb..00000000 --- a/res/drawable-watch-mdpi/ic_permission_sms.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_smsdisable.png b/res/drawable-watch-mdpi/ic_permission_smsdisable.png Binary files differdeleted file mode 100644 index b4416f4b..00000000 --- a/res/drawable-watch-mdpi/ic_permission_smsdisable.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_storage.png b/res/drawable-watch-mdpi/ic_permission_storage.png Binary files differdeleted file mode 100644 index 07bd8f92..00000000 --- a/res/drawable-watch-mdpi/ic_permission_storage.png +++ /dev/null diff --git a/res/drawable-watch-mdpi/ic_permission_storagedisable.png b/res/drawable-watch-mdpi/ic_permission_storagedisable.png Binary files differdeleted file mode 100644 index ed8af410..00000000 --- a/res/drawable-watch-mdpi/ic_permission_storagedisable.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 1302723b..00000000 --- a/res/drawable-watch-xhdpi/ic_cc_checkmark.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_cc_deny.png b/res/drawable-watch-xhdpi/ic_cc_deny.png Binary files differdeleted file mode 100644 index a5f8dc1b..00000000 --- a/res/drawable-watch-xhdpi/ic_cc_deny.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_calendar.png b/res/drawable-watch-xhdpi/ic_permission_calendar.png Binary files differdeleted file mode 100644 index 806438c6..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_calendar.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_calendardisable.png b/res/drawable-watch-xhdpi/ic_permission_calendardisable.png Binary files differdeleted file mode 100644 index 821462e4..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_calendardisable.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_call.png b/res/drawable-watch-xhdpi/ic_permission_call.png Binary files differdeleted file mode 100644 index 079942b5..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_call.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_calldisable.png b/res/drawable-watch-xhdpi/ic_permission_calldisable.png Binary files differdeleted file mode 100644 index 13cd805e..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_calldisable.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_camera.png b/res/drawable-watch-xhdpi/ic_permission_camera.png Binary files differdeleted file mode 100644 index 03b0d8d0..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_camera.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_cameradisable.png b/res/drawable-watch-xhdpi/ic_permission_cameradisable.png Binary files differdeleted file mode 100644 index bcb2a350..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_cameradisable.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_contact.png b/res/drawable-watch-xhdpi/ic_permission_contact.png Binary files differdeleted file mode 100644 index 996fe39d..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_contact.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_contactdisable.png b/res/drawable-watch-xhdpi/ic_permission_contactdisable.png Binary files differdeleted file mode 100644 index 1063f17b..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_contactdisable.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_location.png b/res/drawable-watch-xhdpi/ic_permission_location.png Binary files differdeleted file mode 100644 index d9dc1fc9..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_location.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_locationdisable.png b/res/drawable-watch-xhdpi/ic_permission_locationdisable.png Binary files differdeleted file mode 100644 index c3e7ae9f..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_locationdisable.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_mic.png b/res/drawable-watch-xhdpi/ic_permission_mic.png Binary files differdeleted file mode 100644 index 3a951ea8..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_mic.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_micdisable.png b/res/drawable-watch-xhdpi/ic_permission_micdisable.png Binary files differdeleted file mode 100644 index a9c7c81e..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_micdisable.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_more.png b/res/drawable-watch-xhdpi/ic_permission_more.png Binary files differdeleted file mode 100644 index a3f7ee5b..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_more.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_sensor.png b/res/drawable-watch-xhdpi/ic_permission_sensor.png Binary files differdeleted file mode 100644 index 73564014..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_sensor.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_sensordisable.png b/res/drawable-watch-xhdpi/ic_permission_sensordisable.png Binary files differdeleted file mode 100644 index ef135a7e..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_sensordisable.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_shield.png b/res/drawable-watch-xhdpi/ic_permission_shield.png Binary files differdeleted file mode 100644 index 2fc8fd07..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_shield.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_shielddisable.png b/res/drawable-watch-xhdpi/ic_permission_shielddisable.png Binary files differdeleted file mode 100644 index 08a862e8..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_shielddisable.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_sms.png b/res/drawable-watch-xhdpi/ic_permission_sms.png Binary files differdeleted file mode 100644 index c74ce084..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_sms.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_smsdisable.png b/res/drawable-watch-xhdpi/ic_permission_smsdisable.png Binary files differdeleted file mode 100644 index b7256772..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_smsdisable.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_storage.png b/res/drawable-watch-xhdpi/ic_permission_storage.png Binary files differdeleted file mode 100644 index 1f16bdb6..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_storage.png +++ /dev/null diff --git a/res/drawable-watch-xhdpi/ic_permission_storagedisable.png b/res/drawable-watch-xhdpi/ic_permission_storagedisable.png Binary files differdeleted file mode 100644 index 41d42d57..00000000 --- a/res/drawable-watch-xhdpi/ic_permission_storagedisable.png +++ /dev/null diff --git a/res/drawable-watch/accept_deny_dialog_negative_bg.xml b/res/drawable-watch/accept_deny_dialog_negative_bg.xml new file mode 100644 index 00000000..1ccc40ab --- /dev/null +++ b/res/drawable-watch/accept_deny_dialog_negative_bg.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2016 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. +--> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <ripple android:color="?android:colorControlHighlight" /> + </item> + <item> + <ripple android:color="?android:colorControlHighlight"> + <item> + <shape android:shape="oval" + android:tint="?android:colorButtonNormal"> + <solid android:color="@android:color/white" /> + <size android:width="@dimen/diag_button_size" + android:height="@dimen/diag_button_size" /> + </shape> + </item> + </ripple> + </item> +</layer-list> diff --git a/res/drawable-watch/accept_deny_dialog_positive_bg.xml b/res/drawable-watch/accept_deny_dialog_positive_bg.xml new file mode 100644 index 00000000..786a35ba --- /dev/null +++ b/res/drawable-watch/accept_deny_dialog_positive_bg.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2016 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. +--> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <ripple android:color="?android:colorAccent" /> + </item> + <item> + <ripple android:color="?android:colorControlHighlight"> + <item> + <shape android:shape="oval" + android:tint="@color/btn_colored_background_material"> + <solid android:color="@android:color/white" /> + <size android:width="@dimen/diag_button_size" + android:height="@dimen/diag_button_size" /> + </shape> + </item> + </ripple> + </item> +</layer-list> diff --git a/res/drawable-watch/action_negative_bg.xml b/res/drawable-watch/action_negative_bg.xml index 7b21ba6d..994ae8e2 100644 --- a/res/drawable-watch/action_negative_bg.xml +++ b/res/drawable-watch/action_negative_bg.xml @@ -13,23 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<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> +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?android:colorControlHighlight"> <item> - <shape android:shape="oval"> - <solid android:color="#BDBDBD"/> + <shape android:shape="oval" android:tint="?android:colorButtonNormal"> + <solid android:color="@android:color/white" /> <size android:width="40dp" android:height="40dp" /> </shape> </item> -</selector> +</ripple> diff --git a/res/drawable-watch/action_positive_bg.xml b/res/drawable-watch/action_positive_bg.xml index f3457c1a..3e8590f2 100644 --- a/res/drawable-watch/action_positive_bg.xml +++ b/res/drawable-watch/action_positive_bg.xml @@ -13,23 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<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> +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?android:colorControlHighlight"> <item> - <shape android:shape="oval"> - <solid android:color="#00BFA5"/> + <shape android:shape="oval" android:tint="@color/btn_colored_background_material"> + <solid android:color="@android:color/white" /> <size android:width="40dp" android:height="40dp" /> </shape> </item> -</selector> +</ripple> diff --git a/res/drawable-watch/cancel_button.xml b/res/drawable-watch/cancel_button.xml index 641526a5..8e4d2d48 100644 --- a/res/drawable-watch/cancel_button.xml +++ b/res/drawable-watch/cancel_button.xml @@ -15,7 +15,5 @@ --> <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> + <item android:drawable="@drawable/ic_cc_clear" android:gravity="center" /> </layer-list> diff --git a/res/drawable-watch/confirm_button.xml b/res/drawable-watch/confirm_button.xml index 2b53e42e..d1bfae33 100644 --- a/res/drawable-watch/confirm_button.xml +++ b/res/drawable-watch/confirm_button.xml @@ -15,7 +15,5 @@ --> <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> + <item android:drawable="@drawable/ic_cc_checkmark" android:gravity="center" /> </layer-list> diff --git a/res/drawable-watch/deny_button.xml b/res/drawable-watch/deny_button.xml index 1e7582bc..0a2e1ae1 100644 --- a/res/drawable-watch/deny_button.xml +++ b/res/drawable-watch/deny_button.xml @@ -15,7 +15,5 @@ --> <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_deny" android:gravity="center" /> - </item> + <item android:drawable="@drawable/ic_cc_deny" android:gravity="center" /> </layer-list> diff --git a/res/drawable-watch/ic_cc_checkmark.xml b/res/drawable-watch/ic_cc_checkmark.xml new file mode 100644 index 00000000..832e090f --- /dev/null +++ b/res/drawable-watch/ic_cc_checkmark.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 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"> + <path + android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/res/drawable-watch/ic_cc_clear.xml b/res/drawable-watch/ic_cc_clear.xml new file mode 100644 index 00000000..06bb30b3 --- /dev/null +++ b/res/drawable-watch/ic_cc_clear.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 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"> + <path + android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/res/drawable-watch/ic_cc_deny.xml b/res/drawable-watch/ic_cc_deny.xml new file mode 100644 index 00000000..971dfcc8 --- /dev/null +++ b/res/drawable-watch/ic_cc_deny.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 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"> + <path + android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zM4 12c0-4.42 3.58-8 8-8 1.85 0 3.55.63 4.9 1.69L5.69 16.9C4.63 15.55 4 13.85 4 12zm8 8c-1.85 0-3.55-.63-4.9-1.69L18.31 7.1C19.37 8.45 20 10.15 20 12c0 4.42-3.58 8-8 8z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/res/layout-watch/accept_deny_dialog.xml b/res/layout-watch/accept_deny_dialog.xml new file mode 100644 index 00000000..89167cb9 --- /dev/null +++ b/res/layout-watch/accept_deny_dialog.xml @@ -0,0 +1,108 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 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. +--> +<ScrollView + xmlns:android="http://schemas.android.com/apk/res/android" + android:fillViewport="true" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <LinearLayout + android:id="@android:id/content" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <FrameLayout + android:minHeight="@dimen/diag_preferred_padding" + android:gravity="top|center_horizontal" + android:layout_height="wrap_content" + android:layout_width="match_parent"> + <ImageView + android:id="@android:id/icon" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:layout_gravity="center_horizontal" + android:layout_height="20dp" + android:layout_width="20dp" + android:scaleType="centerInside" + android:visibility="gone" /> + </FrameLayout> + + <TextView + android:id="@android:id/title" + android:gravity="center" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingLeft="@dimen/diag_preferred_padding" + android:paddingRight="@dimen/diag_preferred_padding" + android:textAppearance="@android:style/TextAppearance.Material.Title" /> + + <TextView + android:id="@android:id/message" + android:gravity="center" + android:layout_marginBottom="8dp" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:paddingLeft="@dimen/diag_preferred_padding" + android:paddingRight="@dimen/diag_preferred_padding" + android:textAppearance="@android:style/TextAppearance.Material.Subhead" + android:visibility="gone" /> + + <FrameLayout + android:id="@+id/buttonPanel" + android:layout_weight="1" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <LinearLayout + android:id="@+id/buttonContainer" + android:orientation="horizontal" + android:gravity="center_horizontal|top" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:paddingTop="8dp" + android:paddingBottom="@dimen/diag_button_padding_bottom" + android:paddingLeft="@dimen/diag_button_padding_horizontal" + android:paddingRight="@dimen/diag_button_padding_horizontal" + style="?android:attr/buttonBarStyle"> + + <ImageButton + android:id="@android:id/button2" + android:src="@drawable/ic_cc_clear" + android:background="@drawable/accept_deny_dialog_negative_bg" + android:contentDescription="@string/generic_cancel" + android:layout_width="@dimen/diag_button_size" + android:layout_height="@dimen/diag_button_size" + android:visibility="gone" /> + + <Space + android:id="@+id/spacer" + android:layout_width="0dp" + android:layout_height="0dp" + android:visibility="gone" + android:layout_weight="1" /> + + <ImageButton + android:id="@android:id/button1" + android:src="@drawable/ic_cc_checkmark" + android:background="@drawable/accept_deny_dialog_positive_bg" + android:contentDescription="@string/generic_yes" + android:layout_width="@dimen/diag_button_size" + android:layout_height="@dimen/diag_button_size" + android:visibility="gone" /> + </LinearLayout> + </FrameLayout> + </LinearLayout> +</ScrollView> diff --git a/res/layout-watch/confirmation_dialog.xml b/res/layout-watch/confirmation_dialog.xml deleted file mode 100644 index b780e77f..00000000 --- a/res/layout-watch/confirmation_dialog.xml +++ /dev/null @@ -1,133 +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" - 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" - android:paddingTop="@dimen/conf_diag_content_padding_top"> - - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="@dimen/conf_diag_min_space_above_message" - android:gravity="bottom"> - <TextView - android:id="@+id/current_page_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginTop="@dimen/grant_permissions_app_breadcrumb_margin_top" - 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_horizontal" - android:layout_marginTop="@dimen/grant_permissions_app_icon_margin_top"/> - </LinearLayout> - - <TextView - android:id="@+id/message" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/grant_permissions_title_margin_top" - android:paddingLeft="@dimen/grant_permissions_message_side_padding" - android:paddingRight="@dimen/grant_permissions_message_side_padding" - android:gravity="center" - android:textAppearance="@style/GrantPermissions.TitleText"/> - </LinearLayout> - </ScrollView> - - <!-- TODO: Change this to use a ViewStub instead of show/hiding the two layouts --> - <FrameLayout android:id="@+id/button_bar_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:background="#FF606060"> - <FrameLayout - android:id="@+id/horizontal_button_bar" - android:layout_width="match_parent" - android:layout_height="@dimen/conf_diag_button_container_height"> - <Button - android:id="@+id/permission_deny_button" - android:layout_width="54dp" - android:layout_height="54dp" - android:layout_gravity="top|left" - android:layout_marginLeft="@dimen/conf_diag_2button_margin_side" - android:layout_marginTop="@dimen/conf_diag_2button_margin_top" - android:background="@drawable/cancel_button" - android:contentDescription="@string/grant_dialog_button_deny"/> - - <Button - android:id="@+id/permission_allow_button" - android:layout_width="54dp" - android:layout_height="54dp" - android:layout_gravity="top|right" - android:layout_marginRight="@dimen/conf_diag_2button_margin_side" - android:layout_marginTop="@dimen/conf_diag_2button_margin_top" - android:background="@drawable/confirm_button" - android:contentDescription="@string/grant_dialog_button_allow"/> - </FrameLayout> - - <FrameLayout - android:id="@+id/vertical_button_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="@dimen/conf_diag_3button_padding_side" - android:paddingRight="@dimen/conf_diag_3button_padding_side" - android:visibility="gone"> - <LinearLayout - android:id="@+id/buttonPanel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical"> - <Button - android:id="@+id/vertical_button1" - style="@style/Widget.WearDiag.Button"/> - - <Button - android:id="@+id/vertical_button2" - style="@style/Widget.WearDiag.Button"/> - - <Button - android:id="@+id/vertical_button3" - style="@style/Widget.WearDiag.Button"/> - - <!-- Adding padding to the bottom button causes rendering issues, so add - an empty view here instead --> - <Space android:layout_width="match_parent" - android:layout_height="@dimen/conf_diag_3button_padding_bottom"/> - </LinearLayout> - </FrameLayout> - </FrameLayout> -</FrameLayout> diff --git a/res/layout-watch/permissions_settings_item.xml b/res/layout-watch/permissions_settings_item.xml deleted file mode 100644 index b370f1ac..00000000 --- a/res/layout-watch/permissions_settings_item.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="wrap_content" > - <android.support.wearable.view.CircledImageView - android:id="@+id/image" - android:alpha="0.5" - android:layout_height="52dp" - android:layout_width="52dp" - android:layout_gravity="center_vertical" - app:circle_border_color="#FFFFFFFF" - app:circle_border_width="1dp" - app:circle_color="#00000000" - app:image_tint="#FFFFFFFF"/> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/settings_text_margin_left" - android:layout_gravity="center_vertical" - android:orientation="vertical" > - - <TextView - android:id="@+id/text" - android:alpha="0.5" - android:fontFamily="sans-serif-condensed-light" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/permissions_settings_item_color" - android:textSize="14sp" - android:maxLines="2" - android:ellipsize="end"/> - <TextView - android:id="@+id/state" - android:alpha="0.5" - android:fontFamily="sans-serif-condensed-light" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/permissions_settings_item_color" - android:textSize="14sp" - android:maxLines="1" - android:ellipsize="end"/> - </LinearLayout> - -</LinearLayout> diff --git a/res/layout-watch/settings_internal.xml b/res/layout-watch/settings_internal.xml deleted file mode 100644 index e1947aaa..00000000 --- a/res/layout-watch/settings_internal.xml +++ /dev/null @@ -1,56 +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. ---> -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - <TextView - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="@dimen/settings_header_base_height" - android:layout_marginLeft="16dp" - android:layout_marginTop="@dimen/settings_header_top_margin" - android:textSize="@dimen/setting_short_header_text_size" - android:maxLines="2" - android:ellipsize="end" - android:textColor="#9E9E9E" - android:fontFamily="sans-serif-condensed-light" - /> - - <TextView - android:id="@+id/details" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="@dimen/settings_header_base_height" - android:layout_marginLeft="16dp" - android:layout_marginTop="@dimen/settings_header_top_margin" - android:maxLines="2" - android:ellipsize="end" - android:textColor="@color/permissions_settings_item_color" - android:textSize="14sp" - android:visibility="gone" - /> - </LinearLayout> - - <android.support.wearable.view.WearableListView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/wheel" - android:layout_width="match_parent" - android:layout_height="match_parent" - /> -</merge> diff --git a/res/values-round/dimens.xml b/res/values-notround-watch/dimens.xml index bed41ce0..8001a8b0 100644 --- a/res/values-round/dimens.xml +++ b/res/values-notround-watch/dimens.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 The Android Open Source Project +<!-- Copyright (C) 2016 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. @@ -13,14 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. --> - <resources> - <!-- Dimensions for the Grant permissions Confirmation Dialog --> - <dimen name="conf_diag_button_container_height">96dp</dimen> - <dimen name="conf_diag_2button_margin_side">32dp</dimen> - <dimen name="conf_diag_2button_margin_top">10dp</dimen> - <!-- On round screens, the message can't be too close to the top or the corners will be - clipped. --> - <dimen name="conf_diag_min_space_above_message">26dp</dimen> - + <!-- Dimens for dialog layouts --> + <dimen name="diag_button_size">44dp</dimen> + <dimen name="diag_preferred_padding">8dp</dimen> + <dimen name="diag_button_padding_horizontal">16dp</dimen> + <dimen name="diag_button_padding_bottom">8dp</dimen> </resources> diff --git a/res/values-round-watch/dimens.xml b/res/values-round-watch/dimens.xml new file mode 100644 index 00000000..b7fe283e --- /dev/null +++ b/res/values-round-watch/dimens.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 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> + <!-- Dimens for dialog layouts --> + <dimen name="diag_button_size">48dp</dimen> + <dimen name="diag_preferred_padding">@dimen/screen_percentage_15</dimen> + <dimen name="diag_button_padding_horizontal">@dimen/screen_percentage_15</dimen> + <dimen name="diag_button_padding_bottom">@dimen/screen_percentage_12</dimen> +</resources> diff --git a/res/layout-watch/settings.xml b/res/values-sw180dp-notround-watch/dimens.xml index 46249d50..84072a28 100644 --- a/res/layout-watch/settings.xml +++ b/res/values-sw180dp-notround-watch/dimens.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 The Android Open Source Project +<!-- Copyright (C) 2016 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. @@ -13,9 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/container" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <include layout="@layout/settings_internal" /> -</FrameLayout> +<resources> + <!-- Dimens for dialog layouts --> + <dimen name="diag_button_size">48dp</dimen> +</resources> diff --git a/res/values-sw192dp-watch/dimens_percent.xml b/res/values-sw192dp-watch/dimens_percent.xml new file mode 100644 index 00000000..b5beca32 --- /dev/null +++ b/res/values-sw192dp-watch/dimens_percent.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 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="screen_percentage_05">9.6dp</dimen> + <dimen name="screen_percentage_10">19.2dp</dimen> + <dimen name="screen_percentage_12">23.04dp</dimen> + <dimen name="screen_percentage_15">28.8dp</dimen> +</resources> diff --git a/res/values-sw205dp-watch/dimens_percent.xml b/res/values-sw205dp-watch/dimens_percent.xml new file mode 100644 index 00000000..302d23ec --- /dev/null +++ b/res/values-sw205dp-watch/dimens_percent.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 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="screen_percentage_05">10.25dp</dimen> + <dimen name="screen_percentage_10">20.5dp</dimen> + <dimen name="screen_percentage_12">24.6dp</dimen> + <dimen name="screen_percentage_15">30.75dp</dimen> +</resources> diff --git a/res/values-sw210dp-round-watch/dimens.xml b/res/values-sw210dp-round-watch/dimens.xml new file mode 100644 index 00000000..d896138b --- /dev/null +++ b/res/values-sw210dp-round-watch/dimens.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 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> + <!-- Dimens for dialog layouts --> + <dimen name="diag_button_size">54dp</dimen> +</resources> diff --git a/res/values-sw225dp-watch/dimens_percent.xml b/res/values-sw225dp-watch/dimens_percent.xml new file mode 100644 index 00000000..937c5d00 --- /dev/null +++ b/res/values-sw225dp-watch/dimens_percent.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 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="screen_percentage_05">11.25dp</dimen> + <dimen name="screen_percentage_10">22.5dp</dimen> + <dimen name="screen_percentage_12">27dp</dimen> + <dimen name="screen_percentage_15">33.75dp</dimen> +</resources> diff --git a/res/values-sw228dp-watch/dimens_percent.xml b/res/values-sw228dp-watch/dimens_percent.xml new file mode 100644 index 00000000..b2ad3343 --- /dev/null +++ b/res/values-sw228dp-watch/dimens_percent.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 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="screen_percentage_05">11.4dp</dimen> + <dimen name="screen_percentage_10">22.8dp</dimen> + <dimen name="screen_percentage_12">27.36dp</dimen> + <dimen name="screen_percentage_15">34.2dp</dimen> +</resources> diff --git a/res/values-sw240dp-watch/dimens_percent.xml b/res/values-sw240dp-watch/dimens_percent.xml new file mode 100644 index 00000000..ebc8c752 --- /dev/null +++ b/res/values-sw240dp-watch/dimens_percent.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 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="screen_percentage_05">12dp</dimen> + <dimen name="screen_percentage_10">24dp</dimen> + <dimen name="screen_percentage_12">28.8dp</dimen> + <dimen name="screen_percentage_15">36dp</dimen> +</resources> diff --git a/res/values-watch/colors.xml b/res/values-watch/colors.xml index b81d6e3b..81d0459c 100644 --- a/res/values-watch/colors.xml +++ b/res/values-watch/colors.xml @@ -15,22 +15,6 @@ --> <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="permissions_settings_item_color">#FFFFFFFF</color> - - <color name="off_white">#ffeeeeee</color> - - <color name="primary_text_light">#424242</color> - <!-- Copied from wearable support --> <color name="circular_button_disabled">#757575</color> - - <!-- Copied from wearable Clockwork Settings --> - <color name="cw_dark_gray">#424242</color> </resources> diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml deleted file mode 100644 index 96f32148..00000000 --- a/res/values-watch/dimens.xml +++ /dev/null @@ -1,57 +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">20dp</dimen> - <dimen name="grant_permissions_app_icon_margin_top">6dp</dimen> - - <dimen name="grant_permissions_app_breadcrumb_margin_top">6dp</dimen> - <dimen name="grant_permissions_title_margin_top">6dp</dimen> - <dimen name="grant_permissions_message_side_padding">32dp</dimen> - - <dimen name="action_dialog_z">16dp</dimen> - - <!-- Dimensions for the Grant permissions Confirmation Dialog --> - <dimen name="conf_diag_floating_height">16dp</dimen> - <dimen name="conf_diag_button_container_top_margin">6dp</dimen> - <dimen name="conf_diag_button_container_height">72dp</dimen> - <dimen name="conf_diag_2button_margin_side">16dp</dimen> - <dimen name="conf_diag_2button_margin_top">9dp</dimen> - <dimen name="conf_diag_3button_padding_side">32dp</dimen> - <dimen name="conf_diag_3button_padding_bottom">22dp</dimen> - <dimen name="conf_diag_content_padding_top">6dp</dimen> - <!-- On square screens, the message can be at the top of the screen. --> - <dimen name="conf_diag_min_space_above_message">0dp</dimen> - - - <!-- START: Ported values --> - <item name="default_settings_circle_radius_percent" format="fraction" type="dimen">40%</item> - <item name="selected_settings_circle_radius_percent" format="fraction" type="dimen">50%</item> - <dimen name="round_content_padding_left">40dp</dimen> - <dimen name="round_content_padding_right">24dp</dimen> - <dimen name="content_padding_left">12dp</dimen> - <dimen name="settings_wearable_list_view_vertical_padding_round">14dp</dimen> - <dimen name="setting_header_extra_line_height">16dp</dimen> - <dimen name="setting_long_header_text_size">20dp</dimen> - <dimen name="settings_header_base_height">50dp</dimen> - <dimen name="settings_header_top_margin">14dp</dimen> - <dimen name="settings_header_top_margin_circular">18dp</dimen> - <dimen name="settings_header_top_margin_multiline">6dp</dimen> - <dimen name="settings_header_top_margin_circular_multiline">16dp</dimen> - <dimen name="setting_short_header_text_size">24dp</dimen> - <dimen name="settings_text_margin_left">10dp</dimen> - <!-- END: Ported values --> -</resources> diff --git a/res/values-watch/strings.xml b/res/values-watch/strings.xml index 82fe4ae9..f940eae6 100644 --- a/res/values-watch/strings.xml +++ b/res/values-watch/strings.xml @@ -30,8 +30,9 @@ <!-- Summary of a permission switch when it's enforced by policy [CHAR LIMIT=17] --> <string name="permission_summary_enforced_by_policy">Can\'t be changed</string> - <!-- Generic text to indicate that a setting is enabled. Should be in all caps. [CHAR LIMIT=40] --> - <string name="generic_enabled">ENABLED</string> - <!-- Generic text to indicate that a setting is disabled. Should be in all caps. [CHAR LIMIT=40] --> - <string name="generic_disabled">DISABLED</string> + <!-- Generic text to indicate a yes. [CHAR LIMIT=10] --> + <string name="generic_yes">Yes</string> + + <!-- Generic text to indicate Cancel. [CHAR LIMIT=10] --> + <string name="generic_cancel">Cancel</string> </resources> diff --git a/res/values-watch/styles.xml b/res/values-watch/styles.xml index 01ab90eb..18fce93e 100644 --- a/res/values-watch/styles.xml +++ b/res/values-watch/styles.xml @@ -17,33 +17,6 @@ <resources> <style name="Theme.DialogWhenLarge" parent="@android:style/Theme.DeviceDefault.NoActionBar"/> - <!-- START: Ported values --> - <style name="TextAppearance.Wearable.Small" parent="android:TextAppearance.Medium"> - <item name="android:textSize">16sp</item> - <item name="android:textColor">@color/primary_text_light</item> - </style> - - <style name="TextView.Small" parent="@android:style/Widget.Holo.Light"> - <item name="android:fontFamily">sans-serif-condensed</item> - <item name="android:textAppearance">@style/TextAppearance.Wearable.Small</item> - </style> - - <style name="TextView.Small.Light"> - <item name="android:fontFamily">sans-serif-condensed-light</item> - <item name="android:textAppearance">@style/TextAppearance.Wearable.Small</item> - </style> - - <style name="TextAppearance.Settings.Label" parent="android:TextAppearance.Medium"> - <item name="android:textSize">14sp</item> - <item name="android:textColor">#FFFFFFFF</item> - </style> - - <style name="TextAppearance.Settings.Label.Large"> - <item name="android:textSize">16sp</item> - </style> - - <style name="TextView.Settings.Label" parent="TextView.Small.Light"> - <item name="android:textAppearance">@style/TextAppearance.Settings.Label</item> - </style> - <!-- END: Ported values --> + <style name="BreadcrumbText" parent="@android:style/TextAppearance.Material.Body2"/> + <style name="TitleText" parent="@android:style/TextAppearance.Material.Subhead"/> </resources> diff --git a/res/values-watch/themes.xml b/res/values-watch/themes.xml index dea42907..a8186dd9 100644 --- a/res/values-watch/themes.xml +++ b/res/values-watch/themes.xml @@ -16,49 +16,9 @@ --> <resources> - <style name="Settings" parent="@android:style/Theme.DeviceDefault.NoActionBar"> - <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Permissions</item> - <item name="android:windowBackground">@color/cw_dark_gray</item> - <item name="android:colorBackground">@color/cw_dark_gray</item> - </style> - - <style name="GrantPermissions" parent="Settings"> - <item name="android:windowIsFloating">true</item> - <item name="android:windowElevation">@dimen/action_dialog_z</item> - <item name="android:windowSwipeToDismiss">false</item> - </style> - - <style name="GrantPermissions.BreadcrumbText"> - <item name="android:fontFamily">sans-serif-condensed</item> - <item name="android:textSize">16sp</item> - <item name="android:textColor">@color/grant_permissions_progress_color</item> - </style> + <style name="Settings" parent="@android:style/Theme.DeviceDefault.NoActionBar" /> - <style name="GrantPermissions.TitleText"> - <item name="android:fontFamily">sans-serif-condensed-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> - - <!-- 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">wrap_content</item> - <item name="android:drawablePadding">12dp</item> + <style name="GrantPermissions" parent="@android:style/Theme.DeviceDefault.NoActionBar"> + <item name="android:windowBackground">@android:color/transparent</item> </style> </resources> diff --git a/res/xml-watch/watch_permissions.xml b/res/xml-watch/watch_permissions.xml new file mode 100644 index 00000000..8ec8d196 --- /dev/null +++ b/res/xml-watch/watch_permissions.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 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. +--> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + android:title="@string/app_permissions" + android:orderingFromXml="true"> + <Preference + android:key="no_permissions" + android:title="@string/no_permissions" /> +</PreferenceScreen> |
