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

Merge "[QS] Update Cellular/data usage tile" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-08 21:36:59 +00:00
committed by Android (Google) Code Review
parent 59a1bef8e9 53f3f15654
commit a24322afc6
4 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -37136,6 +37136,7 @@ package android.provider {
field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";
field public static final java.lang.String ACTION_CHANNEL_NOTIFICATION_SETTINGS = "android.settings.CHANNEL_NOTIFICATION_SETTINGS";
field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";
field public static final java.lang.String ACTION_DATA_USAGE_SETTINGS = "android.settings.DATA_USAGE_SETTINGS";
field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";
field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";
field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";

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

@@ -429,6 +429,20 @@ public final class Settings {
public static final String ACTION_WIFI_IP_SETTINGS =
"android.settings.WIFI_IP_SETTINGS";
/**
* Activity Action: Show settings to allow configuration of data and view data usage.
* <p>
* In some cases, a matching Activity may not exist, so ensure you
* safeguard against this.
* <p>
* Input: Nothing.
* <p>
* Output: Nothing.
*/
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_DATA_USAGE_SETTINGS =
"android.settings.DATA_USAGE_SETTINGS";
/**
* Activity Action: Show settings to allow configuration of Bluetooth.
* <p>

39
packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java
View File

@@ -24,6 +24,7 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.os.SystemProperties;
import android.provider.Settings;
import android.service.quicksettings.Tile;
import android.view.LayoutInflater;
import android.view.View;
@@ -52,16 +53,6 @@ import com.android.systemui.statusbar.policy.NetworkController.SignalCallback;
/** Quick settings tile: Cellular **/
public class CellularTile extends QSTileImpl<SignalState> {
private static final ComponentName CELLULAR_SETTING_COMPONENT = new ComponentName(
"com.android.settings", "com.android.settings.Settings$DataUsageSummaryActivity");
private static final ComponentName DATA_PLAN_CELLULAR_COMPONENT = new ComponentName(
"com.android.settings", "com.android.settings.Settings$DataPlanUsageSummaryActivity");
private static final Intent CELLULAR_SETTINGS =
new Intent().setComponent(CELLULAR_SETTING_COMPONENT);
private static final Intent DATA_PLAN_CELLULAR_SETTINGS =
new Intent().setComponent(DATA_PLAN_CELLULAR_COMPONENT);
private static final String ENABLE_SETTINGS_DATA_PLAN = "enable.settings.data.plan";
private final NetworkController mController;
@@ -107,7 +98,7 @@ public class CellularTile extends QSTileImpl<SignalState> {
@Override
public Intent getLongClickIntent() {
return getCellularSettingIntent(mContext);
return getCellularSettingIntent();
}
@Override
@@ -148,8 +139,7 @@ public class CellularTile extends QSTileImpl<SignalState> {
showDetail(true);
} else {
mActivityStarter
.postStartActivityDismissingKeyguard(getCellularSettingIntent(mContext),
0 /* delay */);
.postStartActivityDismissingKeyguard(getCellularSettingIntent(),0 /* delay */);
}
}
@@ -293,25 +283,8 @@ public class CellularTile extends QSTileImpl<SignalState> {
}
}
static Intent getCellularSettingIntent(Context context) {
// TODO(b/62349208): We should replace feature flag check below with data plans
// availability check. If the data plans are available we display the data plans usage
// summary otherwise we display data usage summary without data plans.
boolean isDataPlanFeatureEnabled =
SystemProperties.getBoolean(ENABLE_SETTINGS_DATA_PLAN, false /* default */);
context.getPackageManager()
.setComponentEnabledSetting(
DATA_PLAN_CELLULAR_COMPONENT,
isDataPlanFeatureEnabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
: PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);
context.getPackageManager()
.setComponentEnabledSetting(
CELLULAR_SETTING_COMPONENT,
isDataPlanFeatureEnabled ? PackageManager.COMPONENT_ENABLED_STATE_DISABLED
: PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
PackageManager.DONT_KILL_APP);
return isDataPlanFeatureEnabled ? DATA_PLAN_CELLULAR_SETTINGS : CELLULAR_SETTINGS;
static Intent getCellularSettingIntent() {
return new Intent(Settings.ACTION_DATA_USAGE_SETTINGS);
}
private final class CellularDetailAdapter implements DetailAdapter {
@@ -330,7 +303,7 @@ public class CellularTile extends QSTileImpl<SignalState> {
@Override
public Intent getSettingsIntent() {
return getCellularSettingIntent(mContext);
return getCellularSettingIntent();
}
@Override

2
packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java
View File

@@ -55,7 +55,7 @@ public class DataSaverTile extends QSTileImpl<BooleanState> implements
@Override
public Intent getLongClickIntent() {
return CellularTile.getCellularSettingIntent(mContext);
return CellularTile.getCellularSettingIntent();
}
@Override
protected void handleClick() {