Commit Graph

78507 Commits

Author SHA1 Message Date
Dan Sandler 4a28877ff8 am c4fa7a9c: Merge "Fix longpress crash." into jb-ub-now-kermit
* commit 'c4fa7a9c4a79b0f8adbbaac7facf29944ad1600c':
  Fix longpress crash.
2014-01-14 10:55:53 -08:00
Dan Sandler c4fa7a9c4a Merge "Fix longpress crash." into jb-ub-now-kermit 2014-01-14 18:51:36 +00:00
Winson Chung 5cbfc88179 am d7315948: Merge "Properly saving migration cling keys." into jb-ub-now-kermit
* commit 'd7315948633d6502bedd0f2f2afe3dd114c08de0':
  Properly saving migration cling keys.
2014-01-14 10:34:14 -08:00
Winson Chung d731594863 Merge "Properly saving migration cling keys." into jb-ub-now-kermit 2014-01-14 18:31:32 +00:00
Winson Chung 285b6e1483 Properly saving migration cling keys.
Change-Id: Id52a12da6af0fc91463dae07bbeb355ee04873d0
2014-01-14 10:30:27 -08:00
Chris Wren 5dee7aff5f restore app favorites and screens
version 0: restore assuming apps are already installed.

Bug: 10779035
Change-Id: I7f9aa418a7d3d5460a79a229c0fbc80305b5eb5c
2014-01-14 11:23:07 -05:00
Dan Sandler e26d094845 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
2014-01-14 11:12:38 -05:00
Chris Wren 8da91f7cbe am 1ae293c6: Merge "backup keys that might have slipped past" into jb-ub-now-kermit
* commit '1ae293c647fa44f458625774e2ea119a61814e63':
  backup keys that might have slipped past
2014-01-14 07:16:28 -08:00
Chris Wren 1ae293c647 Merge "backup keys that might have slipped past" into jb-ub-now-kermit 2014-01-14 15:15:04 +00:00
Chris Wren ebc3b3ae90 am dc9c1252: Merge "hide launcher restore behind a flag." into jb-ub-now-kermit
* commit 'dc9c125236c9eab434b7c909d18f748c645c8118':
  hide launcher restore behind a flag.
2014-01-14 07:02:11 -08:00
Chris Wren dc9c125236 Merge "hide launcher restore behind a flag." into jb-ub-now-kermit 2014-01-14 14:58:43 +00:00
Michael Jurka d4d2bece50 am 4808aa6b: Add ability to center the crop (disabled)
* commit '4808aa6b42ff31aa792b6dc0601bd6f24a554e21':
  Add ability to center the crop (disabled)
2014-01-14 05:11:17 -08:00
Michael Jurka 4808aa6b42 Add ability to center the crop (disabled) 2014-01-14 13:50:53 +01:00
Michael Jurka 94af4b7582 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
2014-01-14 03:12:35 -08:00
Michael Jurka 6a062c7ff1 am 574120cd: Merge "Recover when widget preview database is deleted" into jb-ub-now-kermit
* commit '574120cdca5bfd124a96d102c0c59814a1be076a':
  Recover when widget preview database is deleted
2014-01-14 03:12:35 -08:00
Michael Jurka fe45a82ed9 Merge "Move saved wallpaper images from cache directory to data directory" into jb-ub-now-kermit 2014-01-14 11:10:49 +00:00
Michael Jurka 574120cdca Merge "Recover when widget preview database is deleted" into jb-ub-now-kermit 2014-01-14 11:10:36 +00:00
Mark Ashdown aa7f5159d6 Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release 2014-01-14 10:50:23 +00:00
Winson Chung c2413f9eda am c83d136c: Increasing string length for translation (Bug 12524122)
* commit 'c83d136ce4a7bde768cbea4d4b263ab6e4eaa9f1':
  Increasing string length for translation (Bug 12524122)
2014-01-13 14:56:32 -08:00
Winson Chung c83d136ce4 Increasing string length for translation (Bug 12524122)
Change-Id: I24e053790812779ec07de99c6f763965584a1bb7
2014-01-13 14:53:24 -08:00
Chris Wren 4b171361ca 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
2014-01-13 17:52:40 -05:00
Geoff Mendal 093163e948 am f0fa440f: (-s ours) Import translations. DO NOT MERGE
* commit 'f0fa440fab8ff87726ddf1ff404bbbcc9bb59289':
  Import translations. DO NOT MERGE
2014-01-13 14:31:34 -08:00
Geoff Mendal 7614f33a78 Import translations. DO NOT MERGE
Change-Id: I6cf43d3ab8f99f3bda1fd114e2135d7c89797b11
Auto-generated-cl: translation import
2014-01-13 14:28:22 -08:00
Geoff Mendal f0fa440fab Import translations. DO NOT MERGE
Change-Id: Ib79d541dac6867d262bb02f04eda43728d7a8357
Auto-generated-cl: translation import
2014-01-13 14:26:12 -08:00
Winson Chung d7bc7fa8e5 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)
2014-01-13 10:34:25 -08:00
Winson Chung 6279e2cd31 Merge "Set App context from WallpaperChanged receiver. (Bug 12525684)" into jb-ub-now-kermit 2014-01-13 18:32:22 +00:00
Winson Chung 13571ae0de Set App context from WallpaperChanged receiver. (Bug 12525684)
Change-Id: Ie037d74d31e6b05b0ae5bb25ed1bf1c639a28a5f
2014-01-13 10:05:37 -08:00
Dan Sandler 4d22c55490 am 0b95b14f: Merge "Quick patch for b/12446428." into jb-ub-now-kermit
* commit '0b95b14ffe800ac3ddccae38bfcd48ebcbc7a2a5':
  Quick patch for b/12446428.
2014-01-13 07:38:20 -08:00
Dan Sandler 0b95b14ffe Merge "Quick patch for b/12446428." into jb-ub-now-kermit 2014-01-13 15:35:40 +00:00
Chris Wren 5743aa9a86 backup keys that might have slipped past
seems a little paranoid, but can't hurt.

Bug: 12455866
Change-Id: If9da4cc021ee4fac32c822a91fabda69bf3ff8aa
2014-01-13 08:43:14 -05:00
Winson Chung 57272f057c am 5317c2b7: Updating assets and text for migration cling. (Bug 11973614)
* commit '5317c2b7adfbfef97edc6ad9b7e007160ef689f4':
  Updating assets and text for migration cling. (Bug 11973614)
2014-01-10 17:10:27 -08:00
Winson Chung 5317c2b7ad Updating assets and text for migration cling. (Bug 11973614)
Change-Id: I69ffc1581cc43511b4f42ebb2735afe4c0b44131
2014-01-10 16:59:09 -08:00
Winson Chung a8a5f2e8d5 am 234b506f: Merge "Adding migration Clings. (Bug 11973614)" into jb-ub-now-kermit
* commit '234b506f4625b23172d437a2ba0b47d63cc2e3dd':
  Adding migration Clings. (Bug 11973614)
2014-01-10 15:42:53 -08:00
Winson Chung 234b506f46 Merge "Adding migration Clings. (Bug 11973614)" into jb-ub-now-kermit 2014-01-10 23:40:40 +00:00
Winson Chung a694524047 Adding migration Clings. (Bug 11973614)
- Refactoring Launcher cling code out to LauncherClings.

Change-Id: Iff4f84f5b8bfeb69b1be0b4802022c3eb20b6f2c
2014-01-10 22:28:16 +00:00
Adam Cohen 952081c382 am 8b5b05b7: Merge "New launcher2 icon migration algorithm." into jb-ub-now-kermit
* commit '8b5b05b7f3c8c5d705116c425bd5dbff2b75d56a':
  New launcher2 icon migration algorithm.
2014-01-10 13:45:34 -08:00
Adam Cohen 8b5b05b7f3 Merge "New launcher2 icon migration algorithm." into jb-ub-now-kermit 2014-01-10 21:42:39 +00:00
Dan Sandler d502404a44 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
2014-01-10 15:49:51 -05:00
Nilesh Agrawal fed1e5ad3e 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.
2014-01-10 11:52:42 -08:00
Nilesh Agrawal 24fa33f8c7 Merge "Allow DISABLE_ALL_APPS to be set using a system property." into jb-ub-now-kermit 2014-01-10 19:49:21 +00:00
Dan Sandler 0eb687fdc4 Quick patch for b/12446428.
Bug: 12446428
Change-Id: I5b9472e55a8919f5640c6e97fede9b5637819be0
2014-01-10 13:24:55 -05:00
Nilesh Agrawal 16f3ea870a Allow DISABLE_ALL_APPS to be set using a system property.
- Moving the property to LauncherAppState
 - The property is only read on dogfood builds.

The property can be set using setprop or /data/local.prop

Change-Id: I14c7354efb12edb93f97e81687a6f920cc634e9a
2014-01-09 17:21:09 -08:00
Adam Cohen 789a92835a am b54a5989: Adding optional first run activity to Launcher
* commit 'b54a5989a21bef4e6bac304591ca4030bfbe709d':
  Adding optional first run activity to Launcher
2014-01-09 16:15:20 -08:00
Adam Cohen b54a5989a2 Adding optional first run activity to Launcher
Change-Id: I146927d8a065f1cf5ef5cec41c8fb4f9ad09d25c
2014-01-09 14:08:49 -08:00
Adam Cohen 7fe091fd03 am 0259c629: Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit
* commit '0259c629cb5b280d0d9c821f8b1685707d7ba589':
  Fix issue where deleting item from folder leaves extra page
2014-01-09 11:17:51 -08:00
Adam Cohen 0259c629cb Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit 2014-01-09 19:14:52 +00:00
Chris Wren 442ad3d53f am 8661761c: better support for multiple files
* commit '8661761cb691d9bed446b87d55a4fa7043a3aa95':
  better support for multiple files
2014-01-09 10:50:22 -08:00
Chris Wren 8661761cb6 better support for multiple files
don't exit on error, just log.
new verbose flag to print more information

Change-Id: I5c4895a837cb8a31901aabceade3ab976abf4af0
2014-01-09 13:35:40 -05:00
Chris Wren caa45be8a4 am 33f4c2df: first backup should save things from the beginning of time
* commit '33f4c2df28228f93d96e9b1d1bfad52d715d917b':
  first backup should save things from the beginning of time
2014-01-09 10:33:41 -08:00
Chris Wren 33f4c2df28 first backup should save things from the beginning of time
Bug: 12455866
Change-Id: Ie9a97ed4110e7b1ded21f609179b5d6ee7f0ead5
2014-01-09 13:02:20 -05:00