608401ac43
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release
...
at a4db090b13
2014-01-17 17:24:31 -07:00
a4db090b13
Merge "Adding specific buckets for N5 in dynamic grid. (Bug 12604220)" into jb-ub-now-kermit
2014-01-18 00:21:57 +00:00
930514df05
Fix overlapping pages (issue 12551580)
...
Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f
(cherry picked from commit efb31e399d
2014-01-18 00:01:10 +00:00
3abfd16e5d
Adding specific buckets for N5 in dynamic grid. (Bug 12604220)
...
Change-Id: I1fa62b7d16f557c7191fb1666d687b8784a88857
2014-01-17 14:43:02 -08:00
5ac62d6914
Merge "Fix overlapping pages (issue 12551580)" into jb-ub-now-kermit
2014-01-17 22:32:22 +00:00
b608ae672d
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release
...
at e6e0af03ee
2014-01-17 13:58:40 -07:00
e6e0af03ee
Merge "Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)" into jb-ub-now-kermit
2014-01-17 20:25:14 +00:00
e029874bcf
Dismissing search and other overlays when the menu button is pressed. (Bug 12524591)
2014-01-17 12:03:00 -08:00
8ffe7b76ac
Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release
...
Conflicts:
src/com/android/launcher3/LauncherClings.java
Change-Id: Idd2e6d54180315854216cfc868cd36297dcb95d9
2014-01-17 12:17:52 +00:00
efb31e399d
Fix overlapping pages (issue 12551580)
...
Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f
2014-01-16 16:09:05 -08:00
f858404271
Merge "Updating Tablet clings. (Bug 11973614)" into jb-ub-now-kermit
2014-01-16 23:07:02 +00:00
1ba0a30e65
Merge "Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)" into jb-ub-now-kermit
2014-01-16 23:06:29 +00:00
08101b1f52
Merge "Lazy load the widget preview loader class" into jb-ub-now-kermit
2014-01-16 23:05:00 +00:00
e1b0682af0
Merge "Updating screen background assets. (Bug 12136457)" into jb-ub-now-kermit
2014-01-16 22:48:33 +00:00
6d110117be
Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
...
Change-Id: I01fc54be8059d4cd25ff465c70595683fc8ac019
2014-01-16 14:47:53 -08:00
fd0394cc6d
Updating screen background assets. (Bug 12136457)
...
Change-Id: I48d235d9c44a53b5fbf6c244736e86cbc9f19162
2014-01-16 14:41:21 -08:00
205cd7727f
Updating Tablet clings. (Bug 11973614)
...
Change-Id: I6cb10424a345691d50c4fac7969e0b97bbee4b3c
2014-01-16 14:26:07 -08:00
72960975d8
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
2014-01-16 11:56:41 -08:00
9c5cc5a893
Lazy load the widget preview loader class
...
Bug: 12109621
Change-Id: Id99aded30195bf39ebcf2148611bc4e084f3b2c7
2014-01-16 13:34:55 +01:00
556f6135f9
Don't migrate shortcuts for components that no longer exist
...
Bug 12570791
Change-Id: Ie4b55afcee0c4d1d16acf7b830d7885800943454
2014-01-15 23:32:46 +00:00
230cbf831c
Merge "rationalize launcher backup logging" into jb-ub-now-kermit
2014-01-15 22:09:20 +00:00
43323cc306
Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
2014-01-15 22:04:16 +00:00
0c04bfae09
Import translations. DO NOT MERGE
...
Change-Id: I7f6ec7de198d8fd863c1a56294609474d2e02a32
Auto-generated-cl: translation import
2014-01-15 13:52:37 -08:00
71c92b3560
Merge "Properly saving migration cling keys." into jb-ub-now-kermit-release
2014-01-15 21:37:37 +00:00
50c8f42568
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
2014-01-15 16:35:33 -05:00
c3993d15d9
Properly saving migration cling keys.
...
Change-Id: Id52a12da6af0fc91463dae07bbeb355ee04873d0
(cherry picked from commit 285b6e1483
2014-01-15 21:09:24 +00:00
d6c6745b2e
Tightening migration conditions. (Bug 11973614)
...
Change-Id: I6d7417b705227472d035f428cbec933cc6dbf2ce
(cherry picked from commit e43a1e7882
2014-01-15 21:08:29 +00:00
affe0b5f76
Merge "Tightening migration conditions. (Bug 11973614)" into jb-ub-now-kermit
2014-01-15 19:42:40 +00:00
e43a1e7882
Tightening migration conditions. (Bug 11973614)
...
Change-Id: I6d7417b705227472d035f428cbec933cc6dbf2ce
2014-01-15 11:34:54 -08:00
12f583b487
Merge "Keep selected wallpaper on configuration change." into jb-ub-now-kermit
2014-01-15 18:34:33 +00:00
44f834133e
Merge "restore app favorites and screens" into jb-ub-now-kermit
2014-01-15 14:46:34 +00:00
33778ec019
Merge "Replace "hotseat" with "Favorites tray" in user visible strings." into jb-ub-now-kermit
2014-01-15 01:58:15 +00:00
a0d5a040b8
Replace "hotseat" with "Favorites tray" in user visible strings.
...
Bug: 12078955
Change-Id: I824948d8820276caab18d6df095754a4cfb67640
2014-01-14 17:48:26 -08:00
c27a051320
Merge "Remove settings in overview mode for Launcher3." into jb-ub-now-kermit
2014-01-15 01:31:13 +00:00
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
24ce0b3708
Fixing drop targets in phone / small tablet landscape (issue 12192781)
...
Change-Id: I4dc8a82c8cd5ef279506e7868e33a455fba5a3be
2014-01-14 16:33:50 -08:00
13b563bcae
Merge "Ensure that hasFirstRunActivity is only called when necessary" into jb-ub-now-kermit
2014-01-15 00:26:07 +00:00
bc4539df6f
Ensure that hasFirstRunActivity is only called when necessary
...
Change-Id: I834abcd82f46c6f096f5c92452b34c668a4a3d86
2014-01-14 16:24:16 -08:00
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
00c3184fa6
Merge "Fix NPE in Workspace.onDropCompleted" into jb-ub-now-kermit
2014-01-14 23:01:48 +00:00
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
eedb00a674
Fix NPE in Workspace.onDropCompleted
...
Bug: 11627757
Change-Id: I9dc86856d4bc00253d6350d157be541a8c46888d
2014-01-14 13:02:43 -08:00
c4fa7a9c4a
Merge "Fix longpress crash." into jb-ub-now-kermit
2014-01-14 18:51:36 +00:00
d731594863
Merge "Properly saving migration cling keys." into jb-ub-now-kermit
2014-01-14 18:31:32 +00:00
285b6e1483
Properly saving migration cling keys.
...
Change-Id: Id52a12da6af0fc91463dae07bbeb355ee04873d0
2014-01-14 10:30:27 -08:00
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
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
1ae293c647
Merge "backup keys that might have slipped past" into jb-ub-now-kermit
2014-01-14 15:15:04 +00:00
dc9c125236
Merge "hide launcher restore behind a flag." into jb-ub-now-kermit
2014-01-14 14:58:43 +00:00
4808aa6b42
Add ability to center the crop (disabled)
2014-01-14 13:50:53 +01:00
Jim Guggemos
Adam Cohen
Winson Chung
Mark Ashdown
Michael Jurka
Chris Wren
Geoff Mendal
Jorim Jaggi
Dan Sandler
Adrian Roos