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

Commit 3a1573b1 authored by Steve Elliott's avatar Steve Elliott Committed by android-build-merger
Browse files

Merge "Add entry point to global actions panel settings" into qt-dev 

am: 4b5d31fe

Change-Id: I113dd052dbf86f2d7053ac90ca86fcf7b86adf23
parents a444fd99 4b5d31fe

AndroidManifest.xml

+11 −0
Original line number Diff line number Diff line
@@ -3241,6 +3241,17 @@ 
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.fuelgauge.batterysaver.BatterySaverScheduleSettings" />

        </activity>



        <activity android:name="Settings$GlobalActionsPanelSettingsActivity"

            android:label="@string/global_actions_panel_title">

            <intent-filter>

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

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

            </intent-filter>

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

                android:value="com.android.settings.gestures.GlobalActionsPanelSettings" />

        </activity>



        <!-- This is the longest AndroidManifest.xml ever. -->

    </application>

</manifest>

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ public class Settings extends SettingsActivity { 
    public static class BluetoothDeviceDetailActivity extends SettingsActivity { /* empty */ }

    public static class WifiCallingDisclaimerActivity extends SettingsActivity { /* empty */ }

    public static class MobileNetworkListActivity extends SettingsActivity {}

    public static class GlobalActionsPanelSettingsActivity extends SettingsActivity {}



    // Top level categories for new IA

    public static class NetworkDashboardActivity extends SettingsActivity {}

src/com/android/settings/core/gateway/SettingsGateway.java

+3 −1
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ import com.android.settings.gestures.AssistGestureSettings; 
import com.android.settings.gestures.DoubleTapPowerSettings;

import com.android.settings.gestures.DoubleTapScreenSettings;

import com.android.settings.gestures.DoubleTwistGestureSettings;

import com.android.settings.gestures.GlobalActionsPanelSettings;

import com.android.settings.gestures.PickupGestureSettings;

import com.android.settings.gestures.SwipeToNotificationSettings;

import com.android.settings.gestures.SystemNavigationGestureSettings;
@@ -279,7 +280,8 @@ public class SettingsGateway { 
            ToggleBackupSettingFragment.class.getName(),

            PreviouslyConnectedDeviceDashboardFragment.class.getName(),

            BatterySaverScheduleSettings.class.getName(),

            MobileNetworkListFragment.class.getName()

            MobileNetworkListFragment.class.getName(),

            GlobalActionsPanelSettings.class.getName()

    };



    public static final String[] SETTINGS_FOR_RESTRICTED = {