diff options
91 files changed, 213 insertions, 35 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c6c0f304..3f1bb1d8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -121,6 +121,10 @@ android:authorities="com.google.android.packageinstaller.wear.provider" android:grantUriPermissions="true" android:exported="true" /> + + <activity android:name=".permission.ui.wear.WarningConfirmationActivity" + android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS" + android:theme="@style/Settings"/> </application> </manifest> 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/grant_permissions.xml b/res/layout-watch/confirmation_dialog.xml index 2eedae35..783d4051 100644 --- a/res/layout-watch/grant_permissions.xml +++ b/res/layout-watch/confirmation_dialog.xml @@ -72,7 +72,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/conf_diag_button_container_height"> <Button - android:id="@+id/horizontal_deny_button" + android:id="@+id/permission_deny_button" android:layout_width="54dp" android:layout_height="54dp" android:layout_gravity="top|left" @@ -81,7 +81,7 @@ android:background="@drawable/cancel_button"/> <Button - android:id="@+id/horizontal_allow_button" + android:id="@+id/permission_allow_button" android:layout_width="54dp" android:layout_height="54dp" android:layout_gravity="top|right" @@ -89,7 +89,7 @@ android:layout_marginTop="@dimen/conf_diag_2button_margin_top" android:background="@drawable/confirm_button"/> </FrameLayout> - + <FrameLayout android:id="@+id/vertical_button_bar" android:layout_width="match_parent" 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/res/values-watch/themes.xml b/res/values-watch/themes.xml index b75f4699..2dfc7519 100644 --- a/res/values-watch/themes.xml +++ b/res/values-watch/themes.xml @@ -35,7 +35,7 @@ <style name="GrantPermissions.TitleText"> <item name="android:fontFamily">sans-serif-condensed-light</item> - <item name="android:textSize">20sp</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> diff --git a/src/com/android/packageinstaller/permission/ui/wear/AppPermissionsFragmentWear.java b/src/com/android/packageinstaller/permission/ui/wear/AppPermissionsFragmentWear.java index 1969c20d..18db94c1 100644 --- a/src/com/android/packageinstaller/permission/ui/wear/AppPermissionsFragmentWear.java +++ b/src/com/android/packageinstaller/permission/ui/wear/AppPermissionsFragmentWear.java @@ -16,12 +16,10 @@ package com.android.packageinstaller.permission.ui.wear; +import android.Manifest; import android.annotation.Nullable; import android.app.Activity; -import android.app.AlertDialog; import android.app.Fragment; -import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -51,11 +49,13 @@ public final class AppPermissionsFragmentWear extends TitledSettingsFragment { private static final String LOG_TAG = "ManagePermsFragment"; + private static final int WARNING_CONFIRMATION_REQUEST = 252; private List<AppPermissionGroup> mToggledGroups; private AppPermissions mAppPermissions; private PermissionsSettingsAdapter mAdapter; private boolean mHasConfirmedRevoke; + private int mPendingPermGroupIndex = -1; public static AppPermissionsFragmentWear newInstance(String packageName) { return setPackageName(new AppPermissionsFragmentWear(), packageName); @@ -216,23 +216,12 @@ public final class AppPermissionsFragmentWear extends TitledSettingsFragment { } else { final boolean grantedByDefault = group.hasGrantedByDefaultPermission(); if (grantedByDefault || (!group.hasRuntimePermission() && !mHasConfirmedRevoke)) { - new AlertDialog.Builder(getContext()) - .setMessage(grantedByDefault ? R.string.system_warning - : R.string.old_sdk_deny_warning) - .setNegativeButton(R.string.cancel, null) - .setPositiveButton(R.string.grant_dialog_button_deny, - new OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - group.revokeRuntimePermissions(false); - if (!grantedByDefault) { - mHasConfirmedRevoke = true; - } - - updatePermissionGroupSetting(index); - } - }) - .show(); + mPendingPermGroupIndex = index; + Intent intent = new Intent(getActivity(), WarningConfirmationActivity.class); + intent.putExtra(WarningConfirmationActivity.EXTRA_WARNING_MESSAGE, + getString(grantedByDefault ? + R.string.system_warning : R.string.old_sdk_deny_warning)); + startActivityForResult(intent, WARNING_CONFIRMATION_REQUEST); } else { group.revokeRuntimePermissions(false); } @@ -241,6 +230,27 @@ public final class AppPermissionsFragmentWear extends TitledSettingsFragment { updatePermissionGroupSetting(index); } + @Override + public void onActivityResult(int requestCode, int resultCode, Intent data) { + if (requestCode == WARNING_CONFIRMATION_REQUEST) { + if (resultCode == Activity.RESULT_OK) { + SettingsAdapter.Setting<AppPermissionGroup> setting = + mAdapter.get(mPendingPermGroupIndex); + final AppPermissionGroup group = setting.data; + group.revokeRuntimePermissions(false); + if (!group.hasGrantedByDefaultPermission()) { + mHasConfirmedRevoke = true; + } + + updatePermissionGroupSetting(mPendingPermGroupIndex); + } + + mPendingPermGroupIndex = -1; + } else { + super.onActivityResult(requestCode, resultCode, data); + } + } + private void updatePermissionGroupSetting(int index) { SettingsAdapter.Setting<AppPermissionGroup> setting = mAdapter.get(index); AppPermissionGroup group = setting.data; @@ -272,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; } } diff --git a/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java b/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java index b1ff52bc..277bada9 100644 --- a/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java +++ b/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java @@ -74,7 +74,7 @@ public abstract class ConfirmationViewHandler implements } public View createView() { - mRoot = LayoutInflater.from(mContext).inflate(R.layout.grant_permissions, null); + mRoot = LayoutInflater.from(mContext).inflate(R.layout.confirmation_dialog, null); mMessage = (TextView) mRoot.findViewById(R.id.message); mCurrentPageText = (TextView) mRoot.findViewById(R.id.current_page_text); @@ -85,8 +85,8 @@ public abstract class ConfirmationViewHandler implements mHorizontalButtonBar = (ViewGroup) mRoot.findViewById(R.id.horizontal_button_bar); mVerticalButtonBar = (ViewGroup) mRoot.findViewById(R.id.vertical_button_bar); - Button horizontalAllow = (Button) mRoot.findViewById(R.id.horizontal_allow_button); - Button horizontalDeny = (Button) mRoot.findViewById(R.id.horizontal_deny_button); + Button horizontalAllow = (Button) mRoot.findViewById(R.id.permission_allow_button); + Button horizontalDeny = (Button) mRoot.findViewById(R.id.permission_deny_button); horizontalAllow.setOnClickListener(this); horizontalDeny.setOnClickListener(this); @@ -141,16 +141,24 @@ public abstract class ConfirmationViewHandler implements case MODE_VERTICAL_BUTTONS: mHorizontalButtonBar.setVisibility(View.GONE); mVerticalButtonBar.setVisibility(View.VISIBLE); + mVerticalButton1.setText(getVerticalButton1Text()); mVerticalButton2.setText(getVerticalButton2Text()); - mVerticalButton3.setText(getVerticalButton3Text()); mVerticalButton1.setCompoundDrawablesWithIntrinsicBounds( getVerticalButton1Icon(), null, null, null); mVerticalButton2.setCompoundDrawablesWithIntrinsicBounds( getVerticalButton2Icon(), null, null, null); - mVerticalButton3.setCompoundDrawablesWithIntrinsicBounds( - getVerticalButton3Icon(), null, null, null); + + CharSequence verticalButton3Text = getVerticalButton3Text(); + if (TextUtils.isEmpty(verticalButton3Text)) { + mVerticalButton3.setVisibility(View.GONE); + } else { + mVerticalButton3.setText(getVerticalButton3Text()); + mVerticalButton3.setCompoundDrawablesWithIntrinsicBounds( + getVerticalButton3Icon(), null, null, null); + } + break; } @@ -204,11 +212,11 @@ public abstract class ConfirmationViewHandler implements public void onClick(View v) { int id = v.getId(); switch (id) { - case R.id.horizontal_allow_button: + case R.id.permission_allow_button: case R.id.vertical_button1: onButton1(); break; - case R.id.horizontal_deny_button: + case R.id.permission_deny_button: case R.id.vertical_button2: onButton2(); break; diff --git a/src/com/android/packageinstaller/permission/ui/wear/WarningConfirmationActivity.java b/src/com/android/packageinstaller/permission/ui/wear/WarningConfirmationActivity.java new file mode 100644 index 00000000..e26dabd6 --- /dev/null +++ b/src/com/android/packageinstaller/permission/ui/wear/WarningConfirmationActivity.java @@ -0,0 +1,110 @@ +/* +* 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. +*/ + +package com.android.packageinstaller.permission.ui.wear; + +import android.app.Activity; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.Icon; +import android.os.Bundle; + +import com.android.packageinstaller.R; + +public final class WarningConfirmationActivity extends Activity { + public final static String EXTRA_WARNING_MESSAGE = "EXTRA_WARNING_MESSAGE"; + + private ConfirmationViewHandler mViewHandler; + private String mMessage; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + mMessage = getIntent().getStringExtra(EXTRA_WARNING_MESSAGE); + + mViewHandler = new ConfirmationViewHandler(this) { + @Override // ConfirmationViewHandler + public int getButtonBarMode() { + return MODE_VERTICAL_BUTTONS; + } + + @Override + public void onButton1() { + setResult(Activity.RESULT_CANCELED); + finish(); + } + + @Override + public void onButton2() { + setResult(Activity.RESULT_OK); + finish(); + } + + @Override + public void onButton3() { + // no-op + } + + @Override + public CharSequence getVerticalButton1Text() { + return getString(R.string.cancel); + } + + @Override + public CharSequence getVerticalButton2Text() { + return getString(R.string.grant_dialog_button_deny); + } + + @Override + public CharSequence getVerticalButton3Text() { + return null; + } + + @Override + public Drawable getVerticalButton1Icon() { + return getDrawable(R.drawable.cancel_button); + } + + @Override + public Drawable getVerticalButton2Icon() { + return getDrawable(R.drawable.confirm_button); + } + + @Override + public Drawable getVerticalButton3Icon() { + return null; + } + + @Override + public CharSequence getCurrentPageText() { + return null; + } + + @Override + public Icon getPermissionIcon() { + return null; + } + + @Override + public CharSequence getMessage() { + return mMessage; + } + }; + + setContentView(mViewHandler.createView()); + mViewHandler.invalidate(); + } +} |
