PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am dbd2f759: Merge "Supress Location button when coming from Location" into klp-dev

Browse Source 
* commit 'dbd2f7592943f49dd8227f01fa9c5d14e4e58c0b':
  Supress Location button when coming from Location
This commit is contained in:
Lifu Tang
2013-08-19 14:37:09 -07:00
committed by Android Git Automerger
parent 88d83a901f dbd2f75929
commit 0acf3cfc8c
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fuelgauge/BatteryStatsHelper.java
View File

@@ -175,7 +175,8 @@ public class BatteryStatsHelper {
}
}
public void startBatteryDetailPage(PreferenceActivity caller, BatterySipper sipper) {
public void startBatteryDetailPage(
PreferenceActivity caller, BatterySipper sipper, boolean showLocationButton) {
// Initialize mStats if necessary.
getStats();
@@ -193,6 +194,7 @@ public class BatteryStatsHelper {
args.putInt(PowerUsageDetail.EXTRA_UID, sipper.uidObj.getUid());
}
args.putSerializable(PowerUsageDetail.EXTRA_DRAIN_TYPE, sipper.drainType);
args.putBoolean(PowerUsageDetail.EXTRA_SHOW_LOCATION_BUTTON, showLocationButton);
int[] types;
double[] values;

9
src/com/android/settings/fuelgauge/PowerUsageDetail.java
View File

@@ -107,6 +107,7 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
public static final String EXTRA_ICON_PACKAGE = "iconPackage"; // String
public static final String EXTRA_NO_COVERAGE = "noCoverage";
public static final String EXTRA_ICON_ID = "iconId"; // Int
public static final String EXTRA_SHOW_LOCATION_BUTTON = "showLocationButton"; // Boolean
private PackageManager mPm;
private DevicePolicyManager mDpm;
@@ -128,13 +129,14 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
private double mNoCoverage; // Percentage of time that there was no coverage
private boolean mUsesGps;
private boolean mShowLocationButton;
private static final String TAG = "PowerUsageDetail";
private String[] mPackages;
ApplicationInfo mApp;
ComponentName mInstaller;
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -176,6 +178,7 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
mNoCoverage = args.getDouble(EXTRA_NO_COVERAGE, 0);
String iconPackage = args.getString(EXTRA_ICON_PACKAGE);
int iconId = args.getInt(EXTRA_ICON_ID, 0);
mShowLocationButton = args.getBoolean(EXTRA_SHOW_LOCATION_BUTTON);
if (!TextUtils.isEmpty(iconPackage)) {
try {
final PackageManager pm = getActivity().getPackageManager();
@@ -362,7 +365,9 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
// If the application has a settings screen, jump to that
// TODO:
}
if (mUsesGps) {
// If power usage detail page is launched from location page, suppress "Location"
// button to prevent circular loops.
if (mUsesGps && mShowLocationButton) {
addControl(R.string.location_settings_title,
R.string.battery_sugg_apps_gps, ACTION_LOCATION_SETTINGS);
removeHeader = false;

2
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -144,7 +144,7 @@ public class PowerUsageSummary extends PreferenceFragment {
}
PowerGaugePreference pgp = (PowerGaugePreference) preference;
BatterySipper sipper = pgp.getInfo();
mStatsHelper.startBatteryDetailPage((PreferenceActivity) getActivity(), sipper);
mStatsHelper.startBatteryDetailPage((PreferenceActivity) getActivity(), sipper, true);
return super.onPreferenceTreeClick(preferenceScreen, preference);
}

2
src/com/android/settings/location/RecentLocationApps.java
View File

@@ -69,7 +69,7 @@ public class RecentLocationApps {
@Override
public boolean onPreferenceClick(Preference preference) {
mStatsHelper.startBatteryDetailPage(mActivity, mSipper);
mStatsHelper.startBatteryDetailPage(mActivity, mSipper, false);
return true;
}
}