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

Merge "Include work app in battery optimization settings" into nyc-dev

Browse Source 
am: 39066abb59

* commit '39066abb5929622a1918805bf85d19180c6dfe3d':
  Include work app in battery optimization settings

Change-Id: Ibd3aab6cde137ec145c43da3da2730dd62688d9f
This commit is contained in:
Keith Cheung
2016-04-21 15:31:17 +00:00
committed by android-build-merger
parent e042a3fe57 39066abb59
commit 5b935c170a
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
View File

@@ -1213,44 +1213,55 @@ public class ApplicationsState {
} }
} }
/**
* Compare by label, then package name, then uid.
*/
public static final Comparator<AppEntry> ALPHA_COMPARATOR = new Comparator<AppEntry>() { public static final Comparator<AppEntry> ALPHA_COMPARATOR = new Comparator<AppEntry>() {
private final Collator sCollator = Collator.getInstance(); private final Collator sCollator = Collator.getInstance();
@Override @Override
public int compare(AppEntry object1, AppEntry object2) { public int compare(AppEntry object1, AppEntry object2) {
return sCollator.compare(object1.label, object2.label); int compareResult = sCollator.compare(object1.label, object2.label);
if (compareResult != 0) {
return compareResult;
}
if (object1.info != null && object2.info != null) {
compareResult =
sCollator.compare(object1.info.packageName, object2.info.packageName);
if (compareResult != 0) {
return compareResult;
}
}
return object1.info.uid - object2.info.uid;
} }
}; };
public static final Comparator<AppEntry> SIZE_COMPARATOR public static final Comparator<AppEntry> SIZE_COMPARATOR
= new Comparator<AppEntry>() { = new Comparator<AppEntry>() {
private final Collator sCollator = Collator.getInstance();
@Override @Override
public int compare(AppEntry object1, AppEntry object2) { public int compare(AppEntry object1, AppEntry object2) {
if (object1.size < object2.size) return 1; if (object1.size < object2.size) return 1;
if (object1.size > object2.size) return -1; if (object1.size > object2.size) return -1;
return sCollator.compare(object1.label, object2.label); return ALPHA_COMPARATOR.compare(object1, object2);
} }
}; };
public static final Comparator<AppEntry> INTERNAL_SIZE_COMPARATOR public static final Comparator<AppEntry> INTERNAL_SIZE_COMPARATOR
= new Comparator<AppEntry>() { = new Comparator<AppEntry>() {
private final Collator sCollator = Collator.getInstance();
@Override @Override
public int compare(AppEntry object1, AppEntry object2) { public int compare(AppEntry object1, AppEntry object2) {
if (object1.internalSize < object2.internalSize) return 1; if (object1.internalSize < object2.internalSize) return 1;
if (object1.internalSize > object2.internalSize) return -1; if (object1.internalSize > object2.internalSize) return -1;
return sCollator.compare(object1.label, object2.label); return ALPHA_COMPARATOR.compare(object1, object2);
} }
}; };
public static final Comparator<AppEntry> EXTERNAL_SIZE_COMPARATOR public static final Comparator<AppEntry> EXTERNAL_SIZE_COMPARATOR
= new Comparator<AppEntry>() { = new Comparator<AppEntry>() {
private final Collator sCollator = Collator.getInstance();
@Override @Override
public int compare(AppEntry object1, AppEntry object2) { public int compare(AppEntry object1, AppEntry object2) {
if (object1.externalSize < object2.externalSize) return 1; if (object1.externalSize < object2.externalSize) return 1;
if (object1.externalSize > object2.externalSize) return -1; if (object1.externalSize > object2.externalSize) return -1;
return sCollator.compare(object1.label, object2.label); return ALPHA_COMPARATOR.compare(object1, object2);
} }
}; };
@@ -1272,21 +1283,18 @@ public class ApplicationsState {
} }
}; };
public static final AppFilter FILTER_PERSONAL_WITHOUT_DISABLED_UNTIL_USED = new AppFilter() { public static final AppFilter FILTER_WITHOUT_DISABLED_UNTIL_USED = new AppFilter() {
private int mCurrentUser;
public void init() { public void init() {
mCurrentUser = ActivityManager.getCurrentUser(); // do nothings
} }
@Override @Override
public boolean filterApp(AppEntry entry) { public boolean filterApp(AppEntry entry) {
return UserHandle.getUserId(entry.info.uid) == mCurrentUser && return entry.info.enabledSetting
entry.info.enabledSetting != PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED; != PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED;
} }
}; };
public static final AppFilter FILTER_WORK = new AppFilter() { public static final AppFilter FILTER_WORK = new AppFilter() {
private int mCurrentUser; private int mCurrentUser;