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

Depend on support lib preferences

Browse Source 
Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
This commit is contained in:
Jason Monk
2015-09-10 15:52:51 -04:00
parent 136ed7b6b2
commit 39b467482d
308 changed files with 2684 additions and 1762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/fuelgauge/BatteryHistoryChart.java
View File

@@ -16,32 +16,33 @@
package com.android.settings.fuelgauge;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.DashPathEffect;
import android.os.BatteryManager;
import android.text.format.DateFormat;
import android.text.format.Formatter;
import android.util.Log;
import android.util.TimeUtils;
import com.android.settings.R;
import com.android.settings.Utils;
import android.content.Context;
import android.content.Intent;
import android.content.res.ColorStateList;
import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.DashPathEffect;
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.Typeface;
import android.os.BatteryManager;
import android.os.BatteryStats;
import android.os.SystemClock;
import android.os.BatteryStats.HistoryItem;
import android.os.SystemClock;
import android.telephony.ServiceState;
import android.text.TextPaint;
import android.text.format.DateFormat;
import android.text.format.Formatter;
import android.util.AttributeSet;
import android.util.Log;
import android.util.TimeUtils;
import android.util.TypedValue;
import android.view.View;
import com.android.settings.R;
import com.android.settings.Utils;
import libcore.icu.LocaleData;
import java.util.ArrayList;

13
src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
View File

@@ -20,10 +20,9 @@ import android.content.Context;
import android.content.Intent;
import android.os.BatteryStats;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceScreen;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
import com.android.internal.os.BatteryStatsHelper;
@@ -48,9 +47,9 @@ public class BatteryHistoryPreference extends Preference {
public BatteryHistoryPreference(Context context, AttributeSet attrs) {
super(context, attrs);
}
@Override
public void performClick(PreferenceScreen preferenceScreen) {
protected void onClick() {
if (!isEnabled()) {
return;
}
@@ -84,8 +83,8 @@ public class BatteryHistoryPreference extends Preference {
}
@Override
protected void onBindView(View view) {
super.onBindView(view);
public void onBindViewHolder(PreferenceViewHolder view) {
super.onBindViewHolder(view);
if (mStats == null) {
return;

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

@@ -16,8 +16,6 @@
package com.android.settings.fuelgauge;
import static android.provider.Settings.EXTRA_BATTERY_SAVER_MODE_ENABLED;
import android.content.Context;
import android.content.Intent;
import android.os.PowerManager;
@@ -25,6 +23,8 @@ import android.util.Log;
import com.android.settings.utils.VoiceSettingsActivity;
import static android.provider.Settings.EXTRA_BATTERY_SAVER_MODE_ENABLED;
/**
* Activity for modifying the {@link android.os.PowerManager} power save mode
* setting using the Voice Interaction API.

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

@@ -16,8 +16,6 @@
package com.android.settings.fuelgauge;
import static android.os.PowerManager.ACTION_POWER_SAVE_MODE_CHANGING;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.Context;
@@ -42,6 +40,8 @@ import com.android.settings.Utils;
import com.android.settings.notification.SettingPref;
import com.android.settings.widget.SwitchBar;
import static android.os.PowerManager.ACTION_POWER_SAVE_MODE_CHANGING;
public class BatterySaverSettings extends SettingsPreferenceFragment
implements SwitchBar.OnSwitchChangeListener {
private static final String TAG = "BatterySaverSettings";

1
src/com/android/settings/fuelgauge/FakeUid.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.fuelgauge;
import android.os.BatteryStats.Timer;
import android.os.BatteryStats.Uid;
import android.os.Process;
import android.util.ArrayMap;
import android.util.SparseArray;

8
src/com/android/settings/fuelgauge/InactiveApps.java
View File

@@ -22,9 +22,9 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceGroup;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceGroup;
import com.android.internal.logging.MetricsLogger;
import com.android.settings.R;
@@ -68,7 +68,7 @@ public class InactiveApps extends SettingsPreferenceFragment implements OnPrefer
List<ResolveInfo> apps = pm.queryIntentActivities(launcherIntent, 0);
for (ResolveInfo app : apps) {
String packageName = app.activityInfo.applicationInfo.packageName;
Preference p = new Preference(context);
Preference p = new Preference(getPrefContext());
p.setTitle(app.loadLabel(pm));
p.setIcon(app.loadIcon(pm));
p.setKey(packageName);

6
src/com/android/settings/fuelgauge/PowerGaugePreference.java
View File

@@ -19,7 +19,7 @@ package com.android.settings.fuelgauge;
import android.content.Context;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.view.View;
import android.support.v7.preference.PreferenceViewHolder;
import android.widget.TextView;
import com.android.settings.AppProgressPreference;
@@ -51,8 +51,8 @@ public class PowerGaugePreference extends AppProgressPreference {
}
@Override
protected void onBindView(View view) {
super.onBindView(view);
public void onBindViewHolder(PreferenceViewHolder view) {
super.onBindViewHolder(view);
if (mContentDescription != null) {
final TextView titleView = (TextView) view.findViewById(android.R.id.title);

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

@@ -34,9 +34,9 @@ import android.os.BatteryStats;
import android.os.Bundle;
import android.os.Process;
import android.os.UserHandle;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceCategory;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceCategory;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
@@ -53,7 +53,6 @@ import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.WirelessSettings;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.applications.InstalledAppDetails;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.bluetooth.BluetoothSettings;
@@ -577,7 +576,7 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
private void addHorizontalPreference(PreferenceCategory parent, CharSequence title,
CharSequence summary) {
Preference pref = new Preference(getActivity());
Preference pref = new Preference(getPrefContext());
pref.setLayoutResource(R.layout.horizontal_preference);
pref.setTitle(title);
pref.setSummary(summary);
@@ -646,7 +645,7 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
}
private void addControl(int pageSummary, int actionTitle, final int action) {
Preference pref = new Preference(getActivity());
Preference pref = new Preference(getPrefContext());
pref.setTitle(actionTitle);
pref.setLayoutResource(R.layout.horizontal_preference);
pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {

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

@@ -25,10 +25,8 @@ import android.os.Handler;
import android.os.Message;
import android.os.Process;
import android.os.UserHandle;
import android.preference.Preference;
import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen;
import android.text.TextUtils;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
import android.util.SparseArray;
import android.util.TypedValue;
import android.view.Menu;
@@ -39,11 +37,9 @@ import com.android.internal.logging.MetricsLogger;
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatterySipper.DrainType;
import com.android.internal.os.PowerProfile;
import com.android.settings.HelpUtils;
import com.android.settings.R;
import com.android.settings.Settings.HighPowerApplicationsActivity;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.applications.ManageApplications;
import java.util.ArrayList;
@@ -117,7 +113,7 @@ public class PowerUsageSummary extends PowerUsageBase {
}
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
public boolean onPreferenceTreeClick(Preference preference) {
if (!(preference instanceof PowerGaugePreference)) {
return false;
}
@@ -125,7 +121,7 @@ public class PowerUsageSummary extends PowerUsageBase {
BatteryEntry entry = pgp.getInfo();
PowerUsageDetail.startBatteryDetailPage((SettingsActivity) getActivity(), mStatsHelper,
mStatsType, entry, true, true);
return super.onPreferenceTreeClick(preferenceScreen, preference);
return super.onPreferenceTreeClick(preference);
}
@Override
@@ -177,7 +173,7 @@ public class PowerUsageSummary extends PowerUsageBase {
}
private void addNotAvailableMessage() {
Preference notAvailable = new Preference(getActivity());
Preference notAvailable = new Preference(getPrefContext());
notAvailable.setTitle(R.string.power_usage_not_available);
mAppListGroup.addPreference(notAvailable);
}
@@ -345,7 +341,7 @@ public class PowerUsageSummary extends PowerUsageBase {
userHandle);
final CharSequence contentDescription = mUm.getBadgedLabelForUser(entry.getLabel(),
userHandle);
final PowerGaugePreference pref = new PowerGaugePreference(getActivity(),
final PowerGaugePreference pref = new PowerGaugePreference(getPrefContext(),
badgedIcon, contentDescription, entry);
final double percentOfMax = (sipper.totalPowerMah * 100)

8
src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
View File

@@ -20,17 +20,17 @@ import android.Manifest;
import android.content.DialogInterface;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Bundle;
import android.os.IDeviceIdleController;
import android.os.PowerManager;
import android.os.RemoteException;
import android.os.ServiceManager;
import com.android.settings.R;
import android.net.Uri;
import android.os.Bundle;
import android.util.Log;
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
import com.android.settings.R;
public class RequestIgnoreBatteryOptimizations extends AlertActivity implements
DialogInterface.OnClickListener {

8
src/com/android/settings/fuelgauge/WallOfTextPreference.java
View File

@@ -17,9 +17,9 @@
package com.android.settings.fuelgauge;
import android.content.Context;
import android.preference.Preference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.view.View;
import android.widget.TextView;
public class WallOfTextPreference extends Preference {
@@ -42,8 +42,8 @@ public class WallOfTextPreference extends Preference {
}
@Override
protected void onBindView(View view) {
super.onBindView(view);
public void onBindViewHolder(PreferenceViewHolder view) {
super.onBindViewHolder(view);
final TextView summary = (TextView) view.findViewById(android.R.id.summary);
summary.setMaxLines(20);
}