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

Commit 881d5796 authored by Fan Zhang's avatar Fan Zhang
Browse files

Misc fixes for User page and my device info page 

- Rename UserAndAccountDashboard* to AccountDashboard*
- Move emergency info from account to device info page

- Move auto sync data toggles (4 of them) from Account page to user page
   - Move the controllers too. UserSettings is a not a DashboardFragment
     so I had to manually call each controller method.
     TODO: refactor UserSettings to a DashboardFragment

- Move legal information/regulatory info above advance button within device info page.

Fixes: 72523158
Bug: 71871075
Test: robotests
Change-Id: I1b8af8af61e49d17926f984978a09a974b6c62e1
parent c24930aa

AndroidManifest.xml

+5 −7
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ 
        </activity>





        <activity android:name="Settings$MeCardActivity"

        <activity android:name=".Settings$MyDeviceInfoActivity"

                  android:label="@string/device_info_settings"

                  android:icon="@drawable/ic_settings_about"

                  android:taskAffinity="com.android.settings"
@@ -1020,7 +1020,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

            <intent-filter android:priority="10">

            <intent-filter android:priority="270">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"
@@ -2329,7 +2329,7 @@ 
            android:configChanges="orientation|keyboardHidden|screenSize"

            android:label="@string/header_add_an_account"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings$UserAndAccountDashboardActivity">

            android:parentActivityName=".Settings$AccountDashboardActivity">

            <intent-filter android:priority="1">

                <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -3092,7 +3092,7 @@ 
                       android:resource="@string/app_and_notification_dashboard_summary"/>

        </activity>



        <activity android:name=".Settings$UserAndAccountDashboardActivity"

        <activity android:name=".Settings$AccountDashboardActivity"

                  android:label="@string/account_dashboard_title"

                  android:icon="@drawable/ic_homepage_accounts">

            <intent-filter android:priority="3">
@@ -3103,11 +3103,9 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

                       android:value="com.android.settings.accounts.UserAndAccountDashboardFragment"/>

                       android:value="com.android.settings.accounts.AccountDashboardFragment"/>

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

                       android:value="com.android.settings.category.ia.homepage"/>

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

              android:value="true" />

        </activity>



        <activity android:name=".Settings$SystemDashboardActivity"

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -6663,8 +6663,8 @@ 
    <string name="app_and_notification_dashboard_title">Apps &amp; notifications</string>

    <!-- Summary for Apps & Notification settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->

    <string name="app_and_notification_dashboard_summary">Permissions, default apps</string>

    <!-- Title for setting tile leading to User and accounts settings [CHAR LIMIT=40]-->

    <string name="account_dashboard_title">Users &amp; accounts</string>

    <!-- Title for setting tile leading to account settings [CHAR LIMIT=40]-->

    <string name="account_dashboard_title">Accounts</string>

    <!-- Title for setting tile leading to setting UI which allows user set default app to

    handle actions such as open web page, making phone calls, default SMS apps [CHAR  LIMIT=40]-->

    <string name="app_default_dashboard_title">Default apps</string>

res/xml/user_and_accounts_settings.xml→res/xml/accounts_dashboard_settings.xml

+28 −0
Original line number Diff line number Diff line
@@ -21,37 +21,6 @@ 
    android:title="@string/account_dashboard_title"

    settings:keywords="@string/keywords_accounts">



    <Preference

        android:key="emergency_info"

        android:title="@string/emergency_info_title"

        android:order="100"

        settings:allowDividerAbove="true"/>



    <SwitchPreference

        android:key="auto_sync_account_data"

        android:title="@string/auto_sync_account_title"

        android:summary="@string/auto_sync_account_summary"

        android:order="102"

        settings:allowDividerAbove="true"/>



    <SwitchPreference

        android:key="auto_sync_work_account_data"

        android:title="@string/account_settings_menu_auto_sync_work"

        android:summary="@string/auto_sync_account_summary"

        android:order="103"/>



    <SwitchPreference

        android:key="auto_sync_personal_account_data"

        android:title="@string/account_settings_menu_auto_sync_personal"

        android:summary="@string/auto_sync_account_summary"

        android:order="104"/>



    <com.android.settingslib.RestrictedSwitchPreference

        android:key="user_settings_add_users_when_locked"

        android:title="@string/user_add_on_lockscreen_menu"

        android:singleLineTitle="false"

        android:order="105"/>



    <PreferenceCategory

        android:key="dashboard_tile_placeholder"

        android:order="200"/>

res/xml/my_device_info.xml

+23 −19
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="my_device_info_pref_screen"

    android:title="@string/my_device_info_title"

    settings:initialExpandedChildrenCount="4">

    settings:initialExpandedChildrenCount="7">



    <com.android.settings.applications.LayoutPreference

        android:key="my_device_info_header"
@@ -49,10 +49,31 @@ 
        android:title="@string/my_device_info_device_name_preference_title"

        android:summary="@string/summary_placeholder"/>



    <Preference

        android:key="emergency_info"

        android:order="4"

        android:title="@string/emergency_info_title"

        android:summary="@string/summary_placeholder"/>



    <!-- Legal information -->

    <Preference

        android:key="legal_container"

        android:order="5"

        android:title="@string/legal_information"

        android:fragment="com.android.settings.LegalSettings" />



    <!-- Regulatory labels -->

    <Preference

        android:key="regulatory_info"

        android:order="6"

        android:title="@string/regulatory_labels">

        <intent android:action="android.settings.SHOW_REGULATORY_INFO"/>

    </Preference>



    <!-- SIM status -->

    <Preference

        android:key="sim_status"

        android:order="4"

        android:order="7"

        android:title="@string/sim_status_title"

        settings:keywords="@string/keywords_sim_status"

        android:summary="@string/summary_placeholder"/>
@@ -110,23 +131,6 @@ 
        android:title="@string/status_bt_address"

        android:summary="@string/summary_placeholder"/>





    <!-- Legal information -->

    <Preference

        android:key="legal_container"

        android:order="37"

        android:title="@string/legal_information"

        android:fragment="com.android.settings.LegalSettings"

        settings:allowDividerAbove="true"/>



    <!-- Regulatory labels -->

    <Preference

        android:key="regulatory_info"

        android:order="38"

        android:title="@string/regulatory_labels">

        <intent android:action="android.settings.SHOW_REGULATORY_INFO"/>

    </Preference>



    <!-- Safety & regulatory manual -->

    <Preference

        android:key="safety_info"

res/xml/user_settings.xml

+37 −8
Original line number Diff line number Diff line
@@ -14,18 +14,47 @@ 
     limitations under the License.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="user_settings_screen"

    android:title="@string/user_settings_title">



    <PreferenceCategory

        android:key="user_list"

            android:title="@string/user_list_title">

        android:title="@string/user_list_title"

        android:order="10">

    </PreferenceCategory>



    <com.android.settingslib.RestrictedPreference

        android:key="user_add"

        android:title="@string/user_add_user_or_profile_menu"

            android:icon="@drawable/ic_menu_add" />

        android:icon="@drawable/ic_menu_add"

        android:order="20"/>



    <SwitchPreference

        android:key="auto_sync_account_data"

        android:title="@string/auto_sync_account_title"

        android:summary="@string/auto_sync_account_summary"

        android:order="102"

        settings:allowDividerAbove="true"/>



    <SwitchPreference

        android:key="auto_sync_work_account_data"

        android:title="@string/account_settings_menu_auto_sync_work"

        android:summary="@string/auto_sync_account_summary"

        android:order="103"/>



    <SwitchPreference

        android:key="auto_sync_personal_account_data"

        android:title="@string/account_settings_menu_auto_sync_personal"

        android:summary="@string/auto_sync_account_summary"

        android:order="104"/>



    <com.android.settingslib.RestrictedSwitchPreference

        android:key="user_settings_add_users_when_locked"

        android:title="@string/user_add_on_lockscreen_menu"

        android:singleLineTitle="false"

        android:order="105"/>



</PreferenceScreen>