summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Add support for partner customization.Jeff Sharkey2014-04-222-105/+265
| | | | | | | | | | | | | | | | | | 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
* Merge "Allow the old launcher content URI to be overrided" into ↵Adam Cohen2014-04-172-3/+3
|\ | | | | | | ub-now-mister-ugly
| * Allow the old launcher content URI to be overridedJason Monk2014-03-212-3/+3
| | | | | | | | | | | | | | | | | | | | 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
* | DO NOT MERGE disable launcher restore for 3.4 launch.Chris Wren2014-04-161-1/+1
| | | | | | | | Change-Id: I8e439df25cad2cb9cf92cf1faef22906420e22cb
* | 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
* | turn off LauncherAppState.DEBUGChris Wren2014-04-151-1/+1
| | | | | | | | Change-Id: Ia6d54235c353c27c8716d7fd9270a7f2ee7bc93f
* | Adding external path for drag/drops.Winson Chung2014-04-142-7/+80
| | | | | | | | Change-Id: I3b315c4d14cadb9210f15d3c3e0b9545f4591be4
* | 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
* | Fix serious data loss issue for folders and hotseat itemsAdam Cohen2014-04-111-1/+3
| | | | | | | | | | Change-Id: I37a5b44c670c2a1f99eb97b77cfdbc78534fdf91 bug 13964735
* | 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
* | | Upping activity start delayAdam Cohen2014-04-081-1/+1
| | | | | | | | | | | | Change-Id: I4b72ae9d719825e1be8f1feb3643f9311dde2534
* | | 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
* | | Merge "Attempt to fix crash on workspace drag and drop on certain JB ↵Adam Cohen2014-04-051-1/+7
|\| | | | | | | | | | | devices" into ub-now-mister-ugly
| * | Attempt to fix crash on workspace drag and drop on certain JB devicesAdam Cohen2014-04-041-1/+7
| | | | | | | | | | | | | | | | | | issue 13801679 Change-Id: I4769220ddeab566a869050b20d6064809c70bc19
* | | Disabling the focused hotseat app cling if GEL is not preinstalled on the ↵Winson Chung2014-04-041-6/+18
|/ / | | | | | | | | | | device. (Bug. 13551957) Change-Id: I24b25a0eada1ac9273a57b02d80a2451d08b02b0
* | Merge "Cleanup orphaned workspace items on db upgrade" into ub-now-mister-uglyAdam Cohen2014-04-041-1/+17
|\ \
| * | Cleanup orphaned workspace items on db upgradeAdam Cohen2014-04-021-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> Any workspace item whose screen id is not present in the screens table is removed from the database. This is intended to restore database consistency. issue 13741729 Change-Id: I9a04b4165f1d85541025fcf48ddf2ad9e39ae94e
* | | Prevent exception in production when icons collide during bindAdam Cohen2014-04-031-1/+9
|/ / | | | | | | | | | | | | | | | | | | -> We only need to throw an exception for dogfooders so we can track the issue -> Worst case, an icon is ignored, does not warrant a crash. issue 12106766 Change-Id: I054a849eb3d65762dc5e1bf699c76655f687c3e8
* | Make sure the workspace screens don't get updated while workspace is loadingAdam Cohen2014-04-011-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | -> Found another path that could lead to the same issue [add shortcut with config activity to an existing folder, when config activity launches, kill launcher, configure shortcut. observe crash and data loss]. -> Plugged up above, and a couple other potential holes -> Initial fix probably took care of the main issue Issue 12523285 Change-Id: I29db9da4af4a8bf22047eb46bd49354447d04b8d
* | Merge "Increase delay before dismissing intro screen (issue 13691305)" into ↵Adam Cohen2014-03-311-1/+1
|\ \ | | | | | | | | | ub-now-mister-ugly
| * | Increase delay before dismissing intro screen (issue 13691305)Adam Cohen2014-03-281-1/+1
| | | | | | | | | | | | Change-Id: I0b81d61b922278e0e72c3055086010612687c7d9
* | | Add method to determine if first run activity has been shown (issue 13680732)Adam Cohen2014-03-281-1/+4
|/ / | | | | | | Change-Id: Ia0da4148fd0365c6ae9c3a5a4cff7118959f6382
* | Merge "Fix missing stack trace on checkItemInfoLocked call" into ↵Jason Monk2014-03-211-1/+2
|\ \ | | | | | | | | | ub-now-mister-ugly
| * | Fix missing stack trace on checkItemInfoLocked callJason Monk2014-03-201-1/+2
| |/ | | | | | | | | | | | | | | | | | | Just put this change into Launcher2, now adding to Launcher3 The call to checkItemInfoLocked from addItemToDatabase was missing a stack trace so that if the check failed, the stack trace did not contain what triggered the add. Change-Id: Ia2e2aae20b16d4adadfe1da53b49e93073fab55c
* | Merge "Adding in-activity intro screen (issue 12905636)" into ub-now-mister-uglyAdam Cohen2014-03-202-27/+114
|\ \ | |/ |/|
| * Adding in-activity intro screen (issue 12905636)Adam Cohen2014-03-202-27/+114
| | | | | | | | Change-Id: Ifb016ca6e5052fd91535b98a39f78569200955a8
* | Fix concurrent drawable usage resulting in native crashAdrian Roos2014-03-191-3/+12
| | | | | | | | | | | | | | | | One of widget preview drawables was drawn concurrently from a thread pool, causing a native Skia crash. Bug: 12525890 Change-Id: I2dea7b86ba8b32237f40feff225657dcb2b0061b
* | Clean up dead, ugly and wrong code in icon and widget preview loadingAdrian Roos2014-03-193-173/+25
|/ | | | | | | | | Removed and fixed serveral instances of dead code and small bugs that grew in the widget preloading logic, discovered while chasing a bug. Bug: 12525890 Change-Id: I22e03eccecc07b73388cfd3c8462d947601c6e54
* Merge "Add onClickPagedViewIcon to the Launcher." into ub-now-mister-uglyMohammadinamul Sheik2014-03-182-2/+12
|\
| * Add onClickPagedViewIcon to the Launcher.Mohammadinamul Sheik2014-03-182-2/+12
| | | | | | | | Change-Id: I34505ee5c9a6fe6ddd1a9f3134829fe0481e8bc0
* | Merge "Add LauncherProviderChangeListener" into ub-now-mister-uglyAnjali Koppal2014-03-173-2/+25
|\ \
| * | Add LauncherProviderChangeListenerAnjali Koppal2014-03-173-2/+25
| | | | | | | | | | | | Change-Id: I2333a157c488cd048a860982cc675ed9cec626ae
* | | Merge "Add Launcher.onDragStarted" into ub-now-mister-uglyAnjali Koppal2014-03-172-0/+3
|\ \ \
| * | | Add Launcher.onDragStartedAnjali Koppal2014-03-172-0/+3
| |/ / | | | | | | | | | Change-Id: Iac59685211905580460d0a0a16d9c7f00c61fac9
* | / Make all fields of ItemInfo public.Anjali Koppal2014-03-173-13/+13
| |/ |/| | | | | Change-Id: Iaf99aa125634a467616eedd0888a0affa08d79bd
* | Merge "also backup icon assets for shortcuts." into ub-now-mister-uglyChris Wren2014-03-131-1/+2
|\ \ | |/ |/|
| * also backup icon assets for shortcuts.Chris Wren2014-03-131-1/+2
| | | | | | | | | | Bug: 13449249 Change-Id: I8c5a9e907f668e105c2786b80f0c8e62bd5f8344
* | Add a setter/getter for Launcher.mAllAppsButton.Anjali Koppal2014-03-122-8/+13
| | | | | | | | | | | | | | | | Also, handle clicks on the all apps button by using onClick() method in Launcher instead of directly calling onClickAllAppsButton in Hotseat.java Bug 12553852 Change-Id: I261c27d3e964bbb1f52c2ab610997defd99a59bd
* | Merge "Make FolderIcon.getFolder() public and add Folder.getContent()." into ↵Anjali Koppal2014-03-132-1/+5
|\ \ | |/ |/| | | ub-now-mister-ugly
| * Make FolderIcon.getFolder() public and add Folder.getContent().Anjali Koppal2014-03-102-1/+5
| | | | | | | | Change-Id: I21ad8b8178acbde2759cd2dfcd015d91e00b7505
* | enable launcher restore by defaultChris Wren2014-03-111-1/+1
| | | | | | | | | | | | | | shortcuts are wroking, widgets are todo Bug: 10778992 Change-Id: I938b6d6ba5b68769628337955a17badaece1433f
* | Merge "update promise icon status" into ub-now-mister-uglyChris Wren2014-03-117-64/+235
|\ \ | |/ |/|
| * update promise icon statusChris Wren2014-03-117-64/+235
| | | | | | | | | | | | | | also fix a crash in LauncherModel.DEBUG_LOADERS Bug: 10778992 Change-Id: Iafc28c1e0c2f2a1283783a7ce27e181634b62993
* | Merge "Add support for uri favorites and resolve groups" into ub-now-mister-uglyJason Monk2014-03-101-29/+154
|\ \ | |/ |/|
| * Add support for uri favorites and resolve groupsJason Monk2014-03-071-29/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for new types in default_workspace xml files. Adds support to favorite that attempts to resolve an intent specified by URI. If a logical choice can be found from the resolve, it adds the shortcut. Adds support for a resolve, which contains several favorites and attempts to add the shortcuts until one is successful. Bug: 10547358 Change-Id: Ia30341e77e7d4a0bd4a4f4e6a3d9ce2a48a46237
* | am eac828e0: Merge "Don\'t lose icons when migrating from different-sized ↵Dan Sandler2014-03-072-6/+42
|\ \ | | | | | | | | | | | | | | | | | | hotseats." into ub-now-lunchbox * commit 'eac828e0fec7085d0d6b670d578eaaf36ae2e3ca': Don't lose icons when migrating from different-sized hotseats.
| * \ Merge "Don't lose icons when migrating from different-sized hotseats." into ↵Dan Sandler2014-03-072-6/+42
| |\ \ | | | | | | | | | | | | ub-now-lunchbox
| | * | Don't lose icons when migrating from different-sized hotseats.Dan Sandler2014-03-062-6/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Launcher2 on sw720dp devices had 8 hotseat slots; Launcher3 has only 6 on those same devices. When importing the old hotseat, the empty slot (so technically there were 9) occupied by the all apps button didn't line up with the new all apps button, causing a hole on the hotseat. Furthermore, the icon in old position 3 was clobbered by the new all apps icon: 0 1 2 3 (#) 4 5 6 7 ==> 0 1 2 (:) _ 4 5 In this CL we introduce a separate sort-and-place step for hotseat icons so that any icon colliding with the new all-apps slot can be moved to the right to find the next nearest open slot. This works well for the 8->6 case; it will probably do something reasonable, if not ideal, for other grid migration scenarios. But those are not covered by this bug. Bug: 13015468 Change-Id: I7edb3f27addc78ad02bbfcd1c39175ca56220007