summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge "Loading internal default layout if partner layout fails to load" into ↵Sunny Goyal2014-10-281-12/+17
| |\ | | | | | | | | | ub-now-queens
| | * Loading internal default layout if partner layout fails to loadSunny Goyal2014-10-271-12/+17
| | | | | | | | | | | | | | | Bug: 18033885 Change-Id: I8399d0107cc3570c0e03d833601abf2cd194b3d3
* | | am bb4ae1d2: Merge "Removing landscape string overrides" into ub-now-queensSunny Goyal2014-10-2847-1173/+0
|\| | | | | | | | | | | | | | * commit 'bb4ae1d26a11a1211ce793278a878fa3cb224ff5': Removing landscape string overrides
| * | Merge "Removing landscape string overrides" into ub-now-queensSunny Goyal2014-10-2747-1173/+0
| |\ \ | | |/ | |/|
| | * Removing landscape string overridesSunny Goyal2014-10-2347-1173/+0
| | | | | | | | | | | | Change-Id: Idbfc600dfb32b195726f1b035d18be92c26883fd
* | | am e790dfdc: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2014-10-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | ub-now-queens * commit 'e790dfdc4f46983b8416ef39b6112e91c10f9b51': Import translations. DO NOT MERGE
| * | Merge "Import translations. DO NOT MERGE" into ub-now-queensGeoff Mendal2014-10-2720-39/+20
| |\ \
| | * | Import translations. DO NOT MERGEGeoff Mendal2014-10-2720-39/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: Iff6f42e2460ae8c08dda9170361be3f010f32b48 Auto-generated-cl: translation import
* | | | am 8c4ca927: Fix edge case where LauncherOverlay scroll woudln\'t be resetAdam Cohen2014-10-281-2/+11
|\| | | | | | | | | | | | | | | | | | | * commit '8c4ca9277dcb92cb965a1e58eef59ad9868ae44e': Fix edge case where LauncherOverlay scroll woudln't be reset
| * | | Fix edge case where LauncherOverlay scroll woudln't be resetAdam Cohen2014-10-241-2/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | -> If the Workspace has a single page and the user goes from overscrolling in one direction, and then the other, the LauncherOverlay scroll wouldn't be set to 0 until the scrolling settled Change-Id: I29ee9abdfa023ae3599d1590cdaebf457e2220fa
* | | Import translations. DO NOT MERGEGeoff Mendal2014-10-2720-39/+20
| | | | | | | | | | | | | | | Change-Id: I004c34f906b345b3206cb45dff0710e243171a10 Auto-generated-cl: translation import
* | | am be25822f: Add InsettableFrameLayout layout params to easily ignore insetsAdam Cohen2014-10-254-13/+63
|\| | | | | | | | | | | | | | * commit 'be25822f7677f376f9687e6a66cfa54739c40700': Add InsettableFrameLayout layout params to easily ignore insets
| * | Add InsettableFrameLayout layout params to easily ignore insetsAdam Cohen2014-10-244-13/+63
| | | | | | | | | | | | Change-Id: I117fc34627e24ea5f909c3c87e9c2dbca46babb6
* | | am 0fb5ce20: Tweaking close AllApps / Widgets on KK and belowAdam Cohen2014-10-241-5/+5
|\| | | | | | | | | | | | | | * commit '0fb5ce20d7ae49f63628f88a1a238d6e2247dfe9': Tweaking close AllApps / Widgets on KK and below
| * | Tweaking close AllApps / Widgets on KK and belowAdam Cohen2014-10-241-5/+5
| | | | | | | | | | | | | | | | | | Bug: 17956862 Change-Id: I83b8973b7e98c1c3660221ac65dcb9ca8b4c84fd
* | | am ac36ed6d: Merge "Was seeing some duplicated icons in the migration flow" ↵Adam Cohen2014-10-241-1/+5
|\| | | | | | | | | | | | | | | | | | | | into ub-now-queens * commit 'ac36ed6d5a08b508b3c610cc06a19799da2deb55': Was seeing some duplicated icons in the migration flow
| * | Merge "Was seeing some duplicated icons in the migration flow" into ↵Adam Cohen2014-10-241-1/+5
| |\ \ | | | | | | | | | | | | ub-now-queens
| | * | Was seeing some duplicated icons in the migration flowAdam Cohen2014-10-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -> The only delta between the two icons was slightly different flags -> No need to consider flags for the purposes of duplication Change-Id: I161f6ad6023d829e5ebbb15f1a9fbc9306795d80
* | | | am 32e34b84: Merge "Allow LauncherOverlay to access and manage insets" into ↵Adam Cohen2014-10-2411-67/+101
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-queens * commit '32e34b840576a6857e6ccd308ba9ef1d18f649fe': Allow LauncherOverlay to access and manage insets
| * | | Merge "Allow LauncherOverlay to access and manage insets" into ub-now-queensAdam Cohen2014-10-2411-67/+101
| |\ \ \
| | * | | Allow LauncherOverlay to access and manage insetsAdam Cohen2014-10-2411-67/+101
| | |/ / | | | | | | | | | | | | Change-Id: Ib9faf37eb22ad2a0b18c076978ec9f2fd8864c0c
* | | | am d8cec094: Disabling restore for below L devicesSunny Goyal2014-10-241-0/+6
|\| | | | | | | | | | | | | | | | | | | * commit 'd8cec0945e1d2790e68ca76362aa6ff9c5f8e370': Disabling restore for below L devices
| * | | Disabling restore for below L devicesSunny Goyal2014-10-231-0/+6
| |/ / | | | | | | | | | Change-Id: I262f52e88421637e0d50c048f6d53c6b5754da4e
* | | am 4a080dca: Merge "Some resource fixes for drop target" into ub-now-queensSunny Goyal2014-10-238-88/+77
|\| | | | | | | | | | | | | | * commit '4a080dcadd532dd259de596729a1cd6e949bdae4': Some resource fixes for drop target
| * | Merge "Some resource fixes for drop target" into ub-now-queensSunny Goyal2014-10-238-88/+77
| |\ \
| | * | Some resource fixes for drop targetSunny Goyal2014-10-238-88/+77
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | > Making it singleline with ellipsis everywhere > Decreasing the text size on smaller devices > Decreasing char limit for various labels Bug: 17563793 Bug: 17938450 Change-Id: I8ad1a156de0601d07419b2cc6418389bc2e24a4e
* | | am ef728d42: Refactoring LauncherBackupHelper.javaSunny Goyal2014-10-231-390/+222
|\| | | | | | | | | | | | | | * commit 'ef728d42927f127fe8d1fc075aef312892388901': Refactoring LauncherBackupHelper.java
| * | Refactoring LauncherBackupHelper.javaSunny Goyal2014-10-231-390/+222
| |/ | | | | | | | | | | | | > Moving a bunch of variables to Global level to make it easier to maintain state. Change-Id: I9ded313bd4f673f45c61556b8c66607dc78a5ae9
* | am 24e0fc12: Merge "Deleting workspace items from db which have an invalid ↵Sunny Goyal2014-10-231-21/+7
|\| | | | | | | | | | | | | placement" into ub-now-queens * commit '24e0fc122186641adf862327d9266da774f3c25f': Deleting workspace items from db which have an invalid placement
| * Merge "Deleting workspace items from db which have an invalid placement" ↵Sunny Goyal2014-10-231-21/+7
| |\ | | | | | | | | | into ub-now-queens
| | * Deleting workspace items from db which have an invalid placementSunny Goyal2014-10-161-21/+7
| | | | | | | | | | | | Change-Id: I1d616e8cd533acd6ecd334d85e6468163f31f6a4
* | | am 09c7fc71: Merge "Removing AccessibleTabView and some other dead code." ↵Sunny Goyal2014-10-232-259/+0
|\| | | | | | | | | | | | | | | | | | | | into ub-now-queens * commit '09c7fc714448cd29faaec374ac9027ca878a3deb': Removing AccessibleTabView and some other dead code.
| * | Merge "Removing AccessibleTabView and some other dead code." into ub-now-queensSunny Goyal2014-10-232-259/+0
| |\ \
| | * | Removing AccessibleTabView and some other dead code.Sunny Goyal2014-10-212-259/+0
| | | | | | | | | | | | | | | | Change-Id: Ia122a6277f924e6077dbf15a4dc40b5042aa987d
* | | | am 24e18aea: Merge "First pass of the Launcher Overlay interface / impl" ↵Adam Cohen2014-10-2313-39/+693
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into ub-now-queens * commit '24e18aea81ad0c411ce5adb13773595005f8565f': First pass of the Launcher Overlay interface / impl
| * | | Merge "First pass of the Launcher Overlay interface / impl" into ub-now-queensAdam Cohen2014-10-2313-39/+693
| |\ \ \
| | * | | First pass of the Launcher Overlay interface / implAdam Cohen2014-10-2213-39/+693
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | -> Added simple reference launcher extension -> Make launcher able to handle a null qsb Change-Id: Ib1575243cac800a335e95bbf00cdc394bb4741c3
* | | | am d6a99860: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-10-220-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'd6a99860f81211cb1afa4d6933d333907d6f1b79': Import translations. DO NOT MERGE
| * | | Import translations. DO NOT MERGEGeoff Mendal2014-10-2255-0/+74
| | | | | | | | | | | | | | | | | | | | Change-Id: I289d8bb325fa4037936a57c7dfe908186e077be1 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-2255-0/+74
| | | | | | | | | | | | | | | | | | | | Change-Id: Icff21d84b1dbb334bad3106c9e5e01168e3dca37 Auto-generated-cl: translation import
* | | | Merge "Removing duplicated and/or unused resources from WallpaperPicker that ↵Cameron Neale2014-10-213-24/+0
|\ \ \ \ | | | | | | | | | | | | | | | conflict with Launcher 3 resources. The resource duplicated between the two is now only held within Launcher3. These changes are necessary in order for GSA to build in Google3." into ub-now-master
| * | | | Removing duplicated and/or unused resources from WallpaperPicker that ↵Cameron Neale2014-10-203-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflict with Launcher 3 resources. The resource duplicated between the two is now only held within Launcher3. These changes are necessary in order for GSA to build in Google3. Change-Id: I70f5a250db52303c876e6abedd9c6d32d1d4761e
* | | | | am 1231c074: Merge "Updating ItemInfo objects in the worker thread" into ↵Sunny Goyal2014-10-215-270/+188
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | ub-now-queens * commit '1231c0743cce0b6b70951d1df3e4b0876c444598': Updating ItemInfo objects in the worker thread
| * | | | Merge "Updating ItemInfo objects in the worker thread" into ub-now-queensSunny Goyal2014-10-215-270/+188
| |\ \ \ \
| | * | | | Updating ItemInfo objects in the worker threadSunny Goyal2014-10-145-270/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Launcher was making non-trivial updates to ItemInfo objects on UI thread. These updates were getting skipped when the Activity gets destroyed (possibly due to onConfigurationChange) > Unregistering SessionCallback on application onTerminate, rather than activity onDestroy Bug: 17941096 Change-Id: Iad4a50871fe09470f26139b44a2e9886833032f1
* | | | | | am e75e7ab4: Merge "Not opening all apps again when AppInfo or Uninstall is ↵Adam Cohen2014-10-212-8/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selected" into ub-now-queens * commit 'e75e7ab4fd6f38cb99382c3b16300fd0f2ef6307': Not opening all apps again when AppInfo or Uninstall is selected
| * | | | | Merge "Not opening all apps again when AppInfo or Uninstall is selected" ↵Adam Cohen2014-10-212-8/+3
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | into ub-now-queens
| | * | | | Not opening all apps again when AppInfo or Uninstall is selectedSunny Goyal2014-10-162-8/+3
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Bug: 17460202 Change-Id: Id67a9637324abceb5b446fff5999db2a0910401b
* | | | | am 1aa3abea: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2014-10-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-queens * commit '1aa3abea279d8b3ead93d704d424757bfe65c2bd': Import translations. DO NOT MERGE
| * | | | Merge "Import translations. DO NOT MERGE" into ub-now-queensGeoff Mendal2014-10-2055-62/+7
| |\ \ \ \