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

Commit a40471e4 authored by Jason Chang's avatar Jason Chang Committed by Android (Google) Code Review
Browse files

Merge "(3/n) Handling long-pressed action for One-handed mode Quick Settings tile"

parents 694d374a d1cf05ce

AndroidManifest.xml

+19 −0
Original line number Diff line number Diff line
@@ -4246,6 +4246,25 @@ 
                  android:theme="@style/SudThemeGlif.Light">

        </activity>



        <activity

            android:name="Settings$OneHandedSettingsActivity"

            android:label="@string/one_handed_title"

            android:exported="true"

            android:enabled="true">

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

                <action android:name="android.intent.action.ONE_HANDED_SETTINGS" />

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

            </intent-filter>

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

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

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

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

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

                       android:value="true" />

        </activity>



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

    </application>

</manifest>

src/com/android/settings/Settings.java

+5 −0
Original line number Diff line number Diff line
@@ -325,4 +325,9 @@ public class Settings extends SettingsActivity { 
    public static class AppDashboardActivity extends SettingsActivity {}



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



    /**

     * Activity for OneHandedSettings

     */

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

}

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

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

import com.android.settings.gestures.DoubleTwistGestureSettings;

import com.android.settings.gestures.GestureNavigationSettingsFragment;

import com.android.settings.gestures.OneHandedSettings;

import com.android.settings.gestures.PickupGestureSettings;

import com.android.settings.gestures.PowerMenuSettings;

import com.android.settings.gestures.SwipeToNotificationSettings;
@@ -321,7 +322,8 @@ public class SettingsGateway { 
            NetworkProviderSettings.class.getName(),

            AlarmsAndRemindersDetails.class.getName(),

            MediaManagementAppsDetails.class.getName(),

            AutoBrightnessSettings.class.getName()

            AutoBrightnessSettings.class.getName(),

            OneHandedSettings.class.getName()

    };



    public static final String[] SETTINGS_FOR_RESTRICTED = {