Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I5404508dc731e5f4b801d19c8ab101b5ccde02c0
This commit is contained in:
Fabian Kozynski
2021-09-20 14:01:54 +00:00
committed by Automerger Merge Worker
parent 0c0a4560dd c482b8d89e
commit 558cd75f66
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/provider/Settings.java
View File

@@ -2243,6 +2243,21 @@ public final class Settings {
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_TETHER_SETTINGS = "android.settings.TETHER_SETTINGS"; 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. * 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}. * Need to specify {@link #EXTRA_ENABLE_MMS_DATA_REQUEST_REASON} and {@link #EXTRA_SUB_ID}.

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

@@ -47,6 +47,7 @@ import javax.inject.Inject;
/** Quick settings tile: Hotspot **/ /** Quick settings tile: Hotspot **/
public class HotspotTile extends QSTileImpl<BooleanState> { public class HotspotTile extends QSTileImpl<BooleanState> {
private final Icon mEnabledStatic = ResourceIcon.get(R.drawable.ic_hotspot); private final Icon mEnabledStatic = ResourceIcon.get(R.drawable.ic_hotspot);
private final HotspotController mHotspotController; private final HotspotController mHotspotController;
@@ -98,7 +99,7 @@ public class HotspotTile extends QSTileImpl<BooleanState> {
@Override @Override
public Intent getLongClickIntent() { public Intent getLongClickIntent() {
return new Intent(Settings.ACTION_TETHER_SETTINGS); return new Intent(Settings.ACTION_WIFI_TETHER_SETTING);
} }
@Override @Override