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

Merge "Fix QS Edit flashing on exit" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-04-29 19:04:17 +00:00
committed by Android (Google) Code Review
parent 3b016f5445 63554eda8d
commit 0f11729d3d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
View File

@@ -106,6 +106,7 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene
public void setHost(QSTileHost host) { public void setHost(QSTileHost host) {
mHost = host; mHost = host;
mPhoneStatusBar = host.getPhoneStatusBar(); mPhoneStatusBar = host.getPhoneStatusBar();
mTileAdapter.setHost(host);
} }
public void setContainer(NotificationsQuickSettingsContainer notificationsQsContainer) { public void setContainer(NotificationsQuickSettingsContainer notificationsQsContainer) {

9
packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
View File

@@ -81,6 +81,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
private Holder mCurrentDrag; private Holder mCurrentDrag;
private boolean mAccessibilityMoving; private boolean mAccessibilityMoving;
private int mAccessibilityFromIndex; private int mAccessibilityFromIndex;
private QSTileHost mHost;
public TileAdapter(Context context) { public TileAdapter(Context context) {
mContext = context; mContext = context;
@@ -88,6 +89,10 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
mItemTouchHelper = new ItemTouchHelper(mCallbacks); mItemTouchHelper = new ItemTouchHelper(mCallbacks);
} }
public void setHost(QSTileHost host) {
mHost = host;
}
@Override @Override
public long getItemId(int position) { public long getItemId(int position) {
return mTiles.get(position) != null ? mAllTiles.indexOf(mTiles.get(position)) return mTiles.get(position) != null ? mAllTiles.indexOf(mTiles.get(position))
@@ -108,7 +113,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
newSpecs.add(mTiles.get(i).spec); newSpecs.add(mTiles.get(i).spec);
} }
host.changeTiles(mCurrentSpecs, newSpecs); host.changeTiles(mCurrentSpecs, newSpecs);
setTileSpecs(newSpecs); mCurrentSpecs = newSpecs;
} }
public void setTileSpecs(List<String> currentSpecs) { public void setTileSpecs(List<String> currentSpecs) {
@@ -285,6 +290,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
move(mAccessibilityFromIndex, position, v); move(mAccessibilityFromIndex, position, v);
notifyItemChanged(mAccessibilityFromIndex); notifyItemChanged(mAccessibilityFromIndex);
notifyItemMoved(mAccessibilityFromIndex, position); notifyItemMoved(mAccessibilityFromIndex, position);
saveSpecs(mHost);
} }
private void showAccessibilityDialog(final int position, final View v) { private void showAccessibilityDialog(final int position, final View v) {
@@ -373,6 +379,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta
fromLabel, (to + 1)); fromLabel, (to + 1));
} }
v.announceForAccessibility(announcement); v.announceForAccessibility(announcement);
saveSpecs(mHost);
return true; return true;
} }