Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit faf23d16 authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

Merge "Resolve most remaining STOPSHIP comments for role." into qt-dev

parents 03f70e88 95f5f74f

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -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>

res/values/themes.xml

+0 −1
Original line number Diff line number Diff line
@@ -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>

res/xml/roles.xml

+10 −3
Original line number Diff line number Diff line
@@ -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>
@@ -198,6 +197,16 @@ 
            <app-op name="android:run_any_in_background" mode="allowed" />

        </app-ops>

        <preferred-activities>

            <preferred-activity>

                <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>
@@ -205,7 +214,6 @@ 
                        <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