Mark Ashdown
8c8abe936d
am 8ffe7b76: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release
...
* commit '8ffe7b76acda07a09a9c2a9eec1eb3d0c1542763': (24 commits)
Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
Updating screen background assets. (Bug 12136457)
Updating Tablet clings. (Bug 11973614)
Migration update: ensuring all folders go first
Lazy load the widget preview loader class
Don't migrate shortcuts for components that no longer exist
Import translations. DO NOT MERGE
rationalize launcher backup logging
Tightening migration conditions. (Bug 11973614)
Replace "hotseat" with "Favorites tray" in user visible strings.
Remove settings in overview mode for Launcher3.
Fixing drop targets in phone / small tablet landscape (issue 12192781)
Ensure that hasFirstRunActivity is only called when necessary
Keep selected wallpaper on configuration change.
search for a valid journal
Fix NPE in Workspace.onDropCompleted
Properly saving migration cling keys.
restore app favorites and screens
Fix longpress crash.
Add ability to center the crop (disabled)
...
2014-02-15 00:20:29 +00:00
Qiwen Zhao
ec3aad2e30
Merge commit 'd5c6745b' into klp-dev-plus-aosp
...
Conflicts:
res/values-ar/strings.xml
res/values-de/strings.xml
res/values-fa/strings.xml
res/values-iw/strings.xml
2014-02-14 16:04:37 -08:00
Yura
946334b3d3
am 0bae5b22: Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermit
...
* commit '0bae5b220a24541dbc69fb2cb755f303776d0a59':
Moved paddingStart to -v17 folder.
2014-02-14 20:38:56 +00:00
Yura
792ed52a22
am 83b0da1a: Removed paddingStart and paddingEnd when they are the same.
...
* commit '83b0da1aed13b20562039ea00d68791beb46a090':
Removed paddingStart and paddingEnd when they are the same.
2014-02-14 20:38:53 +00:00
Winson Chung
cd1092ce7b
am b6147f85: Merge "Adjusting grid for tablets and fixing incorrect resources for large tablets." into jb-ub-now-kermit
...
* commit 'b6147f85786c78b3608eabf2286cd9e61c28878d':
Adjusting grid for tablets and fixing incorrect resources for large tablets.
2014-02-14 20:38:42 +00:00
Michael Jurka
d2f157283c
am 772bbcc7: Merge "Revert "Revert "Move wallpaper picker code to a separate directory""" into jb-ub-now-kermit
...
* commit '772bbcc764a54ca513f946f70f249fd536ae84c3':
Revert "Revert "Move wallpaper picker code to a separate directory""
2014-02-14 20:38:39 +00:00
Michael Jurka
0a667dd4ef
am 8824eadc: Merge "Revert "Move wallpaper picker code to a separate directory"" into jb-ub-now-kermit
...
* commit '8824eadc960a90fe5f1dddb231e430c782d960d0':
Revert "Move wallpaper picker code to a separate directory"
2014-02-14 20:38:36 +00:00
Michael Jurka
744cbf4623
am 8e88cb84: Move wallpaper picker code to a separate directory
...
* commit '8e88cb84781907afb7cca80581fea2277264fd2c':
Move wallpaper picker code to a separate directory
2014-02-14 20:38:35 +00:00
Nilesh Agrawal
0d43ba8c91
am da41ea66: Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
...
* commit 'da41ea669890a79a4d2bc57dab9ae03157fd9e75':
Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
2014-02-14 20:38:32 +00:00
Winson Chung
9026ce177a
am 58705534: am a67d1ea0: Merge "Fixing regression in drop target bar height. (Bug 11980757)" into jb-ub-now-jolly-elf
...
* commit '58705534ab953c6394269da671cf60066f216815':
Fixing regression in drop target bar height. (Bug 11980757)
2014-02-14 20:38:28 +00:00
Winson Chung
c48aaa75b3
am 98168ec7: am c82d2622: Dyanmically lay out overview mode across all orientations and form factors.
...
* commit '98168ec76abddd286d2536baa0328353db0079ca':
Dyanmically lay out overview mode across all orientations and form factors.
2014-02-14 20:37:40 +00:00
Winson Chung
451a8474e3
am b7206d65: am 476883c5: am e494aaf7: Merge "Initial changes to support AllApps on various form factors." into jb-ub-now-jetsonic
...
* commit 'b7206d65266e0d14641677d2c7a0667fc887f87e':
Initial changes to support AllApps on various form factors.
2014-02-14 20:37:30 +00:00
Winson Chung
377b74e843
am ad462dd1: am 7e43e905: am c44a0c07: Merge "Tweaking cling text sizes for other languages. (Bug 11151675)" into jb-ub-now-jetsonic
...
* commit 'ad462dd108fd627647e6a77004b4af57ccbdcacb':
Tweaking cling text sizes for other languages. (Bug 11151675)
2014-02-14 20:37:30 +00:00
Adam Cohen
41b93dd6a0
am 086817da: am fc6175df: Merge "Fixing up PagedView to work in landscape mode" into jb-ub-now-jetsonic
...
* commit '086817da4fbd3c60aa79a89494a7f705257db5ca':
Fixing up PagedView to work in landscape mode
2014-02-14 20:37:25 +00:00
Winson Chung
9a1506dd2b
am f22037ae: am 49ac59cb: Merge "Removing unused cling, tweaking translation character limits (Bug 11151675)" into jb-ub-now-jetsonic
...
* commit 'f22037ae4ef9227fdf13ba9ae69d672e6efd2669':
Removing unused cling, tweaking translation character limits (Bug 11151675)
2014-02-14 20:37:23 +00:00
Michael Jurka
c4d3ebd2dd
am 66b4da31: am 619a180b: Make wallpaper picker/cropper more robust
...
* commit '66b4da31045efedfbc3ee92d30a7a6303b403c45':
Make wallpaper picker/cropper more robust
2014-02-14 20:37:21 +00:00
Winson Chung
55a78090f6
am 1e16e15d: am 88400d52: Merge "Initial changes to support smaller landscape layouts." into jb-ub-now-jetsonic
...
* commit '1e16e15d6c6ab36955d3f5148339a19bc009e66a':
Initial changes to support smaller landscape layouts.
2014-02-14 20:37:20 +00:00
Adam Cohen
946b94918e
am 9fd14da0: am 7397e624: Add visible touch feedback to items in folders
...
* commit '9fd14da0b4b051cd288ae11aed49a75e1e5dc936':
Add visible touch feedback to items in folders
2014-02-14 20:37:17 +00:00
Michael Jurka
8af8b1c189
am b0e2221f: am 03a526b2: Merge "Stop using a separate ImageView for default wallpaper" into jb-ub-now-jetsonic
...
* commit 'b0e2221fa0853a81986c59603824123c3a6d50ae':
Stop using a separate ImageView for default wallpaper
2014-02-14 20:37:16 +00:00
Winson Chung
a1e3a87955
am 7bed521e: am 39789cba: Merge "Removing tablet-specific assets." into jb-ub-now-jetsonic
...
* commit '7bed521ecf205cd026e5aa2752768fdcc314c094':
Removing tablet-specific assets.
2014-02-14 20:37:12 +00:00
Michael Jurka
b052483fdb
am df087f53: am 862f7e39: Load images on a bg thread
...
* commit 'df087f53b692dca56bebedeead35682017064305':
Load images on a bg thread
2014-02-14 20:37:08 +00:00
Winson Chung
f858404271
Merge "Updating Tablet clings. (Bug 11973614)" into jb-ub-now-kermit
2014-01-16 23:07:02 +00:00
Winson Chung
fd0394cc6d
Updating screen background assets. (Bug 12136457)
...
Change-Id: I48d235d9c44a53b5fbf6c244736e86cbc9f19162
2014-01-16 14:41:21 -08:00
Winson Chung
205cd7727f
Updating Tablet clings. (Bug 11973614)
...
Change-Id: I6cb10424a345691d50c4fac7969e0b97bbee4b3c
2014-01-16 14:26:07 -08:00
Geoff Mendal
0c04bfae09
Import translations. DO NOT MERGE
...
Change-Id: I7f6ec7de198d8fd863c1a56294609474d2e02a32
Auto-generated-cl: translation import
2014-01-15 13:52: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
Winson Chung
c83d136ce4
Increasing string length for translation (Bug 12524122)
...
Change-Id: I24e053790812779ec07de99c6f763965584a1bb7
2014-01-13 14:53:24 -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
5317c2b7ad
Updating assets and text for migration cling. (Bug 11973614)
...
Change-Id: I69ffc1581cc43511b4f42ebb2735afe4c0b44131
2014-01-10 16:59:09 -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
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
Yura
f0efa2fb4f
Moved paddingStart to -v17 folder.
...
This is to help get us paddingStart free to be able to work on Samsung
tablets, as they crash on paddingStart when it is used outside of -v17.
Bug: 8166178
Change-Id: I84879257c4e463879fd6bfc322514d30c469ca30
2014-01-09 10:55:40 +00:00
Yura
83b0da1aed
Removed paddingStart and paddingEnd when they are the same.
...
This is to help get us paddingStart free to be able to work on Samsung
tablets, as they crash on paddingStart when it is used outside of -v17.
Bug: 8166178
Change-Id: Ic0ea256aabb68b654a3942dd19dd30e67f1b2af9
2014-01-07 18:34:03 +00:00
Baligh Uddin
37749ea370
Import translations. DO NOT MERGE
...
Change-Id: I9ced3c60b831f09e8436f562d8c1fef1e2aa6156
Auto-generated-cl: translation import
2013-12-26 17:20:10 -08:00
Baligh Uddin
33cd5b9e9e
Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
2013-12-12 15:50:14 +00:00
Baligh Uddin
bd2243aca1
Import translations. DO NOT MERGE
...
Change-Id: I82b885284a196a6e466640d7790dc3c977f247a5
Auto-generated-cl: translation import
2013-12-11 21:11:15 -08:00
Winson Chung
b6147f8578
Merge "Adjusting grid for tablets and fixing incorrect resources for large tablets." into jb-ub-now-kermit
2013-12-12 00:35:47 +00:00
Michael Jurka
96749c1321
Revert "Revert "Move wallpaper picker code to a separate directory""
...
This reverts commit 39de459a86 .
2013-12-11 15:41:28 +01:00
Winson Chung
59a488ac03
Adjusting grid for tablets and fixing incorrect resources for large tablets.
...
Change-Id: I4c2a058da934bef14f5be3c53ebda940aeb990ca
2013-12-10 17:52:40 -08:00
Michael Jurka
39de459a86
Revert "Move wallpaper picker code to a separate directory"
...
This reverts commit 8e88cb8478 .
2013-12-10 23:47:28 +01:00
Michael Jurka
8e88cb8478
Move wallpaper picker code to a separate directory
...
Change-Id: Id79d11ed08085c4fe356739498a8b77952e30392
2013-12-10 18:28:50 +01:00
Nilesh Agrawal
da41ea6698
Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
...
Added the xml resource in Launcher3 package as well.
This is a dummy resource with just hotseat icons.
Previously reviewed on: http://ag/396580
Change-Id: I31b0d7d4796d028f44f746260c381f2d8226605a
2013-12-09 14:37:59 -08:00
Winson Chung
c39c3c4763
Fixing regression in drop target bar height. (Bug 11980757)
...
Change-Id: I67ccc575b5c15a47ab7f41ceebfc86d9a212ddf3
2013-12-04 16:18:55 -08:00
Winson Chung
c82d2622bc
Dyanmically lay out overview mode across all orientations and form factors.
...
Change-Id: I788bbf289717b30b19afc9ad9d611c85715bc623
2013-11-07 18:50:37 +00:00
Baligh Uddin
f0d79e5734
Import translations. DO NOT MERGE
...
Change-Id: I077655685f6faa46c09db6f7d7384aaddb08c9f7
Auto-generated-cl: translation import
2013-11-06 15:16:57 -08:00