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

Commit 9e4ebaf5 authored by Danesh M's avatar Danesh M
Browse files

Settings : Port over reorganization from 12.1

Change-Id: I3d77bb96aba4a501d3223e72be60403694828a34
parent b5500240
Loading
Loading
Loading
Loading
+31 −22
Original line number Diff line number Diff line
@@ -718,7 +718,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.notification.ZenModeSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/notification_settings" />
                android:resource="@id/sound_settings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>
@@ -739,7 +739,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.notification.ZenModePrioritySettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/notification_settings" />
                android:resource="@id/sound_settings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>
@@ -764,7 +764,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.notification.ZenModeAutomationSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/notification_settings" />
                android:resource="@id/sound_settings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>
@@ -783,7 +783,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.notification.ZenModeScheduleRuleSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/notification_settings" />
                android:resource="@id/sound_settings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>
@@ -802,7 +802,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.notification.ZenModeEventRuleSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/notification_settings" />
                android:resource="@id/sound_settings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>
@@ -821,7 +821,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.notification.ZenModeExternalRuleSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/notification_settings" />
                android:resource="@id/sound_settings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>
@@ -863,7 +863,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.DisplaySettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/display_settings" />
                android:resource="@id/display_and_lights_settings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>
@@ -876,7 +876,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.DisplaySettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/display_settings" />
                android:resource="@id/display_and_lights_settings" />
        </activity-alias>

        <activity android:name="Settings$DeviceInfoSettingsActivity"
@@ -2187,7 +2187,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.livedisplay.LiveDisplay" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/display_settings" />
                android:resource="@id/display_and_lights_settings" />
        </activity>

        <!-- Display rotation -->
@@ -2205,7 +2205,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.cyanogenmod.DisplayRotation" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/display_settings" />
                android:resource="@id/display_and_lights_settings" />
        </activity>

        <activity-alias android:name=".livedisplay.LiveDisplay"
@@ -2217,7 +2217,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                       android:value="com.android.settings.livedisplay.LiveDisplay" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                       android:resource="@id/display_settings" />
                       android:resource="@id/display_and_lights_settings" />
        </activity-alias>


@@ -2312,7 +2312,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.DreamSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/display_settings" />
                android:resource="@id/display_and_lights_settings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>
@@ -2350,7 +2350,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.nfc.PaymentSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/nfc_payment_settings" />
                android:resource="@id/lockscreen_settings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>
@@ -2407,7 +2407,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                       android:value="com.android.settings.notification.NotificationAccessSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                       android:resource="@id/notification_settings" />
                       android:resource="@id/sound_settings" />
        </activity>

        <activity android:name="Settings$ZenAccessSettingsActivity"
@@ -2424,7 +2424,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                       android:value="com.android.settings.notification.ZenAccessSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                       android:resource="@id/notification_settings" />
                       android:resource="@id/sound_settings" />
        </activity>

        <activity android:name="Settings$NotificationSettingsActivity"
@@ -2443,7 +2443,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.notification.NotificationSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/notification_settings" />
                android:resource="@id/sound_settings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>
@@ -2466,7 +2466,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.notification.NotificationSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/notification_settings" />
                android:resource="@id/sound_settings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity-alias>
@@ -2479,7 +2479,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.notification.NotificationSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/notification_settings" />
                android:resource="@id/sound_settings" />
        </activity-alias>

        <activity android:name="Settings$OtherSoundSettingsActivity"
@@ -2497,7 +2497,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.notification.OtherSoundSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/notification_settings" />
                android:resource="@id/sound_settings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>
@@ -2510,7 +2510,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.applications.ManageApplications" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/notification_settings" />
                android:resource="@id/sound_settings" />
        </activity>

        <!-- Show application-level notification settings (app passed in as extras) -->
@@ -2528,7 +2528,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.notification.AppNotificationSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/notification_settings" />
                android:resource="@id/sound_settings" />
        </activity>

        <!-- Show Manual (from settings item) -->
@@ -2701,6 +2701,15 @@
                       android:resource="@id/wireless_settings" />
        </activity>

        <activity android:name=".Settings$LockScreenSettingsActivity"
                  android:label="@string/lockscreen_settings"
                  android:taskAffinity="">
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                       android:value="com.android.settings.SecuritySettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                       android:resource="@id/lockscreen_settings" />
        </activity>

        <provider
            android:name=".search.SettingsSearchIndexablesProvider"
            android:authorities="com.android.settings"
+1.02 KiB
Loading image diff...
+713 B
Loading image diff...
+1.37 KiB
Loading image diff...
+2.08 KiB
Loading image diff...
Loading