diff options
| author | 2019-05-23 18:10:16 -0700 | |
|---|---|---|
| committer | 2019-05-23 18:10:16 -0700 | |
| commit | 6c2fdc3380b358df08df45e662f56dba3c0cd529 (patch) | |
| tree | 1e9cf56b4e07251b82816d376625aa9ee7595661 | |
| parent | 03bcdaab0ea3da44da24b609ae9d427ea7f00a2c (diff) | |
| parent | c85ace2da06a1a552c8f86298c6d82cb6ec569ed (diff) | |
Merge "Resolve most remaining STOPSHIP comments for role." into qt-dev
am: c85ace2da0
Change-Id: Ib35a0b886a15a7df0f037e4ef1d7d3c850f3a7e0
| -rw-r--r-- | PermissionController/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | PermissionController/res/values/themes.xml | 1 | ||||
| -rw-r--r-- | PermissionController/res/xml/roles.xml | 13 |
3 files changed, 10 insertions, 6 deletions
diff --git a/PermissionController/res/values/strings.xml b/PermissionController/res/values/strings.xml index 8debf7fa6..f146be8db 100644 --- a/PermissionController/res/values/strings.xml +++ b/PermissionController/res/values/strings.xml @@ -743,7 +743,6 @@ <!-- Title for page of managing default apps. [CHAR LIMIT=30] --> <string name="default_apps">Default apps</string> - <!-- TODO: STOPSHIP: I cannot find its value in Settings. --> <!-- Help URI, default apps [DO NOT TRANSLATE] --> <string name="help_uri_default_apps" translatable="false"></string> @@ -780,7 +779,6 @@ <!-- Title for page of managing special app access. [CHAR LIMIT=30] --> <string name="special_app_access">Special app access</string> - <!-- TODO: STOPSHIP: I cannot find its value in Settings. --> <!-- Help URI, special app access [DO NOT TRANSLATE] --> <string name="help_uri_special_app_access" translatable="false"></string> diff --git a/PermissionController/res/values/themes.xml b/PermissionController/res/values/themes.xml index 1bff6b505..5db43f7c2 100644 --- a/PermissionController/res/values/themes.xml +++ b/PermissionController/res/values/themes.xml @@ -52,7 +52,6 @@ parent="@android:style/Theme.DeviceDefault.Settings"> </style> - <!-- TODO: STOPSHIP: Make themeable? --> <style name="RequestRole" parent="android:Theme.DeviceDefault.Settings"> <item name="android:colorBackgroundCacheHint">@null</item> <item name="android:navigationBarColor">@android:color/transparent</item> diff --git a/PermissionController/res/xml/roles.xml b/PermissionController/res/xml/roles.xml index 775ddf455..bf998dda3 100644 --- a/PermissionController/res/xml/roles.xml +++ b/PermissionController/res/xml/roles.xml @@ -109,7 +109,6 @@ --> </required-components> <permissions> - <!-- STOPSHIP: Allow to only enable permissions, but not grant them --> <permission-set name="sms" /> <permission name="android.permission.READ_CALL_LOG" /> </permissions> @@ -202,10 +201,19 @@ <activity> <intent-filter> <action name="android.intent.action.DIAL" /> + </intent-filter> + </activity> + <intent-filter> + <action name="android.intent.action.DIAL" /> + </intent-filter> + </preferred-activity> + <preferred-activity> + <activity> + <intent-filter> + <action name="android.intent.action.DIAL" /> <data scheme="tel" /> </intent-filter> </activity> - <!-- TODO: STOPSHIP: Set preferred? --> <intent-filter> <action name="android.intent.action.DIAL" /> <data scheme="tel" /> @@ -300,7 +308,6 @@ </preferred-activities> </role> - <!-- TODO: STOPSHIP: Intent action sometimes changing dynamically in com.android.phone.EmergencyAssistanceHelper.getIntentAction --> <!--- ~ @see com.android.settings.applications.defaultapps.DefaultEmergencyPreferenceController ~ @see com.android.settings.applications.defaultapps.DefaultEmergencyPicker |