OSDN Git Service
Adam Cohen [Sat, 18 Jan 2014 00:23:19 +0000 (16:23 -0800)]
am
a4db090b: Merge "Adding specific buckets for N5 in dynamic grid. (Bug
12604220)" into jb-ub-now-kermit
* commit '
a4db090b1345038a89a38ba8af6ac74f71e2ed7c':
Adding specific buckets for N5 in dynamic grid. (Bug
12604220)
Adam Cohen [Sat, 18 Jan 2014 00:21:56 +0000 (00:21 +0000)]
Merge "Adding specific buckets for N5 in dynamic grid. (Bug
12604220)" into jb-ub-now-kermit
Winson Chung [Fri, 17 Jan 2014 22:43:02 +0000 (14:43 -0800)]
Adding specific buckets for N5 in dynamic grid. (Bug
12604220)
Change-Id: I1fa62b7d16f557c7191fb1666d687b8784a88857
Adam Cohen [Fri, 17 Jan 2014 22:34:19 +0000 (14:34 -0800)]
am
5ac62d69: Merge "Fix overlapping pages (issue
12551580)" into jb-ub-now-kermit
* commit '
5ac62d6914067c48e1fcdb3f6f149532017c5803':
Fix overlapping pages (issue
12551580)
Adam Cohen [Fri, 17 Jan 2014 22:32:21 +0000 (22:32 +0000)]
Merge "Fix overlapping pages (issue
12551580)" into jb-ub-now-kermit
Adam Cohen [Fri, 17 Jan 2014 21:28:54 +0000 (13:28 -0800)]
am
e6e0af03: Merge "Dismissing search and other overlays when the menu button is pressed. (Bug
12524591)" into jb-ub-now-kermit
* commit '
e6e0af03ee39b3e800c8f7e86eefffae432ee7c8':
Dismissing search and other overlays when the menu button is pressed. (Bug
12524591)
Adam Cohen [Fri, 17 Jan 2014 20:25:14 +0000 (20:25 +0000)]
Merge "Dismissing search and other overlays when the menu button is pressed. (Bug
12524591)" into jb-ub-now-kermit
Winson Chung [Fri, 17 Jan 2014 20:03:00 +0000 (12:03 -0800)]
Dismissing search and other overlays when the menu button is pressed. (Bug
12524591)
Adam Cohen [Fri, 17 Jan 2014 00:07:50 +0000 (16:07 -0800)]
Fix overlapping pages (issue
12551580)
Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f
Selim Cinek [Thu, 16 Jan 2014 18:38:38 +0000 (10:38 -0800)]
Disabled the wallpaper when completely in -1 Now space.
Bug:
11186234
Change-Id: I6ffb66f12298bd9df7e228a8589d63780b70a396
Winson Chung [Thu, 16 Jan 2014 23:10:51 +0000 (15:10 -0800)]
am
f8584042: Merge "Updating Tablet clings. (Bug
11973614)" into jb-ub-now-kermit
* commit '
f8584042713aad82f9d057ecaace8a9ad1aad0bc':
Updating Tablet clings. (Bug
11973614)
Winson Chung [Thu, 16 Jan 2014 23:07:35 +0000 (15:07 -0800)]
am
1ba0a30e: Merge "Adding new bucket for inbetween phone-tablet layouts. (Bug
11993166)" into jb-ub-now-kermit
* commit '
1ba0a30e6545a8c313d0ef355a101f661bbf778c':
Adding new bucket for inbetween phone-tablet layouts. (Bug
11993166)
Adam Cohen [Thu, 16 Jan 2014 23:07:34 +0000 (15:07 -0800)]
am
08101b1f: Merge "Lazy load the widget preview loader class" into jb-ub-now-kermit
* commit '
08101b1f52b2b6aa8ddb82f09a18b91482b99f58':
Lazy load the widget preview loader class
Winson Chung [Thu, 16 Jan 2014 23:07:01 +0000 (23:07 +0000)]
Merge "Updating Tablet clings. (Bug
11973614)" into jb-ub-now-kermit
Winson Chung [Thu, 16 Jan 2014 23:06:29 +0000 (23:06 +0000)]
Merge "Adding new bucket for inbetween phone-tablet layouts. (Bug
11993166)" into jb-ub-now-kermit
Adam Cohen [Thu, 16 Jan 2014 23:05:00 +0000 (23:05 +0000)]
Merge "Lazy load the widget preview loader class" into jb-ub-now-kermit
Winson Chung [Thu, 16 Jan 2014 22:50:25 +0000 (14:50 -0800)]
am
e1b0682a: Merge "Updating screen background assets. (Bug
12136457)" into jb-ub-now-kermit
* commit '
e1b0682af062bc85b7328f5c635a21d9ce420d8e':
Updating screen background assets. (Bug
12136457)
Winson Chung [Thu, 16 Jan 2014 22:48:32 +0000 (22:48 +0000)]
Merge "Updating screen background assets. (Bug
12136457)" into jb-ub-now-kermit
Winson Chung [Thu, 16 Jan 2014 22:03:55 +0000 (14:03 -0800)]
Adding new bucket for inbetween phone-tablet layouts. (Bug
11993166)
Change-Id: I01fc54be8059d4cd25ff465c70595683fc8ac019
Winson Chung [Thu, 16 Jan 2014 22:41:21 +0000 (14:41 -0800)]
Updating screen background assets. (Bug
12136457)
Change-Id: I48d235d9c44a53b5fbf6c244736e86cbc9f19162
Winson Chung [Wed, 15 Jan 2014 22:31:59 +0000 (14:31 -0800)]
Updating Tablet clings. (Bug
11973614)
Change-Id: I6cb10424a345691d50c4fac7969e0b97bbee4b3c
Adam Cohen [Thu, 16 Jan 2014 19:59:19 +0000 (11:59 -0800)]
am
72960975: Migration update: ensuring all folders go first
* commit '
72960975d8367e7ce789d8a5b6f0763fb0ec78bf':
Migration update: ensuring all folders go first
Adam Cohen [Thu, 16 Jan 2014 02:13:55 +0000 (18:13 -0800)]
Migration update: ensuring all folders go first
-> Also, leave the last row empty on every screen
-> Fix bug where shortcuts weren't getting moved (introduced in
previous CL)
-> Only dedupe items directly on the workspace
Bug
12416411
Bug
12572727
Change-Id: Id95cc6081c57cc289c2a85b2a6872ee0bf3eb98a
Adam Cohen [Thu, 16 Jan 2014 19:20:19 +0000 (11:20 -0800)]
am
556f6135: Don\'t migrate shortcuts for components that no longer exist
* commit '
556f6135f992dcd5bfbfffe0172627bfbf57d24e':
Don't migrate shortcuts for components that no longer exist
Michael Jurka [Thu, 9 Jan 2014 13:59:22 +0000 (14:59 +0100)]
Lazy load the widget preview loader class
Bug:
12109621
Change-Id: Id99aded30195bf39ebcf2148611bc4e084f3b2c7
Adam Cohen [Wed, 15 Jan 2014 23:18:08 +0000 (15:18 -0800)]
Don't migrate shortcuts for components that no longer exist
Bug
12570791
Change-Id: Ie4b55afcee0c4d1d16acf7b830d7885800943454
Adrian Roos [Wed, 15 Jan 2014 23:18:23 +0000 (23:18 +0000)]
Merge "Fix back button behavior for "App info" when launched by Launcher3." into ub-now-lunchbox
Chris Wren [Wed, 15 Jan 2014 23:03:10 +0000 (15:03 -0800)]
am
230cbf83: Merge "rationalize launcher backup logging" into jb-ub-now-kermit
* commit '
230cbf831cbbe8aaa6eaff976f755a8adf5e1708':
rationalize launcher backup logging
Chris Wren [Wed, 15 Jan 2014 22:09:20 +0000 (22:09 +0000)]
Merge "rationalize launcher backup logging" into jb-ub-now-kermit
Geoff Mendal [Wed, 15 Jan 2014 22:09:10 +0000 (14:09 -0800)]
am
43323cc3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
* commit '
43323cc306adaae144457f29c0b0860d4f21f257':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jan 2014 22:05:05 +0000 (22:05 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox
Geoff Mendal [Wed, 15 Jan 2014 22:04:16 +0000 (22:04 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
Geoff Mendal [Wed, 15 Jan 2014 21:56:06 +0000 (13:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8f07cab26ae1bd70357157730b8dbe36eca34e0d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jan 2014 21:52:37 +0000 (13:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7f6ec7de198d8fd863c1a56294609474d2e02a32
Auto-generated-cl: translation import
Chris Wren [Wed, 15 Jan 2014 21:10:39 +0000 (16:10 -0500)]
rationalize launcher backup logging
enough data to debug dogfood issues
easy switch to move to quieter production mode
common switch across all three classes
Bug:
12545310
Change-Id: Icb4ad7174f20884c6993140149db590d66f6e006
Adrian Roos [Tue, 14 Jan 2014 01:44:52 +0000 (17:44 -0800)]
Fix back button behavior for "App info" when launched by Launcher3.
Ensures the back stack is clean when opening the "App info" app from the launcher.
Bug:
10393223
Change-Id: Iad078ca37c4794a580f1b996f8324fef404e7462
Winson Chung [Wed, 15 Jan 2014 19:54:45 +0000 (11:54 -0800)]
am
affe0b5f: Merge "Tightening migration conditions. (Bug
11973614)" into jb-ub-now-kermit
* commit '
affe0b5f764274a34b2869de7c529df61c24de7b':
Tightening migration conditions. (Bug
11973614)
Winson Chung [Wed, 15 Jan 2014 19:42:39 +0000 (19:42 +0000)]
Merge "Tightening migration conditions. (Bug
11973614)" into jb-ub-now-kermit
Winson Chung [Wed, 15 Jan 2014 18:33:02 +0000 (10:33 -0800)]
Tightening migration conditions. (Bug
11973614)
Change-Id: I6d7417b705227472d035f428cbec933cc6dbf2ce
Jorim Jaggi [Wed, 15 Jan 2014 18:36:39 +0000 (10:36 -0800)]
am
12f583b4: Merge "Keep selected wallpaper on configuration change." into jb-ub-now-kermit
* commit '
12f583b487e445a886d7c23cd76f4cadfdc5d4e2':
Keep selected wallpaper on configuration change.
Jorim Jaggi [Wed, 15 Jan 2014 18:34:33 +0000 (18:34 +0000)]
Merge "Keep selected wallpaper on configuration change." into jb-ub-now-kermit
Dan Sandler [Wed, 15 Jan 2014 14:49:16 +0000 (06:49 -0800)]
am
44f83413: Merge "restore app favorites and screens" into jb-ub-now-kermit
* commit '
44f834133e106550a67ecf246e8bc9d4e1644c56':
restore app favorites and screens
Dan Sandler [Wed, 15 Jan 2014 14:46:33 +0000 (14:46 +0000)]
Merge "restore app favorites and screens" into jb-ub-now-kermit
Adrian Roos [Wed, 15 Jan 2014 10:40:11 +0000 (02:40 -0800)]
am
33778ec0: Merge "Replace "hotseat" with "Favorites tray" in user visible strings." into jb-ub-now-kermit
* commit '
33778ec01983646a7941c9b274618126cf1f464e':
Replace "hotseat" with "Favorites tray" in user visible strings.
Jorim Jaggi [Wed, 15 Jan 2014 10:40:08 +0000 (02:40 -0800)]
am
c27a0513: Merge "Remove settings in overview mode for Launcher3." into jb-ub-now-kermit
* commit '
c27a05132042149fdcc926aeebc1a284cece1aa4':
Remove settings in overview mode for Launcher3.
Adam Cohen [Wed, 15 Jan 2014 10:40:05 +0000 (02:40 -0800)]
am
24ce0b37: Fixing drop targets in phone / small tablet landscape (issue
12192781)
* commit '
24ce0b3708b44e738d6ee52477aa4dd917b547e7':
Fixing drop targets in phone / small tablet landscape (issue
12192781)
Adam Cohen [Wed, 15 Jan 2014 10:40:05 +0000 (02:40 -0800)]
am
13b563bc: Merge "Ensure that hasFirstRunActivity is only called when necessary" into jb-ub-now-kermit
* commit '
13b563bcae015646d19fa9cf2baf7437d4711f8e':
Ensure that hasFirstRunActivity is only called when necessary
Jorim Jaggi [Wed, 15 Jan 2014 10:31:38 +0000 (02:31 -0800)]
am
00c3184f: Merge "Fix NPE in Workspace.onDropCompleted" into jb-ub-now-kermit
* commit '
00c3184fa6fae69123d160b92977799a1a47fa34':
Fix NPE in Workspace.onDropCompleted
Chris Wren [Wed, 15 Jan 2014 10:31:37 +0000 (02:31 -0800)]
am
65b6a603: search for a valid journal
* commit '
65b6a603fa972a1bd62298558016eb4712e8c727':
search for a valid journal
Adrian Roos [Wed, 15 Jan 2014 01:58:15 +0000 (01:58 +0000)]
Merge "Replace "hotseat" with "Favorites tray" in user visible strings." into jb-ub-now-kermit
Adrian Roos [Wed, 15 Jan 2014 01:45:22 +0000 (17:45 -0800)]
Replace "hotseat" with "Favorites tray" in user visible strings.
Bug:
12078955
Change-Id: I824948d8820276caab18d6df095754a4cfb67640
Jorim Jaggi [Wed, 15 Jan 2014 01:31:13 +0000 (01:31 +0000)]
Merge "Remove settings in overview mode for Launcher3." into jb-ub-now-kermit
Jorim Jaggi [Wed, 15 Jan 2014 01:08:48 +0000 (17:08 -0800)]
Remove settings in overview mode for Launcher3.
The appereance of the settings button in overview mode is now dependent on
a overridable method, such that we can have it in GEL, but not in Launcher3.
This change also adjusts the logic of how wide the overview panel is, depending
on how many items we have.
Bug:
12441429
Change-Id: Ibf537c26602785f565292cbfa213eb123469ebcd
Adam Cohen [Wed, 15 Jan 2014 00:18:14 +0000 (16:18 -0800)]
Fixing drop targets in phone / small tablet landscape (issue
12192781)
Change-Id: I4dc8a82c8cd5ef279506e7868e33a455fba5a3be
Adam Cohen [Wed, 15 Jan 2014 00:26:07 +0000 (00:26 +0000)]
Merge "Ensure that hasFirstRunActivity is only called when necessary" into jb-ub-now-kermit
Adam Cohen [Tue, 14 Jan 2014 22:05:32 +0000 (14:05 -0800)]
Ensure that hasFirstRunActivity is only called when necessary
Change-Id: I834abcd82f46c6f096f5c92452b34c668a4a3d86
Jorim Jaggi [Wed, 15 Jan 2014 00:00:17 +0000 (16:00 -0800)]
Keep selected wallpaper on configuration change.
Keeps the currently selected wallpaper when a configuration (for example,
device rotation) occurs. This change also effects the logic when the thumbnail
gets displayed after loading the image from an external URI, as this must be
now handled independently of which wallpaper is selected.
Bug:
11007874
Change-Id: Id676c378aec38d0b21e5d9150846f33aff415cad
Jorim Jaggi [Tue, 14 Jan 2014 23:01:48 +0000 (23:01 +0000)]
Merge "Fix NPE in Workspace.onDropCompleted" into jb-ub-now-kermit
Chris Wren [Fri, 10 Jan 2014 19:11:25 +0000 (14:11 -0500)]
search for a valid journal
there are too many bytes, so we need to find the valid subset,
without stepping past the end!
Bug:
12489602
Change-Id: Ic9d7c804c199740ff50d0864f99632ae68619369
Jorim Jaggi [Mon, 13 Jan 2014 21:45:07 +0000 (13:45 -0800)]
Fix NPE in Workspace.onDropCompleted
Bug:
11627757
Change-Id: I9dc86856d4bc00253d6350d157be541a8c46888d
Dan Sandler [Tue, 14 Jan 2014 18:55:53 +0000 (10:55 -0800)]
am
c4fa7a9c: Merge "Fix longpress crash." into jb-ub-now-kermit
* commit '
c4fa7a9c4a79b0f8adbbaac7facf29944ad1600c':
Fix longpress crash.
Dan Sandler [Tue, 14 Jan 2014 18:51:35 +0000 (18:51 +0000)]
Merge "Fix longpress crash." into jb-ub-now-kermit
Winson Chung [Tue, 14 Jan 2014 18:34:14 +0000 (10:34 -0800)]
am
d7315948: Merge "Properly saving migration cling keys." into jb-ub-now-kermit
* commit '
d7315948633d6502bedd0f2f2afe3dd114c08de0':
Properly saving migration cling keys.
Winson Chung [Tue, 14 Jan 2014 18:31:32 +0000 (18:31 +0000)]
Merge "Properly saving migration cling keys." into jb-ub-now-kermit
Winson Chung [Tue, 14 Jan 2014 18:30:27 +0000 (10:30 -0800)]
Properly saving migration cling keys.
Change-Id: Id52a12da6af0fc91463dae07bbeb355ee04873d0
Chris Wren [Fri, 20 Dec 2013 22:22:11 +0000 (17:22 -0500)]
restore app favorites and screens
version 0: restore assuming apps are already installed.
Bug:
10779035
Change-Id: I7f9aa418a7d3d5460a79a229c0fbc80305b5eb5c
Dan Sandler [Mon, 13 Jan 2014 19:30:14 +0000 (14:30 -0500)]
Fix longpress crash.
The AllApps button doesn't usually accept longpresses, but
you can trick it into trying by holding one finger on it and
another on another icon in the hotseat. This patch defends
against that and bails out if the longpressed item has the
all apps rank (position in hotseat).
Bug:
11740833
Change-Id: I99785ccbc9e6dc6be2a9e56289b3cc0275fbb65c
Chris Wren [Tue, 14 Jan 2014 15:16:28 +0000 (07:16 -0800)]
am
1ae293c6: Merge "backup keys that might have slipped past" into jb-ub-now-kermit
* commit '
1ae293c647fa44f458625774e2ea119a61814e63':
backup keys that might have slipped past
Chris Wren [Tue, 14 Jan 2014 15:15:04 +0000 (15:15 +0000)]
Merge "backup keys that might have slipped past" into jb-ub-now-kermit
Chris Wren [Tue, 14 Jan 2014 15:02:11 +0000 (07:02 -0800)]
am
dc9c1252: Merge "hide launcher restore behind a flag." into jb-ub-now-kermit
* commit '
dc9c125236c9eab434b7c909d18f748c645c8118':
hide launcher restore behind a flag.
Chris Wren [Tue, 14 Jan 2014 14:58:43 +0000 (14:58 +0000)]
Merge "hide launcher restore behind a flag." into jb-ub-now-kermit
Michael Jurka [Tue, 14 Jan 2014 13:11:17 +0000 (05:11 -0800)]
am
4808aa6b: Add ability to center the crop (disabled)
* commit '
4808aa6b42ff31aa792b6dc0601bd6f24a554e21':
Add ability to center the crop (disabled)
Michael Jurka [Tue, 14 Jan 2014 12:50:53 +0000 (13:50 +0100)]
Add ability to center the crop (disabled)
Michael Jurka [Tue, 14 Jan 2014 11:12:35 +0000 (03:12 -0800)]
am
fe45a82e: Merge "Move saved wallpaper images from cache directory to data directory" into jb-ub-now-kermit
* commit '
fe45a82ed90bd9e8d949c210d905fcf38e64aaf2':
Move saved wallpaper images from cache directory to data directory
Michael Jurka [Tue, 14 Jan 2014 11:12:35 +0000 (03:12 -0800)]
am
574120cd: Merge "Recover when widget preview database is deleted" into jb-ub-now-kermit
* commit '
574120cdca5bfd124a96d102c0c59814a1be076a':
Recover when widget preview database is deleted
Michael Jurka [Tue, 14 Jan 2014 11:10:48 +0000 (11:10 +0000)]
Merge "Move saved wallpaper images from cache directory to data directory" into jb-ub-now-kermit
Michael Jurka [Tue, 14 Jan 2014 11:10:34 +0000 (11:10 +0000)]
Merge "Recover when widget preview database is deleted" into jb-ub-now-kermit
Winson Chung [Mon, 13 Jan 2014 22:56:32 +0000 (14:56 -0800)]
am
c83d136c: Increasing string length for translation (Bug
12524122)
* commit '
c83d136ce4a7bde768cbea4d4b263ab6e4eaa9f1':
Increasing string length for translation (Bug
12524122)
Winson Chung [Mon, 13 Jan 2014 22:52:49 +0000 (14:52 -0800)]
Increasing string length for translation (Bug
12524122)
Change-Id: I24e053790812779ec07de99c6f763965584a1bb7
Chris Wren [Mon, 13 Jan 2014 22:39:02 +0000 (17:39 -0500)]
hide launcher restore behind a flag.
enable with 'adb shell settings put secure launcher_restore_enabled 1'
before signing into wiped device
Bug:
12532845
Change-Id: I1471c39dac2e6e1412f7720b1ba8edf46273c593
Geoff Mendal [Mon, 13 Jan 2014 22:31:34 +0000 (14:31 -0800)]
am
f0fa440f: (-s ours) Import translations. DO NOT MERGE
* commit '
f0fa440fab8ff87726ddf1ff404bbbcc9bb59289':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jan 2014 22:28:22 +0000 (14:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6cf43d3ab8f99f3bda1fd114e2135d7c89797b11
Auto-generated-cl: translation import
Geoff Mendal [Mon, 13 Jan 2014 22:26:12 +0000 (14:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib79d541dac6867d262bb02f04eda43728d7a8357
Auto-generated-cl: translation import
Winson Chung [Mon, 13 Jan 2014 18:34:25 +0000 (10:34 -0800)]
am
6279e2cd: Merge "Set App context from WallpaperChanged receiver. (Bug
12525684)" into jb-ub-now-kermit
* commit '
6279e2cd31f93769aca0dd78aae3bdb6760af3a8':
Set App context from WallpaperChanged receiver. (Bug
12525684)
Winson Chung [Mon, 13 Jan 2014 18:32:22 +0000 (18:32 +0000)]
Merge "Set App context from WallpaperChanged receiver. (Bug
12525684)" into jb-ub-now-kermit
Winson Chung [Mon, 13 Jan 2014 18:05:37 +0000 (10:05 -0800)]
Set App context from WallpaperChanged receiver. (Bug
12525684)
Change-Id: Ie037d74d31e6b05b0ae5bb25ed1bf1c639a28a5f
Dan Sandler [Mon, 13 Jan 2014 15:38:20 +0000 (07:38 -0800)]
am
0b95b14f: Merge "Quick patch for b/
12446428." into jb-ub-now-kermit
* commit '
0b95b14ffe800ac3ddccae38bfcd48ebcbc7a2a5':
Quick patch for b/
12446428.
Dan Sandler [Mon, 13 Jan 2014 15:35:40 +0000 (15:35 +0000)]
Merge "Quick patch for b/
12446428." into jb-ub-now-kermit
Chris Wren [Fri, 10 Jan 2014 23:02:06 +0000 (18:02 -0500)]
backup keys that might have slipped past
seems a little paranoid, but can't hurt.
Bug:
12455866
Change-Id: If9da4cc021ee4fac32c822a91fabda69bf3ff8aa
Winson Chung [Sat, 11 Jan 2014 01:10:27 +0000 (17:10 -0800)]
am
5317c2b7: Updating assets and text for migration cling. (Bug
11973614)
* commit '
5317c2b7adfbfef97edc6ad9b7e007160ef689f4':
Updating assets and text for migration cling. (Bug
11973614)
Winson Chung [Sat, 11 Jan 2014 00:46:15 +0000 (16:46 -0800)]
Updating assets and text for migration cling. (Bug
11973614)
Change-Id: I69ffc1581cc43511b4f42ebb2735afe4c0b44131
Winson Chung [Fri, 10 Jan 2014 23:42:53 +0000 (15:42 -0800)]
am
234b506f: Merge "Adding migration Clings. (Bug
11973614)" into jb-ub-now-kermit
* commit '
234b506f4625b23172d437a2ba0b47d63cc2e3dd':
Adding migration Clings. (Bug
11973614)
Winson Chung [Fri, 10 Jan 2014 23:40:40 +0000 (23:40 +0000)]
Merge "Adding migration Clings. (Bug
11973614)" into jb-ub-now-kermit
Winson Chung [Wed, 8 Jan 2014 22:04:34 +0000 (14:04 -0800)]
Adding migration Clings. (Bug
11973614)
- Refactoring Launcher cling code out to LauncherClings.
Change-Id: Iff4f84f5b8bfeb69b1be0b4802022c3eb20b6f2c
Adam Cohen [Fri, 10 Jan 2014 21:45:34 +0000 (13:45 -0800)]
am
8b5b05b7: Merge "New launcher2 icon migration algorithm." into jb-ub-now-kermit
* commit '
8b5b05b7f3c8c5d705116c425bd5dbff2b75d56a':
New launcher2 icon migration algorithm.
Adam Cohen [Fri, 10 Jan 2014 21:42:39 +0000 (21:42 +0000)]
Merge "New launcher2 icon migration algorithm." into jb-ub-now-kermit
Dan Sandler [Thu, 9 Jan 2014 20:01:33 +0000 (15:01 -0500)]
New launcher2 icon migration algorithm.
The user will be able to request "icon migration", which is
not a direct mapping of the old workspace, but rather
follows this heuristic for bringing the user's favorite
icons (by dint of their existence on the workspace) into
Launcher3:
Workspace shortcuts are placed in lexicographic order on the workspace
starting at screen 0 (leaving the bottom row of screen 0 empty to make
sure there's room to move things around). Folders are preserved and
their contents sorted. Duplicate icons (that is, shortcuts
with the same intent, pursuant to some cleanups) are removed.
Hotseat icons are migrated in their original place, unless their new
location is not accommodated by the hotseat (i.e. the L3 hotseat is
too small on this device), in which case they're treated like any
other shortcut and tossed into the workspace.
To test, turn on Launcher.ENABLE_DEBUG_INTENTS and then:
$ adb shell am broadcast -a com.android.launcher3.action.DELETE_DATABASE
$ adb shell am broadcast -a com.android.launcher3.action.MIGRATE_DATABASE
Bug:
12416411
Change-Id: Ia5c56f36c11455867ea20a39f70210f595020a87
Nilesh Agrawal [Fri, 10 Jan 2014 19:52:42 +0000 (11:52 -0800)]
am
24fa33f8: Merge "Allow DISABLE_ALL_APPS to be set using a system property." into jb-ub-now-kermit
* commit '
24fa33f8c7949d5e7fff4831f5903d70e1017091':
Allow DISABLE_ALL_APPS to be set using a system property.
Nilesh Agrawal [Fri, 10 Jan 2014 19:49:21 +0000 (19:49 +0000)]
Merge "Allow DISABLE_ALL_APPS to be set using a system property." into jb-ub-now-kermit
Dan Sandler [Fri, 10 Jan 2014 18:24:55 +0000 (13:24 -0500)]
Quick patch for b/
12446428.
Bug:
12446428
Change-Id: I5b9472e55a8919f5640c6e97fede9b5637819be0