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

Commit c482b8d8 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix intent in HotspotTile" into sc-qpr1-dev am: 1b4cc5d7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15837790

Change-Id: I9dd11dcd1e417de08de003e999c4e956c762bce5
parents 2afc49de 1b4cc5d7

core/java/android/provider/Settings.java

+15 −0
Original line number Diff line number Diff line
@@ -2241,6 +2241,21 @@ public final class Settings { 
    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_TETHER_SETTINGS = "android.settings.TETHER_SETTINGS";













    /**













     * Activity Action: Show screen that lets user configure wifi tethering.













     * <p>













     * In some cases, a matching Activity may not exist, so ensure you safeguard against this.













     * <p>













     * Input: Nothing













     * <p>













     * Output: Nothing













     *













     * @hide













     */













    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    public static final String ACTION_WIFI_TETHER_SETTING =













            "com.android.settings.WIFI_TETHER_SETTINGS";



























    /**















     * Broadcast to trigger notification of asking user to enable MMS.















     * Need to specify {@link #EXTRA_ENABLE_MMS_DATA_REQUEST_REASON} and {@link #EXTRA_SUB_ID}.

































packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -47,6 +47,7 @@ import javax.inject.Inject;





























/** Quick settings tile: Hotspot **/















public class HotspotTile extends QSTileImpl<BooleanState> {





























    private final Icon mEnabledStatic = ResourceIcon.get(R.drawable.ic_hotspot);































    private final HotspotController mHotspotController;










@@ -98,7 +99,7 @@ public class HotspotTile extends QSTileImpl<BooleanState> {





























    @Override















    public Intent getLongClickIntent() {













        return new Intent(Settings.ACTION_TETHER_SETTINGS);













        return new Intent(Settings.ACTION_WIFI_TETHER_SETTING);















    }































    @Override