diff options
author | Anthony Hugh <ahugh@google.com> | 2015-09-22 17:05:02 -0700 |
---|---|---|
committer | Anthony Hugh <ahugh@google.com> | 2015-09-23 16:37:07 -0700 |
commit | 0c49c07f1c83e9998fa0af2cd157633644358611 (patch) | |
tree | e6126a394fac44392277e67958f314d6f9e996ab | |
parent | 9d51c1e17321029166d22f04bef57140905cbdc4 (diff) | |
download | android_packages_apps_PackageInstaller-0c49c07f1c83e9998fa0af2cd157633644358611.tar.gz android_packages_apps_PackageInstaller-0c49c07f1c83e9998fa0af2cd157633644358611.tar.bz2 android_packages_apps_PackageInstaller-0c49c07f1c83e9998fa0af2cd157633644358611.zip |
Add enabled/disabled icons for permissions on Wear
Adds proper enabled/disabled icons for permissions
on Wear and adds the logic to flip between the two states
when the permissions are toggled.
BUG: 24132450
BUG: 24131441
BUG: 24277624
BUG: 24131983
Change-Id: Ie654c84fe3d648e47a76142a6f82c4348bb7fc0c
86 files changed, 50 insertions, 3 deletions
diff --git a/res/drawable-watch-280dpi/ic_permission_calendar.png b/res/drawable-watch-280dpi/ic_permission_calendar.png Binary files differnew file mode 100644 index 00000000..602bddf0 --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_calendar.png diff --git a/res/drawable-watch-280dpi/ic_permission_calendardisable.png b/res/drawable-watch-280dpi/ic_permission_calendardisable.png Binary files differnew file mode 100644 index 00000000..b855932e --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_calendardisable.png diff --git a/res/drawable-watch-280dpi/ic_permission_call.png b/res/drawable-watch-280dpi/ic_permission_call.png Binary files differnew file mode 100644 index 00000000..bcf4f868 --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_call.png diff --git a/res/drawable-watch-280dpi/ic_permission_calldisable.png b/res/drawable-watch-280dpi/ic_permission_calldisable.png Binary files differnew file mode 100644 index 00000000..4781e1fe --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_calldisable.png diff --git a/res/drawable-watch-280dpi/ic_permission_camera.png b/res/drawable-watch-280dpi/ic_permission_camera.png Binary files differnew file mode 100644 index 00000000..3d27269f --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_camera.png diff --git a/res/drawable-watch-280dpi/ic_permission_cameradisable.png b/res/drawable-watch-280dpi/ic_permission_cameradisable.png Binary files differnew file mode 100644 index 00000000..51fa2c38 --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_cameradisable.png diff --git a/res/drawable-watch-280dpi/ic_permission_contact.png b/res/drawable-watch-280dpi/ic_permission_contact.png Binary files differnew file mode 100644 index 00000000..3e26bfbb --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_contact.png diff --git a/res/drawable-watch-280dpi/ic_permission_contactdisable.png b/res/drawable-watch-280dpi/ic_permission_contactdisable.png Binary files differnew file mode 100644 index 00000000..059b147c --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_contactdisable.png diff --git a/res/drawable-watch-280dpi/ic_permission_location.png b/res/drawable-watch-280dpi/ic_permission_location.png Binary files differnew file mode 100644 index 00000000..f002a9cf --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_location.png diff --git a/res/drawable-watch-280dpi/ic_permission_locationdisable.png b/res/drawable-watch-280dpi/ic_permission_locationdisable.png Binary files differnew file mode 100644 index 00000000..98bbb869 --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_locationdisable.png diff --git a/res/drawable-watch-280dpi/ic_permission_mic.png b/res/drawable-watch-280dpi/ic_permission_mic.png Binary files differnew file mode 100644 index 00000000..1ed9c941 --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_mic.png diff --git a/res/drawable-watch-280dpi/ic_permission_micdisable.png b/res/drawable-watch-280dpi/ic_permission_micdisable.png Binary files differnew file mode 100644 index 00000000..d74f59b9 --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_micdisable.png diff --git a/res/drawable-watch-280dpi/ic_permission_more.png b/res/drawable-watch-280dpi/ic_permission_more.png Binary files differnew file mode 100644 index 00000000..f33e02bf --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_more.png diff --git a/res/drawable-watch-280dpi/ic_permission_sensor.png b/res/drawable-watch-280dpi/ic_permission_sensor.png Binary files differnew file mode 100644 index 00000000..712c5d40 --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_sensor.png diff --git a/res/drawable-watch-280dpi/ic_permission_sensordisable.png b/res/drawable-watch-280dpi/ic_permission_sensordisable.png Binary files differnew file mode 100644 index 00000000..8faa436f --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_sensordisable.png diff --git a/res/drawable-watch-280dpi/ic_permission_shield.png b/res/drawable-watch-280dpi/ic_permission_shield.png Binary files differnew file mode 100644 index 00000000..78d6742b --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_shield.png diff --git a/res/drawable-watch-280dpi/ic_permission_shielddisable.png b/res/drawable-watch-280dpi/ic_permission_shielddisable.png Binary files differnew file mode 100644 index 00000000..f0ef4134 --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_shielddisable.png diff --git a/res/drawable-watch-280dpi/ic_permission_sms.png b/res/drawable-watch-280dpi/ic_permission_sms.png Binary files differnew file mode 100644 index 00000000..39bb4b3e --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_sms.png diff --git a/res/drawable-watch-280dpi/ic_permission_smsdisable.png b/res/drawable-watch-280dpi/ic_permission_smsdisable.png Binary files differnew file mode 100644 index 00000000..e9375b1f --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_smsdisable.png diff --git a/res/drawable-watch-280dpi/ic_permission_storage.png b/res/drawable-watch-280dpi/ic_permission_storage.png Binary files differnew file mode 100644 index 00000000..60ec50c7 --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_storage.png diff --git a/res/drawable-watch-280dpi/ic_permission_storagedisable.png b/res/drawable-watch-280dpi/ic_permission_storagedisable.png Binary files differnew file mode 100644 index 00000000..987b8249 --- /dev/null +++ b/res/drawable-watch-280dpi/ic_permission_storagedisable.png diff --git a/res/drawable-watch-hdpi/ic_permission_calendar.png b/res/drawable-watch-hdpi/ic_permission_calendar.png Binary files differnew file mode 100644 index 00000000..b7424699 --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_calendar.png diff --git a/res/drawable-watch-hdpi/ic_permission_calendardisable.png b/res/drawable-watch-hdpi/ic_permission_calendardisable.png Binary files differnew file mode 100644 index 00000000..def76b03 --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_calendardisable.png diff --git a/res/drawable-watch-hdpi/ic_permission_call.png b/res/drawable-watch-hdpi/ic_permission_call.png Binary files differnew file mode 100644 index 00000000..e14a6bd2 --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_call.png diff --git a/res/drawable-watch-hdpi/ic_permission_calldisable.png b/res/drawable-watch-hdpi/ic_permission_calldisable.png Binary files differnew file mode 100644 index 00000000..e0f535ff --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_calldisable.png diff --git a/res/drawable-watch-hdpi/ic_permission_camera.png b/res/drawable-watch-hdpi/ic_permission_camera.png Binary files differnew file mode 100644 index 00000000..7c1df6ba --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_camera.png diff --git a/res/drawable-watch-hdpi/ic_permission_cameradisable.png b/res/drawable-watch-hdpi/ic_permission_cameradisable.png Binary files differnew file mode 100644 index 00000000..9637808a --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_cameradisable.png diff --git a/res/drawable-watch-hdpi/ic_permission_contact.png b/res/drawable-watch-hdpi/ic_permission_contact.png Binary files differnew file mode 100644 index 00000000..532e3a2c --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_contact.png diff --git a/res/drawable-watch-hdpi/ic_permission_contactdisable.png b/res/drawable-watch-hdpi/ic_permission_contactdisable.png Binary files differnew file mode 100644 index 00000000..32b45c53 --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_contactdisable.png diff --git a/res/drawable-watch-hdpi/ic_permission_location.png b/res/drawable-watch-hdpi/ic_permission_location.png Binary files differnew file mode 100644 index 00000000..3d6c0b9d --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_location.png diff --git a/res/drawable-watch-hdpi/ic_permission_locationdisable.png b/res/drawable-watch-hdpi/ic_permission_locationdisable.png Binary files differnew file mode 100644 index 00000000..c2475e21 --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_locationdisable.png diff --git a/res/drawable-watch-hdpi/ic_permission_mic.png b/res/drawable-watch-hdpi/ic_permission_mic.png Binary files differnew file mode 100644 index 00000000..8acb4c5f --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_mic.png diff --git a/res/drawable-watch-hdpi/ic_permission_micdisable.png b/res/drawable-watch-hdpi/ic_permission_micdisable.png Binary files differnew file mode 100644 index 00000000..a37a4e20 --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_micdisable.png diff --git a/res/drawable-watch-hdpi/ic_permission_more.png b/res/drawable-watch-hdpi/ic_permission_more.png Binary files differnew file mode 100644 index 00000000..08808bc4 --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_more.png diff --git a/res/drawable-watch-hdpi/ic_permission_sensor.png b/res/drawable-watch-hdpi/ic_permission_sensor.png Binary files differnew file mode 100644 index 00000000..fd2939ab --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_sensor.png diff --git a/res/drawable-watch-hdpi/ic_permission_sensordisable.png b/res/drawable-watch-hdpi/ic_permission_sensordisable.png Binary files differnew file mode 100644 index 00000000..487a4861 --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_sensordisable.png diff --git a/res/drawable-watch-hdpi/ic_permission_shield.png b/res/drawable-watch-hdpi/ic_permission_shield.png Binary files differnew file mode 100644 index 00000000..cab08e47 --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_shield.png diff --git a/res/drawable-watch-hdpi/ic_permission_shielddisable.png b/res/drawable-watch-hdpi/ic_permission_shielddisable.png Binary files differnew file mode 100644 index 00000000..548ac56c --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_shielddisable.png diff --git a/res/drawable-watch-hdpi/ic_permission_sms.png b/res/drawable-watch-hdpi/ic_permission_sms.png Binary files differnew file mode 100644 index 00000000..dc3db2f9 --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_sms.png diff --git a/res/drawable-watch-hdpi/ic_permission_smsdisable.png b/res/drawable-watch-hdpi/ic_permission_smsdisable.png Binary files differnew file mode 100644 index 00000000..608c4d04 --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_smsdisable.png diff --git a/res/drawable-watch-hdpi/ic_permission_storage.png b/res/drawable-watch-hdpi/ic_permission_storage.png Binary files differnew file mode 100644 index 00000000..031d989f --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_storage.png diff --git a/res/drawable-watch-hdpi/ic_permission_storagedisable.png b/res/drawable-watch-hdpi/ic_permission_storagedisable.png Binary files differnew file mode 100644 index 00000000..08dc6625 --- /dev/null +++ b/res/drawable-watch-hdpi/ic_permission_storagedisable.png diff --git a/res/drawable-watch-mdpi/ic_permission_calendar.png b/res/drawable-watch-mdpi/ic_permission_calendar.png Binary files differnew file mode 100644 index 00000000..6ae24429 --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_calendar.png diff --git a/res/drawable-watch-mdpi/ic_permission_calendardisable.png b/res/drawable-watch-mdpi/ic_permission_calendardisable.png Binary files differnew file mode 100644 index 00000000..639109fa --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_calendardisable.png diff --git a/res/drawable-watch-mdpi/ic_permission_call.png b/res/drawable-watch-mdpi/ic_permission_call.png Binary files differnew file mode 100644 index 00000000..d67a03a5 --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_call.png diff --git a/res/drawable-watch-mdpi/ic_permission_calldisable.png b/res/drawable-watch-mdpi/ic_permission_calldisable.png Binary files differnew file mode 100644 index 00000000..39760b74 --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_calldisable.png diff --git a/res/drawable-watch-mdpi/ic_permission_camera.png b/res/drawable-watch-mdpi/ic_permission_camera.png Binary files differnew file mode 100644 index 00000000..807a66f6 --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_camera.png diff --git a/res/drawable-watch-mdpi/ic_permission_cameradisable.png b/res/drawable-watch-mdpi/ic_permission_cameradisable.png Binary files differnew file mode 100644 index 00000000..edf4f7a7 --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_cameradisable.png diff --git a/res/drawable-watch-mdpi/ic_permission_contact.png b/res/drawable-watch-mdpi/ic_permission_contact.png Binary files differnew file mode 100644 index 00000000..2e146e20 --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_contact.png diff --git a/res/drawable-watch-mdpi/ic_permission_contactdisable.png b/res/drawable-watch-mdpi/ic_permission_contactdisable.png Binary files differnew file mode 100644 index 00000000..e3903516 --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_contactdisable.png diff --git a/res/drawable-watch-mdpi/ic_permission_location.png b/res/drawable-watch-mdpi/ic_permission_location.png Binary files differnew file mode 100644 index 00000000..3862b24c --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_location.png diff --git a/res/drawable-watch-mdpi/ic_permission_locationdisable.png b/res/drawable-watch-mdpi/ic_permission_locationdisable.png Binary files differnew file mode 100644 index 00000000..1f875bd8 --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_locationdisable.png diff --git a/res/drawable-watch-mdpi/ic_permission_mic.png b/res/drawable-watch-mdpi/ic_permission_mic.png Binary files differnew file mode 100644 index 00000000..33327f0d --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_mic.png diff --git a/res/drawable-watch-mdpi/ic_permission_micdisable.png b/res/drawable-watch-mdpi/ic_permission_micdisable.png Binary files differnew file mode 100644 index 00000000..7a1b39c4 --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_micdisable.png diff --git a/res/drawable-watch-mdpi/ic_permission_more.png b/res/drawable-watch-mdpi/ic_permission_more.png Binary files differnew file mode 100644 index 00000000..a563f1a9 --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_more.png diff --git a/res/drawable-watch-mdpi/ic_permission_sensor.png b/res/drawable-watch-mdpi/ic_permission_sensor.png Binary files differnew file mode 100644 index 00000000..59e1c01f --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_sensor.png diff --git a/res/drawable-watch-mdpi/ic_permission_sensordisable.png b/res/drawable-watch-mdpi/ic_permission_sensordisable.png Binary files differnew file mode 100644 index 00000000..d8d55c6d --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_sensordisable.png diff --git a/res/drawable-watch-mdpi/ic_permission_shield.png b/res/drawable-watch-mdpi/ic_permission_shield.png Binary files differnew file mode 100644 index 00000000..7773fa48 --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_shield.png diff --git a/res/drawable-watch-mdpi/ic_permission_shielddisable.png b/res/drawable-watch-mdpi/ic_permission_shielddisable.png Binary files differnew file mode 100644 index 00000000..42f452bf --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_shielddisable.png diff --git a/res/drawable-watch-mdpi/ic_permission_sms.png b/res/drawable-watch-mdpi/ic_permission_sms.png Binary files differnew file mode 100644 index 00000000..11333ddb --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_sms.png diff --git a/res/drawable-watch-mdpi/ic_permission_smsdisable.png b/res/drawable-watch-mdpi/ic_permission_smsdisable.png Binary files differnew file mode 100644 index 00000000..b4416f4b --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_smsdisable.png diff --git a/res/drawable-watch-mdpi/ic_permission_storage.png b/res/drawable-watch-mdpi/ic_permission_storage.png Binary files differnew file mode 100644 index 00000000..07bd8f92 --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_storage.png diff --git a/res/drawable-watch-mdpi/ic_permission_storagedisable.png b/res/drawable-watch-mdpi/ic_permission_storagedisable.png Binary files differnew file mode 100644 index 00000000..ed8af410 --- /dev/null +++ b/res/drawable-watch-mdpi/ic_permission_storagedisable.png diff --git a/res/drawable-watch-xhdpi/ic_permission_calendar.png b/res/drawable-watch-xhdpi/ic_permission_calendar.png Binary files differnew file mode 100644 index 00000000..806438c6 --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_calendar.png diff --git a/res/drawable-watch-xhdpi/ic_permission_calendardisable.png b/res/drawable-watch-xhdpi/ic_permission_calendardisable.png Binary files differnew file mode 100644 index 00000000..821462e4 --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_calendardisable.png diff --git a/res/drawable-watch-xhdpi/ic_permission_call.png b/res/drawable-watch-xhdpi/ic_permission_call.png Binary files differnew file mode 100644 index 00000000..079942b5 --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_call.png diff --git a/res/drawable-watch-xhdpi/ic_permission_calldisable.png b/res/drawable-watch-xhdpi/ic_permission_calldisable.png Binary files differnew file mode 100644 index 00000000..13cd805e --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_calldisable.png diff --git a/res/drawable-watch-xhdpi/ic_permission_camera.png b/res/drawable-watch-xhdpi/ic_permission_camera.png Binary files differnew file mode 100644 index 00000000..03b0d8d0 --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_camera.png diff --git a/res/drawable-watch-xhdpi/ic_permission_cameradisable.png b/res/drawable-watch-xhdpi/ic_permission_cameradisable.png Binary files differnew file mode 100644 index 00000000..bcb2a350 --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_cameradisable.png diff --git a/res/drawable-watch-xhdpi/ic_permission_contact.png b/res/drawable-watch-xhdpi/ic_permission_contact.png Binary files differnew file mode 100644 index 00000000..996fe39d --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_contact.png diff --git a/res/drawable-watch-xhdpi/ic_permission_contactdisable.png b/res/drawable-watch-xhdpi/ic_permission_contactdisable.png Binary files differnew file mode 100644 index 00000000..1063f17b --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_contactdisable.png diff --git a/res/drawable-watch-xhdpi/ic_permission_location.png b/res/drawable-watch-xhdpi/ic_permission_location.png Binary files differnew file mode 100644 index 00000000..d9dc1fc9 --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_location.png diff --git a/res/drawable-watch-xhdpi/ic_permission_locationdisable.png b/res/drawable-watch-xhdpi/ic_permission_locationdisable.png Binary files differnew file mode 100644 index 00000000..c3e7ae9f --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_locationdisable.png diff --git a/res/drawable-watch-xhdpi/ic_permission_mic.png b/res/drawable-watch-xhdpi/ic_permission_mic.png Binary files differnew file mode 100644 index 00000000..3a951ea8 --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_mic.png diff --git a/res/drawable-watch-xhdpi/ic_permission_micdisable.png b/res/drawable-watch-xhdpi/ic_permission_micdisable.png Binary files differnew file mode 100644 index 00000000..a9c7c81e --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_micdisable.png diff --git a/res/drawable-watch-xhdpi/ic_permission_more.png b/res/drawable-watch-xhdpi/ic_permission_more.png Binary files differnew file mode 100644 index 00000000..a3f7ee5b --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_more.png diff --git a/res/drawable-watch-xhdpi/ic_permission_sensor.png b/res/drawable-watch-xhdpi/ic_permission_sensor.png Binary files differnew file mode 100644 index 00000000..73564014 --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_sensor.png diff --git a/res/drawable-watch-xhdpi/ic_permission_sensordisable.png b/res/drawable-watch-xhdpi/ic_permission_sensordisable.png Binary files differnew file mode 100644 index 00000000..ef135a7e --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_sensordisable.png diff --git a/res/drawable-watch-xhdpi/ic_permission_shield.png b/res/drawable-watch-xhdpi/ic_permission_shield.png Binary files differnew file mode 100644 index 00000000..2fc8fd07 --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_shield.png diff --git a/res/drawable-watch-xhdpi/ic_permission_shielddisable.png b/res/drawable-watch-xhdpi/ic_permission_shielddisable.png Binary files differnew file mode 100644 index 00000000..08a862e8 --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_shielddisable.png diff --git a/res/drawable-watch-xhdpi/ic_permission_sms.png b/res/drawable-watch-xhdpi/ic_permission_sms.png Binary files differnew file mode 100644 index 00000000..c74ce084 --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_sms.png diff --git a/res/drawable-watch-xhdpi/ic_permission_smsdisable.png b/res/drawable-watch-xhdpi/ic_permission_smsdisable.png Binary files differnew file mode 100644 index 00000000..b7256772 --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_smsdisable.png diff --git a/res/drawable-watch-xhdpi/ic_permission_storage.png b/res/drawable-watch-xhdpi/ic_permission_storage.png Binary files differnew file mode 100644 index 00000000..1f16bdb6 --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_storage.png diff --git a/res/drawable-watch-xhdpi/ic_permission_storagedisable.png b/res/drawable-watch-xhdpi/ic_permission_storagedisable.png Binary files differnew file mode 100644 index 00000000..41d42d57 --- /dev/null +++ b/res/drawable-watch-xhdpi/ic_permission_storagedisable.png diff --git a/res/layout-watch/permissions_settings_item.xml b/res/layout-watch/permissions_settings_item.xml index 1dc4abf7..b370f1ac 100644 --- a/res/layout-watch/permissions_settings_item.xml +++ b/res/layout-watch/permissions_settings_item.xml @@ -12,7 +12,8 @@ android:layout_gravity="center_vertical" app:circle_border_color="#FFFFFFFF" app:circle_border_width="1dp" - app:circle_color="#00000000"/> + app:circle_color="#00000000" + app:image_tint="#FFFFFFFF"/> <LinearLayout android:layout_width="wrap_content" diff --git a/src/com/android/packageinstaller/permission/ui/wear/AppPermissionsFragmentWear.java b/src/com/android/packageinstaller/permission/ui/wear/AppPermissionsFragmentWear.java index 6f1273bb..18db94c1 100644 --- a/src/com/android/packageinstaller/permission/ui/wear/AppPermissionsFragmentWear.java +++ b/src/com/android/packageinstaller/permission/ui/wear/AppPermissionsFragmentWear.java @@ -16,6 +16,7 @@ package com.android.packageinstaller.permission.ui.wear; +import android.Manifest; import android.annotation.Nullable; import android.app.Activity; import android.app.Fragment; @@ -281,7 +282,52 @@ public final class AppPermissionsFragmentWear extends TitledSettingsFragment { } private int getPermissionGroupIcon(AppPermissionGroup group) { - // TODO: Return the correct icon based on if permissions are granted - return group.getIconResId(); + String groupName = group.getName(); + boolean isEnabled = group.areRuntimePermissionsGranted(); + int resId; + + switch (groupName) { + case Manifest.permission_group.CALENDAR: + resId = isEnabled ? R.drawable.ic_permission_calendar + : R.drawable.ic_permission_calendardisable; + break; + case Manifest.permission_group.CAMERA: + resId = isEnabled ? R.drawable.ic_permission_camera + : R.drawable.ic_permission_cameradisable; + break; + case Manifest.permission_group.CONTACTS: + resId = isEnabled ? R.drawable.ic_permission_contact + : R.drawable.ic_permission_contactdisable; + break; + case Manifest.permission_group.LOCATION: + resId = isEnabled ? R.drawable.ic_permission_location + : R.drawable.ic_permission_locationdisable; + break; + case Manifest.permission_group.MICROPHONE: + resId = isEnabled ? R.drawable.ic_permission_mic + : R.drawable.ic_permission_micdisable; + break; + case Manifest.permission_group.PHONE: + resId = isEnabled ? R.drawable.ic_permission_call + : R.drawable.ic_permission_calldisable; + break; + case Manifest.permission_group.SENSORS: + resId = isEnabled ? R.drawable.ic_permission_sensor + : R.drawable.ic_permission_sensordisable; + break; + case Manifest.permission_group.SMS: + resId = isEnabled ? R.drawable.ic_permission_sms + : R.drawable.ic_permission_smsdisable; + break; + case Manifest.permission_group.STORAGE: + resId = isEnabled ? R.drawable.ic_permission_storage + : R.drawable.ic_permission_storagedisable; + break; + default: + resId = isEnabled ? R.drawable.ic_permission_shield + : R.drawable.ic_permission_shielddisable; + } + + return resId; } } |