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

Settings dashboard performance work

Browse Source 
- Don't block main thread with rebuild work
 - Don't run rebuild as foreground priority
 - Don't use comparator on apps/notifications summaries, we don't
   care about order
 - Simplify dashboard item layout

Change-Id: I33bdd06a234ea308b44b45cac5ed1e9eac1c7d43
Fixes: 26541310
This commit is contained in:
Jason Monk
2016-04-12 10:32:20 -04:00
parent 2f99770cc1
commit f8b2180b96
3 changed files with 55 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
res/layout/dashboard_tile.xml
View File

@@ -15,57 +15,40 @@
--> -->
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="@dimen/dashboard_tile_minimum_height" android:minHeight="@dimen/dashboard_tile_minimum_height"
android:clickable="true" android:clickable="true"
android:background="@drawable/selectable_card" > android:background="@drawable/selectable_card" >
<ImageView <ImageView
android:id="@android:id/icon" android:id="@android:id/icon"
android:layout_width="@dimen/dashboard_tile_image_size" android:layout_width="@dimen/dashboard_tile_image_size"
android:layout_height="@dimen/dashboard_tile_image_size" android:layout_height="@dimen/dashboard_tile_image_size"
android:scaleType="centerInside" android:scaleType="centerInside"
android:layout_marginStart="@dimen/dashboard_tile_image_margin_start" android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" /> android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <TextView android:id="@android:id/title"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="0dip" android:layout_height="wrap_content"
android:orientation="vertical" android:singleLine="true"
android:gravity="center_vertical" android:textAppearance="@style/TextAppearance.TileTitle"
android:layout_weight="1"> android:ellipsize="marquee"
android:fadingEdge="horizontal" />
<RelativeLayout <TextView android:id="@android:id/summary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.Small"
<TextView android:id="@android:id/title" android:textColor="?android:attr/textColorSecondary" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.TileTitle"
android:ellipsize="marquee"
android:fadingEdge="horizontal" />
<TextView android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
android:textAppearance="@style/TextAppearance.Small"
android:textColor="?android:attr/textColorSecondary" />
</RelativeLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>

26
src/com/android/settings/applications/ManageApplications.java
View File

@@ -23,10 +23,7 @@ import android.content.Intent;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.icu.text.AlphabeticIndex; import android.icu.text.AlphabeticIndex;
import android.os.Bundle; import android.os.*;
import android.os.Environment;
import android.os.UserHandle;
import android.os.UserManager;
import android.preference.PreferenceFrameLayout; import android.preference.PreferenceFrameLayout;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.ArraySet; import android.util.ArraySet;
@@ -1225,6 +1222,7 @@ public class ManageApplications extends InstrumentedFragment
// TODO: Can probably hack together with less than full app state. // TODO: Can probably hack together with less than full app state.
private final ApplicationsState mAppState; private final ApplicationsState mAppState;
private final ApplicationsState.Session mSession; private final ApplicationsState.Session mSession;
private final Handler mHandler;
private SummaryProvider(Context context, SummaryLoader loader) { private SummaryProvider(Context context, SummaryLoader loader) {
mContext = context; mContext = context;
@@ -1232,6 +1230,7 @@ public class ManageApplications extends InstrumentedFragment
mAppState = mAppState =
ApplicationsState.getInstance((Application) context.getApplicationContext()); ApplicationsState.getInstance((Application) context.getApplicationContext());
mSession = mAppState.newSession(this); mSession = mAppState.newSession(this);
mHandler = new Handler(mAppState.getBackgroundLooper());
} }
@Override @Override
@@ -1248,6 +1247,16 @@ public class ManageApplications extends InstrumentedFragment
mLoader.setSummary(this, mContext.getString(R.string.apps_summary, apps.size())); mLoader.setSummary(this, mContext.getString(R.string.apps_summary, apps.size()));
} }
private void postRebuild() {
mHandler.post(new Runnable() {
@Override
public void run() {
updateSummary(mSession.rebuild(ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER,
null, false));
}
});
}
@Override @Override
public void onRebuildComplete(ArrayList<AppEntry> apps) { public void onRebuildComplete(ArrayList<AppEntry> apps) {
updateSummary(apps); updateSummary(apps);
@@ -1255,20 +1264,17 @@ public class ManageApplications extends InstrumentedFragment
@Override @Override
public void onPackageListChanged() { public void onPackageListChanged() {
updateSummary(mSession.rebuild(ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER, postRebuild();
ApplicationsState.ALPHA_COMPARATOR));
} }
@Override @Override
public void onLauncherInfoChanged() { public void onLauncherInfoChanged() {
updateSummary(mSession.rebuild(ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER, postRebuild();
ApplicationsState.ALPHA_COMPARATOR));
} }
@Override @Override
public void onLoadEntriesCompleted() { public void onLoadEntriesCompleted() {
updateSummary(mSession.rebuild(ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER, postRebuild();
ApplicationsState.ALPHA_COMPARATOR));
} }
@Override @Override

14
src/com/android/settings/applications/NotificationApps.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.applications;
import android.app.Activity; import android.app.Activity;
import android.app.Application; import android.app.Application;
import android.content.Context; import android.content.Context;
import android.os.Handler;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.applications.AppStateBaseBridge.Callback; import com.android.settings.applications.AppStateBaseBridge.Callback;
import com.android.settings.dashboard.SummaryLoader; import com.android.settings.dashboard.SummaryLoader;
@@ -44,6 +45,7 @@ public class NotificationApps extends ManageApplications {
private final ApplicationsState.Session mSession; private final ApplicationsState.Session mSession;
private final NotificationBackend mNotifBackend; private final NotificationBackend mNotifBackend;
private final AppStateNotificationBridge mExtraInfoBridge; private final AppStateNotificationBridge mExtraInfoBridge;
private final Handler mHandler;
private SummaryProvider(Context context, SummaryLoader loader) { private SummaryProvider(Context context, SummaryLoader loader) {
mContext = context; mContext = context;
@@ -54,6 +56,7 @@ public class NotificationApps extends ManageApplications {
mNotifBackend = new NotificationBackend(); mNotifBackend = new NotificationBackend();
mExtraInfoBridge = new AppStateNotificationBridge(mContext, mExtraInfoBridge = new AppStateNotificationBridge(mContext,
mAppState, this, mNotifBackend); mAppState, this, mNotifBackend);
mHandler = new Handler(mAppState.getBackgroundLooper());
} }
@Override @Override
@@ -84,9 +87,14 @@ public class NotificationApps extends ManageApplications {
@Override @Override
public void onExtraInfoUpdated() { public void onExtraInfoUpdated() {
updateSummary(mSession.rebuild( mHandler.post(new Runnable() {
AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED, @Override
ApplicationsState.ALPHA_COMPARATOR)); public void run() {
updateSummary(mSession.rebuild(
AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED,
null, false));
}
});
} }
@Override @Override