summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE" into ub-now-novaBaligh Uddin2014-04-241-2/+2
|\
| * Import translations. DO NOT MERGEBaligh Uddin2014-04-231-2/+2
| | | | | | | | | | Change-Id: I4c91fa67d3ea6c6831d685d6457cab78537aa0c1 Auto-generated-cl: translation import
* | am bc0a4064: Avoid wrapping cling titles on small screens.Jeff Sharkey2014-04-241-2/+2
|\ \ | | | | | | | | | | | | * commit 'bc0a40647bedd5f80512dc553b8e3bdab1ccb705': Avoid wrapping cling titles on small screens.
| * | Avoid wrapping cling titles on small screens.Jeff Sharkey2014-04-231-2/+2
| | | | | | | | | | | | | | | | | | | | | Only allow font size bump on large-screen English devices. Bug: 13340779 Change-Id: I21e10bd21b30803386fdb62b87b0fbdf8efd6731
* | | Merge "Fix long press after already moving off icon" into ub-now-novaJason Monk2014-04-234-1/+54
|\ \ \
| * | | Fix long press after already moving off iconJason Monk2014-04-224-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an icon is in the Hotseat and a user drags off from the icon, but continues holding down, the icon gets a long press triggered by the CheckLongPressHelper. To fix this a check has been added on move events to see if the point has moved outside the view and to cancel the long press check callback if it has. Bug: 13569451 Change-Id: Id175cdc220d70b5e9f8e492ed5a3cc7c3f11db10
* | | | Merge "Second try removing orphaned items from the database" into ub-now-novaAdam Cohen2014-04-231-8/+35
|\ \ \ \
| * | | | Second try removing orphaned items from the databaseAdam Cohen2014-04-221-8/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> Delete items contained directly on the desktop whose screens no longer exist (do not remove items contained in hotseat or folders, except as described below) -> Delete items contained by folder ids which are no longer present (ie. orphaned as their parent folder no long exists) Change-Id: I2f47cc970ce00677cb1c83c0f0a2d13b6f16a33e
* | | | | Merge "Add synchronization to DeferredBindRunnables" into ub-now-novaJason Monk2014-04-231-8/+25
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add synchronization to DeferredBindRunnablesJason Monk2014-04-221-8/+25
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems that on occasion the list is being iterated on while being modified. To fix this added synchronization to all modifications to the list as well as iterating on a copy of the list to cut down on time holding the lock. Bug: 12885709 Change-Id: I4287bdedbeb8e438b49c1f79b44819a752c28a69
* | | | am 5aeef581: Add support for partner customization.Jeff Sharkey2014-04-223-116/+283
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit '5aeef58131e1c330d1d9c1dfcacf2e6eea6ced4b': Add support for partner customization.
| * | | Add support for partner customization.Jeff Sharkey2014-04-223-116/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Traditionally Launcher workspace customization is offered through overlays at build time, but we don't have access to partner-specific customization at build time. To solve this, this adds a new "partner-folder" tag which points at an XML resource provided by an external package. The external package XML can't depend on the binary XML attributes defined by Launcher3, so we switch to using manual string-based attribute lookups. Partners can also provide extra wallpapers. When a folder only results in a single item, promote that item into the folder location instead of deleting completely. Bug: 13340779 Change-Id: Ide558288bef4113565f288b700d8245055c0fee9
* | | | Fix source code so it compiles on google3Sameer Padala2014-04-214-4/+9
| |_|/ |/| | | | | | | | | | | | | | This is a follow up to cr/65191596 which checked for String + array warnings. Change-Id: Id70eaa32b63b838b03be21d632c7470039b6423f
* | | am 76ac344c: Merge "Allow the old launcher content URI to be overrided" into ↵Adam Cohen2014-04-183-3/+7
|\| | | | | | | | | | | | | | | | | | | | ub-now-mister-ugly * commit '76ac344cb61a74267c04249c9e9feec41a82c504': Allow the old launcher content URI to be overrided
| * | Merge "Allow the old launcher content URI to be overrided" into ↵Adam Cohen2014-04-173-3/+7
| |\ \ | | | | | | | | | | | | ub-now-mister-ugly
| | * | Allow the old launcher content URI to be overridedJason Monk2014-03-213-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the URI used to import favorites from launcher2 to be loaded from a string resource. This allows it to be overridden. This will enable permissions fix for GoogleSearch. Bug: 12058200 Change-Id: I31243fe89f545c9771d5cceffe1c9e7668a42bc5
* | | | am d83ebf92: (-s ours) DO NOT MERGE disable launcher restore for 3.4 launch.Chris Wren2014-04-160-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'd83ebf9270e90d9306ad4eaf6837dea91ca3b172': DO NOT MERGE disable launcher restore for 3.4 launch.
| * | | DO NOT MERGE disable launcher restore for 3.4 launch.Chris Wren2014-04-161-1/+1
| | | | | | | | | | | | | | | | Change-Id: I8e439df25cad2cb9cf92cf1faef22906420e22cb
* | | | additional debug logs to track welcome back behavior.Chris Wren2014-04-162-3/+4
| | | | | | | | | | | | | | | | | | | | Bug: 13568891 Change-Id: I359202ce59b3444e46331485ea22f542ae908e36
* | | | am 85900298: Take account of bounds set on drag drawables.Mathew Inwood2014-04-161-5/+17
|\| | | | | | | | | | | | | | | | | | | * commit '859002985e0e5d73f54c942f2024607431db60fc': Take account of bounds set on drag drawables.
| * | | Take account of bounds set on drag drawables.Mathew Inwood2014-04-161-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If bounds are set on a compound drawable in a textview, drawing it into a bitmap set to the intrinsic size of the drawable results in it being scaled down in the top corner. Scaling it down again into the grid icon size then gives a tiny icon. Use the drawable bounds if any are set, otherwise use the intrinsic size. Bug: 14103508 Change-Id: Idadd7bb891dc33d092eb9ceb3025b9a5d9e1bfd8
* | | | Fix skia crash in widget preview loadingAdrian Roos2014-04-162-3/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix works making sure all drawables are mutated before drawing them in the background. Mutation has to be executed on the main thread because that operation is not thread safe. Bug: 12525890 Change-Id: Id7bdf9cf48d3e7b7f31938bdea4a3bf1632cf337
* | | | am 1a1fdf41: turn off LauncherAppState.DEBUGChris Wren2014-04-151-1/+1
|\| | | | |_|/ |/| | | | | | | | * commit '1a1fdf4185637610b37953e901605c55ef8ba0a6': turn off LauncherAppState.DEBUG
| * | turn off LauncherAppState.DEBUGChris Wren2014-04-151-1/+1
| | | | | | | | | | | | Change-Id: Ia6d54235c353c27c8716d7fd9270a7f2ee7bc93f
* | | am babb53ef: Adding external path for drag/drops.Winson Chung2014-04-152-7/+80
|\| | | | | | | | | | | | | | * commit 'babb53ef8fd0fcba32fcc8fc213663f0f27b8f5e': Adding external path for drag/drops.
| * | Adding external path for drag/drops.Winson Chung2014-04-142-7/+80
| | | | | | | | | | | | Change-Id: I3b315c4d14cadb9210f15d3c3e0b9545f4591be4
* | | am b90860a9: Expose workspace.moveToDefaultScreen.Mathew Inwood2014-04-141-0/+4
|\| | | | | | | | | | | | | | * commit 'b90860a99630bbd24f90cc205d8990187b0ed12e': Expose workspace.moveToDefaultScreen.
| * | Expose workspace.moveToDefaultScreen.Mathew Inwood2014-04-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is to allow derived launcher classes to move the workspace to the default screen when a drag is started, in case the current screen is not capable of acting as a drop target. Bug: 13962574 Change-Id: I8a6e94ce08be825c344beb708d244d2def5f319f
* | | am 8ac896b8: Merge "Fix serious data loss issue for folders and hotseat ↵Adam Cohen2014-04-111-1/+3
|\| | | | | | | | | | | | | | | | | | | | items" into ub-now-mister-ugly * commit '8ac896b8c84066c109c2c4b97805f36270636121': Fix serious data loss issue for folders and hotseat items
| * | Merge "Fix serious data loss issue for folders and hotseat items" into ↵Adam Cohen2014-04-111-1/+3
| |\ \ | | | | | | | | | | | | ub-now-mister-ugly
| | * | Fix serious data loss issue for folders and hotseat itemsAdam Cohen2014-04-111-1/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I37a5b44c670c2a1f99eb97b77cfdbc78534fdf91 bug 13964735
* | | | am 6a641a56: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2014-04-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-mister-ugly * commit '6a641a569987f5edd725cb2dea6a992751cfbfbe': Import translations. DO NOT MERGE
| * | | Merge "Import translations. DO NOT MERGE" into ub-now-mister-uglyBaligh Uddin2014-04-101-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I79cba96f30222edc7c238c69ba39c42e5796dc94 Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE" into ub-now-novaBaligh Uddin2014-04-101-1/+1
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib7afd2524a24e257197b9e93c98edb93eea64b1a Auto-generated-cl: translation import
* | | | | am f6a47bbc: Merge "Ensure the intro view is always the top view in the ↵Adam Cohen2014-04-091-5/+18
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | draglayer if it is present" into ub-now-mister-ugly * commit 'f6a47bbc05b7797a85034760b001f0050bf439a8': Ensure the intro view is always the top view in the draglayer if it is present
| * | | | Merge "Ensure the intro view is always the top view in the draglayer if it ↵Adam Cohen2014-04-091-5/+18
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | is present" into ub-now-mister-ugly
| | * | | Ensure the intro view is always the top view in the draglayer if it is presentAdam Cohen2014-04-081-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> On devices post-api-16, we can achieve this just with child drawing order but on level 16 devices, child drawing order doesn't give us touch dispatch which is problematic for the intro screen. issue 13796017 Change-Id: Ibf89ae91d8489f2de1eb9c8f235a0e6e6aed1847
* | | | | am 646fdf70: Upping activity start delayAdam Cohen2014-04-091-1/+1
|\| | | | | |_|/ / |/| | | | | | | | | | | * commit '646fdf70b45f330a02104106a65ab7a529e70c6e': Upping activity start delay
| * | | Upping activity start delayAdam Cohen2014-04-081-1/+1
| | | | | | | | | | | | | | | | Change-Id: I4b72ae9d719825e1be8f1feb3643f9311dde2534
* | | | am 37b49b18: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2014-04-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | ub-now-mister-ugly * commit '37b49b18730b39677d068827377228616297116a': Import translations. DO NOT MERGE
| * | | Merge "Import translations. DO NOT MERGE" into ub-now-mister-uglyBaligh Uddin2014-04-0855-110/+55
| |\ \ \
| | * | | Import translations. DO NOT MERGEBaligh Uddin2014-04-0755-110/+55
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1e236770eb6f0b892aa0062eee00f9cdb918d307 Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE" into ub-now-novaBaligh Uddin2014-04-0855-110/+55
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-0755-110/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1b27543739c08858de732abebe4911924591d03 Auto-generated-cl: translation import
* | | | | | am c4cf34de: Merge "Fix pre sdk-18 compatibility (crash in dispatchDraw)" ↵Adam Cohen2014-04-071-7/+11
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | into ub-now-mister-ugly * commit 'c4cf34dedb5fc21fce30924105729fa3dad6aa90': Fix pre sdk-18 compatibility (crash in dispatchDraw)
| * | | | Merge "Fix pre sdk-18 compatibility (crash in dispatchDraw)" into ↵Adam Cohen2014-04-071-7/+11
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / ub-now-mister-ugly
| | * | Fix pre sdk-18 compatibility (crash in dispatchDraw)Adam Cohen2014-04-071-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | issue 13801679 Change-Id: I25b997179fd8eb7cdec6fc48d81533fb1c3094ce
* | | | am 59551217: Merge "Attempt to fix crash on workspace drag and drop on ↵Adam Cohen2014-04-051-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | certain JB devices" into ub-now-mister-ugly * commit '59551217428a9cfbe11f727d0b69246a291931b5': Attempt to fix crash on workspace drag and drop on certain JB devices