Commit Graph

7790 Commits

Author SHA1 Message Date
Geoff Mendal a653fbb1cc am fbc17c9e: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox
* commit 'fbc17c9e2f39e2d15f9bef1c4ce03b1cfb4c00e1':
  Import translations. DO NOT MERGE
2014-01-16 11:22:59 -08:00
Geoff Mendal fbc17c9e2f Merge "Import translations. DO NOT MERGE" into ub-now-lunchbox 2014-01-15 22:05:06 +00:00
Geoff Mendal 3b0d0a6bd3 Import translations. DO NOT MERGE
Change-Id: I8f07cab26ae1bd70357157730b8dbe36eca34e0d
Auto-generated-cl: translation import
2014-01-15 13:56:06 -08:00
Winson Chung f120fe4112 am affe0b5f: Merge "Tightening migration conditions. (Bug 11973614)" into jb-ub-now-kermit
* commit 'affe0b5f764274a34b2869de7c529df61c24de7b':
  Tightening migration conditions. (Bug 11973614)
2014-01-15 11:54:45 -08:00
Winson Chung affe0b5f76 Merge "Tightening migration conditions. (Bug 11973614)" into jb-ub-now-kermit 2014-01-15 19:42:40 +00:00
Winson Chung e43a1e7882 Tightening migration conditions. (Bug 11973614)
Change-Id: I6d7417b705227472d035f428cbec933cc6dbf2ce
2014-01-15 11:34:54 -08:00
Jorim Jaggi 3d3303a258 am 12f583b4: Merge "Keep selected wallpaper on configuration change." into jb-ub-now-kermit
* commit '12f583b487e445a886d7c23cd76f4cadfdc5d4e2':
  Keep selected wallpaper on configuration change.
2014-01-15 10:36:39 -08:00
Jorim Jaggi 12f583b487 Merge "Keep selected wallpaper on configuration change." into jb-ub-now-kermit 2014-01-15 18:34:33 +00:00
Dan Sandler cc49ea186a am 44f83413: Merge "restore app favorites and screens" into jb-ub-now-kermit
* commit '44f834133e106550a67ecf246e8bc9d4e1644c56':
  restore app favorites and screens
2014-01-15 06:49:16 -08:00
Dan Sandler 44f834133e Merge "restore app favorites and screens" into jb-ub-now-kermit 2014-01-15 14:46:34 +00:00
Adrian Roos 3d2d6e32c4 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.
2014-01-15 02:40:11 -08:00
Jorim Jaggi b733218c53 am c27a0513: Merge "Remove settings in overview mode for Launcher3." into jb-ub-now-kermit
* commit 'c27a05132042149fdcc926aeebc1a284cece1aa4':
  Remove settings in overview mode for Launcher3.
2014-01-15 02:40:08 -08:00
Adam Cohen 293a78dad2 am 24ce0b37: Fixing drop targets in phone / small tablet landscape (issue 12192781)
* commit '24ce0b3708b44e738d6ee52477aa4dd917b547e7':
  Fixing drop targets in phone / small tablet landscape (issue 12192781)
2014-01-15 02:40:05 -08:00
Adam Cohen b884b4b1e4 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
2014-01-15 02:40:05 -08:00
Jorim Jaggi 5d60fc8f85 am 00c3184f: Merge "Fix NPE in Workspace.onDropCompleted" into jb-ub-now-kermit
* commit '00c3184fa6fae69123d160b92977799a1a47fa34':
  Fix NPE in Workspace.onDropCompleted
2014-01-15 02:31:38 -08:00
Chris Wren 6793453ba5 am 65b6a603: search for a valid journal
* commit '65b6a603fa972a1bd62298558016eb4712e8c727':
  search for a valid journal
2014-01-15 02:31:37 -08:00
Adrian Roos 33778ec019 Merge "Replace "hotseat" with "Favorites tray" in user visible strings." into jb-ub-now-kermit 2014-01-15 01:58:15 +00:00
Adrian Roos a0d5a040b8 Replace "hotseat" with "Favorites tray" in user visible strings.
Bug: 12078955
Change-Id: I824948d8820276caab18d6df095754a4cfb67640
2014-01-14 17:48:26 -08:00
Jorim Jaggi c27a051320 Merge "Remove settings in overview mode for Launcher3." into jb-ub-now-kermit 2014-01-15 01:31:13 +00:00
Jorim Jaggi d017f882eb 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
2014-01-14 17:08:48 -08:00
Adam Cohen 24ce0b3708 Fixing drop targets in phone / small tablet landscape (issue 12192781)
Change-Id: I4dc8a82c8cd5ef279506e7868e33a455fba5a3be
2014-01-14 16:33:50 -08:00
Adam Cohen 13b563bcae Merge "Ensure that hasFirstRunActivity is only called when necessary" into jb-ub-now-kermit 2014-01-15 00:26:07 +00:00
Adam Cohen bc4539df6f Ensure that hasFirstRunActivity is only called when necessary
Change-Id: I834abcd82f46c6f096f5c92452b34c668a4a3d86
2014-01-14 16:24:16 -08:00
Jorim Jaggi 1b921efc84 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
2014-01-14 16:05:53 -08:00
Jorim Jaggi 00c3184fa6 Merge "Fix NPE in Workspace.onDropCompleted" into jb-ub-now-kermit 2014-01-14 23:01:48 +00:00
Chris Wren 65b6a603fa 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
2014-01-14 17:46:27 -05:00
Jorim Jaggi eedb00a674 Fix NPE in Workspace.onDropCompleted
Bug: 11627757
Change-Id: I9dc86856d4bc00253d6350d157be541a8c46888d
2014-01-14 13:02:43 -08:00
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
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