summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Disabled the wallpaper when completely in -1 Now space.Selim Cinek2014-01-161-1/+1
| | | | Bug: 11186234 Change-Id: I6ffb66f12298bd9df7e228a8589d63780b70a396
* am f8584042: Merge "Updating Tablet clings. (Bug 11973614)" into ↵Winson Chung2014-01-1624-233/+888
|\ | | | | | | | | | | | | jb-ub-now-kermit * commit 'f8584042713aad82f9d057ecaace8a9ad1aad0bc': Updating Tablet clings. (Bug 11973614)
| * Merge "Updating Tablet clings. (Bug 11973614)" into jb-ub-now-kermitWinson Chung2014-01-1624-233/+888
| |\
| | * Updating Tablet clings. (Bug 11973614)Winson Chung2014-01-1624-233/+888
| | | | | | | | | | | | Change-Id: I6cb10424a345691d50c4fac7969e0b97bbee4b3c
* | | am 1ba0a30e: Merge "Adding new bucket for inbetween phone-tablet layouts. ↵Winson Chung2014-01-161-0/+2
|\| | | | | | | | | | | | | | | | | | | | (Bug 11993166)" into jb-ub-now-kermit * commit '1ba0a30e6545a8c313d0ef355a101f661bbf778c': Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
| * | Merge "Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)" ↵Winson Chung2014-01-161-0/+2
| |\ \ | | | | | | | | | | | | into jb-ub-now-kermit
| | * | Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)Winson Chung2014-01-161-0/+2
| | |/ | | | | | | | | | Change-Id: I01fc54be8059d4cd25ff465c70595683fc8ac019
* | | am 08101b1f: Merge "Lazy load the widget preview loader class" into ↵Adam Cohen2014-01-161-13/+16
|\| | | | | | | | | | | | | | | | | | | | jb-ub-now-kermit * commit '08101b1f52b2b6aa8ddb82f09a18b91482b99f58': Lazy load the widget preview loader class
| * | Merge "Lazy load the widget preview loader class" into jb-ub-now-kermitAdam Cohen2014-01-161-13/+16
| |\ \
| | * | Lazy load the widget preview loader classMichael Jurka2014-01-161-12/+15
| | | | | | | | | | | | | | | | | | | | Bug: 12109621 Change-Id: Id99aded30195bf39ebcf2148611bc4e084f3b2c7
* | | | am e1b0682a: Merge "Updating screen background assets. (Bug 12136457)" into ↵Winson Chung2014-01-164-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | jb-ub-now-kermit * commit 'e1b0682af062bc85b7328f5c635a21d9ce420d8e': Updating screen background assets. (Bug 12136457)
| * | | Merge "Updating screen background assets. (Bug 12136457)" into jb-ub-now-kermitWinson Chung2014-01-164-0/+0
| |\ \ \
| | * | | Updating screen background assets. (Bug 12136457)Winson Chung2014-01-164-0/+0
| | | |/ | | |/| | | | | | | | | Change-Id: I48d235d9c44a53b5fbf6c244736e86cbc9f19162
* | | | am 72960975: Migration update: ensuring all folders go firstAdam Cohen2014-01-161-26/+51
|\| | | | | | | | | | | | | | | | | | | * commit '72960975d8367e7ce789d8a5b6f0763fb0ec78bf': Migration update: ensuring all folders go first
| * | | Migration update: ensuring all folders go firstAdam Cohen2014-01-161-26/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> 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
* | | | am 556f6135: Don\'t migrate shortcuts for components that no longer existAdam Cohen2014-01-162-20/+33
|\| | | | | | | | | | | | | | | | | | | * commit '556f6135f992dcd5bfbfffe0172627bfbf57d24e': Don't migrate shortcuts for components that no longer exist
| * | | Don't migrate shortcuts for components that no longer existAdam Cohen2014-01-152-20/+33
| |/ / | | | | | | | | | | | | | | | Bug 12570791 Change-Id: Ie4b55afcee0c4d1d16acf7b830d7885800943454
* | | Merge "Fix back button behavior for "App info" when launched by Launcher3." ↵Adrian Roos2014-01-151-1/+2
|\ \ \ | | | | | | | | | | | | into ub-now-lunchbox
| * | | Fix back button behavior for "App info" when launched by Launcher3.Adrian Roos2014-01-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Ensures the back stack is clean when opening the "App info" app from the launcher. Bug: 10393223 Change-Id: Iad078ca37c4794a580f1b996f8324fef404e7462
* | | | am 230cbf83: Merge "rationalize launcher backup logging" into jb-ub-now-kermitChris Wren2014-01-153-43/+58
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '230cbf831cbbe8aaa6eaff976f755a8adf5e1708': rationalize launcher backup logging
| * | | Merge "rationalize launcher backup logging" into jb-ub-now-kermitChris Wren2014-01-153-43/+58
| |\ \ \
| | * | | rationalize launcher backup loggingChris Wren2014-01-153-43/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 43323cc3: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2014-01-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-ub-now-kermit * commit '43323cc306adaae144457f29c0b0860d4f21f257': Import translations. DO NOT MERGE
| * | | | Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermitGeoff Mendal2014-01-1556-179/+199
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2014-01-1556-179/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7f6ec7de198d8fd863c1a56294609474d2e02a32 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE" into ub-now-lunchboxGeoff Mendal2014-01-1556-179/+199
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Import translations. DO NOT MERGEGeoff Mendal2014-01-1556-179/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8f07cab26ae1bd70357157730b8dbe36eca34e0d Auto-generated-cl: translation import
* | | | | | am affe0b5f: Merge "Tightening migration conditions. (Bug 11973614)" into ↵Winson Chung2014-01-153-22/+57
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-ub-now-kermit * commit 'affe0b5f764274a34b2869de7c529df61c24de7b': Tightening migration conditions. (Bug 11973614)
| * | | | | Merge "Tightening migration conditions. (Bug 11973614)" into jb-ub-now-kermitWinson Chung2014-01-153-22/+57
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Tightening migration conditions. (Bug 11973614)Winson Chung2014-01-153-22/+57
| | | |/ / | | |/| | | | | | | | | | | | Change-Id: I6d7417b705227472d035f428cbec933cc6dbf2ce
* | | | | am 12f583b4: Merge "Keep selected wallpaper on configuration change." into ↵Jorim Jaggi2014-01-151-7/+15
|\| | | | | |_|/ / |/| | | | | | | | | | | | | | | | | | | jb-ub-now-kermit * commit '12f583b487e445a886d7c23cd76f4cadfdc5d4e2': Keep selected wallpaper on configuration change.
| * | | Merge "Keep selected wallpaper on configuration change." into jb-ub-now-kermitJorim Jaggi2014-01-151-7/+15
| |\ \ \ | | |/ / | |/| |
| | * | Keep selected wallpaper on configuration change.Jorim Jaggi2014-01-141-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 44f83413: Merge "restore app favorites and screens" into jb-ub-now-kermitDan Sandler2014-01-152-9/+89
|\| | | | | | | | | | | | | | | | | | | * commit '44f834133e106550a67ecf246e8bc9d4e1644c56': restore app favorites and screens
| * | | Merge "restore app favorites and screens" into jb-ub-now-kermitDan Sandler2014-01-152-9/+89
| |\ \ \
| | * | | restore app favorites and screensChris Wren2014-01-142-9/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version 0: restore assuming apps are already installed. Bug: 10779035 Change-Id: I7f9aa418a7d3d5460a79a229c0fbc80305b5eb5c
* | | | | am 33778ec0: Merge "Replace "hotseat" with "Favorites tray" in user visible ↵Adrian Roos2014-01-151-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strings." into jb-ub-now-kermit * commit '33778ec01983646a7941c9b274618126cf1f464e': Replace "hotseat" with "Favorites tray" in user visible strings.
| * | | | Merge "Replace "hotseat" with "Favorites tray" in user visible strings." ↵Adrian Roos2014-01-151-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into jb-ub-now-kermit
| | * | | | Replace "hotseat" with "Favorites tray" in user visible strings.Adrian Roos2014-01-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12078955 Change-Id: I824948d8820276caab18d6df095754a4cfb67640
* | | | | | am c27a0513: Merge "Remove settings in overview mode for Launcher3." into ↵Jorim Jaggi2014-01-153-18/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-ub-now-kermit * commit 'c27a05132042149fdcc926aeebc1a284cece1aa4': Remove settings in overview mode for Launcher3.
| * | | | | Merge "Remove settings in overview mode for Launcher3." into jb-ub-now-kermitJorim Jaggi2014-01-153-18/+51
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Remove settings in overview mode for Launcher3.Jorim Jaggi2014-01-143-18/+51
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 24ce0b37: Fixing drop targets in phone / small tablet landscape (issue ↵Adam Cohen2014-01-1513-38/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12192781) * commit '24ce0b3708b44e738d6ee52477aa4dd917b547e7': Fixing drop targets in phone / small tablet landscape (issue 12192781)
| * | | | Fixing drop targets in phone / small tablet landscape (issue 12192781)Adam Cohen2014-01-1413-38/+22
| | | | | | | | | | | | | | | | | | | | Change-Id: I4dc8a82c8cd5ef279506e7868e33a455fba5a3be
* | | | | am 13b563bc: Merge "Ensure that hasFirstRunActivity is only called when ↵Adam Cohen2014-01-151-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | necessary" into jb-ub-now-kermit * commit '13b563bcae015646d19fa9cf2baf7437d4711f8e': Ensure that hasFirstRunActivity is only called when necessary
| * | | | Merge "Ensure that hasFirstRunActivity is only called when necessary" into ↵Adam Cohen2014-01-151-3/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | jb-ub-now-kermit
| | * | | | Ensure that hasFirstRunActivity is only called when necessaryAdam Cohen2014-01-141-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I834abcd82f46c6f096f5c92452b34c668a4a3d86
* | | | | | am 00c3184f: Merge "Fix NPE in Workspace.onDropCompleted" into jb-ub-now-kermitJorim Jaggi2014-01-152-1/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '00c3184fa6fae69123d160b92977799a1a47fa34': Fix NPE in Workspace.onDropCompleted
| * | | | | Merge "Fix NPE in Workspace.onDropCompleted" into jb-ub-now-kermitJorim Jaggi2014-01-142-1/+11
| |\ \ \ \ \
| | * | | | | Fix NPE in Workspace.onDropCompletedJorim Jaggi2014-01-142-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11627757 Change-Id: I9dc86856d4bc00253d6350d157be541a8c46888d