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

Merge "Shifting hotseat icons to aling with all-apps icon, if the hotseat size is different from the source device" into ub-launcher3-burnaby

Browse Source
This commit is contained in:
Sunny Goyal
2015-07-21 01:50:37 +00:00
committed by Android (Google) Code Review
parent 3ba922aa62 c115e647ad
commit 7e0a403759
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherBackupHelper.java
+16 -2
View File
@@ -153,6 +153,10 @@ public class LauncherBackupHelper implements BackupHelper {
boolean restoreSuccessful;
int restoredBackupVersion = 1;
// When migrating from a device which different hotseat configuration, the icons are shifted
// to center along the new all-apps icon.
private int mHotseatShift = 0;
public LauncherBackupHelper(Context context) {
mContext = context;
mExistingKeys = new HashSet<String>();
@@ -285,10 +289,15 @@ public class LauncherBackupHelper implements BackupHelper {
boolean isHotsetCompatible = false;
if (currentProfile.allappsRank >= oldProfile.hotseatCount) {
isHotsetCompatible = true;
mHotseatShift = 0;
}
if ((currentProfile.hotseatCount >= oldProfile.hotseatCount) &&
(currentProfile.allappsRank == oldProfile.allappsRank)) {
if ((currentProfile.allappsRank >= oldProfile.allappsRank)
&& ((currentProfile.hotseatCount - currentProfile.allappsRank) >=
(oldProfile.hotseatCount - oldProfile.allappsRank))) {
// There is enough space on both sides of the hotseat.
isHotsetCompatible = true;
mHotseatShift = currentProfile.allappsRank - oldProfile.allappsRank;
}
return isHotsetCompatible && (currentProfile.desktopCols >= oldProfile.desktopCols)
@@ -848,6 +857,11 @@ public class LauncherBackupHelper implements BackupHelper {
throws IOException {
Favorite favorite = unpackProto(new Favorite(), buffer, dataSize);
// If it is a hotseat item, move it accordingly.
if (favorite.container == Favorites.CONTAINER_HOTSEAT) {
favorite.screen += mHotseatShift;
}
ContentValues values = new ContentValues();
values.put(Favorites._ID, favorite.id);
values.put(Favorites.SCREEN, favorite.screen);