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

Commit 87c5658d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-d9dc98f7-19b2-484c-b4d1-f35dc43e9c05-for-git_oc-mr1-release-41... 

release-request-d9dc98f7-19b2-484c-b4d1-f35dc43e9c05-for-git_oc-mr1-release-4152006 snap-temp-L91700000079405440

Change-Id: Ie01baf9fe083123133aee3c9129bd27258d09983
parents 907bb914 10b7b9e9

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -3042,7 +3042,8 @@ 
                       android:value="com.android.settings.deletionhelper.AutomaticStorageManagerSettings" />

        </activity>



        <activity android:name="Settings$LegacySupportActivity">

        <activity android:name="Settings$LegacySupportActivity"

                  android:label="@string/page_tab_title_support">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            android:value="com.android.settings.dashboard.SupportFragment"/>

        </activity>

res/values/strings.xml

+14 −7
Original line number Diff line number Diff line
@@ -4649,23 +4649,30 @@ 
    <!-- Title for force stop dialog [CHAR LIMIT=30] -->

    <string name="dialog_stop_title">Stop app?</string>

    <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->

    <string name="dialog_stop_message" product="default">Your phone can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can force stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance.</string>

    <string name="dialog_stop_message" product="default">Your phone can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance.</string>

    <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->

    <string name="dialog_stop_message" product="tablet">Your tablet can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can force stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance.</string>

    <string name="dialog_stop_message" product="tablet">Your tablet can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance.</string>

    <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->

    <string name="dialog_stop_message" product="device">Your device can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> is keeping your device awake.\n\nTo try to fix this issue, you can force stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance.</string>

    <string name="dialog_stop_message" product="device">Your device can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> is keeping your device awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance.</string>













    <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->













    <string name="dialog_stop_message_wakeup_alarm" product="default">Your phone can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> keeps waking up your phone.\n\nTo try to fix this issue, you can stop <xliff:g id="app">%1$s</xliff:g>.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance.</string>













    <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->













    <string name="dialog_stop_message_wakeup_alarm" product="tablet">Your tablet can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> keeps waking up your tablet.\n\nTo try to fix this issue, you can stop <xliff:g id="app">%1$s</xliff:g>.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance.</string>













    <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->













    <string name="dialog_stop_message_wakeup_alarm" product="device">Your device can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> keeps waking up your device.\n\nTo try to fix this issue, you can stop <xliff:g id="app">%1$s</xliff:g>.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance.</string>





























    <!-- Text for OK button in force stop dialog [CHAR LIMIT=30] -->















    <string name="dialog_stop_ok">Stop app</string>





























    <!-- Title for background usage dialog [CHAR LIMIT=60] -->













    <string name="dialog_background_check_title">Turn off background usage?</string>













    <string name="dialog_background_check_title">Turn off background usage &amp; stop app?</string>















    <!-- Message body for background usage dialog [CHAR LIMIT=NONE] -->













    <string name="dialog_background_check_message" product="default">Your phone can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> keeps waking up your phone.\n\nTo address this issue, your phone can prevent this app from running in the background.</string>













    <string name="dialog_background_check_message" product="default">Your phone can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> keeps waking up your phone.\n\nTo try to fix this issue, you can stop <xliff:g id="app">%1$s</xliff:g> and prevent it from running in the background.</string>















    <!-- Message body for background usage dialog [CHAR LIMIT=NONE] -->













    <string name="dialog_background_check_message" product="tablet">Your tablet can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> keeps waking up your tablet.\n\nTo address this issue, your tablet can prevent this app from running in the background.</string>













    <string name="dialog_background_check_message" product="tablet">Your tablet can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> keeps waking up your tablet.\n\nTo try to fix this issue, you can stop <xliff:g id="app">%1$s</xliff:g> and prevent it from running in the background.</string>















    <!-- Message body for background usage dialog [CHAR LIMIT=NONE] -->













    <string name="dialog_background_check_message" product="device">Your device can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> keeps waking up your device.\n\nTo address this issue, your device can prevent this app from running in the background.</string>













    <string name="dialog_background_check_message" product="device">Your device can\'t manage battery normally because <xliff:g id="app">%1$s</xliff:g> keeps waking up your device.\n\nTo try to fix this issue, you can stop <xliff:g id="app">%1$s</xliff:g> and prevent it from running in the background.</string>















    <!-- Text for OK button in background usage dialog [CHAR LIMIT=30] -->















    <string name="dialog_background_check_ok">Turn off</string>















































res/xml/account_type_settings.xml



+5
−5




























Original line number
Diff line number
Diff line








@@ -25,15 +25,15 @@













        android:selectable="false"















        android:order="-10000"/>





























    <PreferenceCategory













      android:key="dashboard_tile_placeholder"













      android:order="100"/>





























    <Preference















        android:key="account_sync"















        android:title="@string/account_sync_title"















        android:icon="@drawable/ic_sync"













        android:order="-9999"/>



























    <PreferenceCategory













      android:key="dashboard_tile_placeholder"













      android:order="-9998"/>













        android:order="200"/>































    <com.android.settings.applications.LayoutPreference















      android:key="remove_account"

































res/xml/app_storage_settings.xml



+0
−1




























Original line number
Diff line number
Diff line








@@ -41,7 +41,6 @@





























    <PreferenceCategory















        android:key="storage_category"













        android:layout="@layout/tall_preference_category"















        android:title="@string/app_info_storage_title"















        settings:allowDividerAbove="false"















        settings:allowDividerBelow="false">

































res/xml/installed_app_details.xml



+2
−2




























Original line number
Diff line number
Diff line








@@ -45,9 +45,9 @@













    <com.android.settings.widget.FixedLineSummaryPreference















        android:key="permission_settings"















        android:title="@string/permissions_label"













        android:summary="@string/summary_two_lines_placeholder"













        android:summary="@string/summary_placeholder"















        android:selectable="true"













        app:summaryLineCount="2" />













        app:summaryLineCount="1" />































    <Preference















        android:key="storage_settings"