Commit Graph

78507 Commits

Author SHA1 Message Date
Adam Cohen f9c14de995 Second try removing orphaned items from the database
-> 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
2014-04-22 16:11:40 -07:00
Jeff Sharkey 5c24bc6d1a am 27b4e0f7: am 5aeef581: Add support for partner customization.
* commit '27b4e0f7d6f6f2bfacc4e2fcc66472540122939d':
  Add support for partner customization.
2014-04-22 21:04:56 +00:00
Jeff Sharkey 27b4e0f7d6 am 5aeef581: Add support for partner customization.
* commit '5aeef58131e1c330d1d9c1dfcacf2e6eea6ced4b':
  Add support for partner customization.
2014-04-22 21:02:11 +00:00
Sameer Padala a3211b9185 am be3e410b: Fix source code so it compiles on google3
* commit 'be3e410b7a62fa64ffda825b824862eb9d0c98c5':
  Fix source code so it compiles on google3
2014-04-22 20:50:57 +00:00
Jeff Sharkey 5aeef58131 Add support for partner customization.
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
2014-04-22 12:28:51 -07:00
Adam Cohen 7082b508c7 am a8171169: am 76ac344c: Merge "Allow the old launcher content URI to be overrided" into ub-now-mister-ugly
* commit 'a8171169ff18efc9e0bf5b865dbd35cee06d3fae':
  Allow the old launcher content URI to be overrided
2014-04-22 14:35:32 +00:00
Jason Monk a0a7a7440e Add synchronization to DeferredBindRunnables
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
2014-04-22 10:33:33 -04:00
Jason Monk 02dd7aea3d Fix long press after already moving off icon
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
2014-04-22 10:27:01 -04:00
Sameer Padala be3e410b7a Fix source code so it compiles on google3
This is a follow up to cr/65191596 which checked for String + array warnings.

Change-Id: Id70eaa32b63b838b03be21d632c7470039b6423f
2014-04-21 19:37:17 -07:00
Adam Cohen a8171169ff am 76ac344c: Merge "Allow the old launcher content URI to be overrided" into ub-now-mister-ugly
* commit '76ac344cb61a74267c04249c9e9feec41a82c504':
  Allow the old launcher content URI to be overrided
2014-04-18 21:32:23 +00:00
Adam Cohen 76ac344cb6 Merge "Allow the old launcher content URI to be overrided" into ub-now-mister-ugly 2014-04-17 00:53:52 +00:00
Chris Wren 8f97daa93e am 04b0d036: (-s ours) am d83ebf92: (-s ours) DO NOT MERGE disable launcher restore for 3.4 launch.
* commit '04b0d0368892f226337adae6e82677cb2b6c64ee':
  DO NOT MERGE disable launcher restore for 3.4 launch.
2014-04-16 18:51:45 +00:00
Chris Wren 04b0d03688 am d83ebf92: (-s ours) DO NOT MERGE disable launcher restore for 3.4 launch.
* commit 'd83ebf9270e90d9306ad4eaf6837dea91ca3b172':
  DO NOT MERGE disable launcher restore for 3.4 launch.
2014-04-16 18:48:25 +00:00
Chris Wren d83ebf9270 DO NOT MERGE disable launcher restore for 3.4 launch.
Change-Id: I8e439df25cad2cb9cf92cf1faef22906420e22cb
2014-04-16 14:10:10 -04:00
Chris Wren ec46e503b0 am b358f813: additional debug logs to track welcome back behavior.
* commit 'b358f813c93ac0d6c4f31058947efd16b188cd1e':
  additional debug logs to track welcome back behavior.
2014-04-16 17:45:09 +00:00
Chris Wren b358f813c9 additional debug logs to track welcome back behavior.
Bug: 13568891
Change-Id: I359202ce59b3444e46331485ea22f542ae908e36
2014-04-16 13:37:00 -04:00
Mathew Inwood b7851b5c46 am ad9c776b: am 85900298: Take account of bounds set on drag drawables.
* commit 'ad9c776bc1cae8af3db2bdf895a2f65ca9837d96':
  Take account of bounds set on drag drawables.
2014-04-16 16:31:48 +00:00
Mathew Inwood ad9c776bc1 am 85900298: Take account of bounds set on drag drawables.
* commit '859002985e0e5d73f54c942f2024607431db60fc':
  Take account of bounds set on drag drawables.
2014-04-16 16:30:01 +00:00
Mathew Inwood 859002985e Take account of bounds set on drag drawables.
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
2014-04-16 14:17:39 +01:00
Adrian Roos beb1cf7408 am 65d60e21: Fix skia crash in widget preview loading
* commit '65d60e21ec22e3bf03ba39f7a0be24df2cc914a2':
  Fix skia crash in widget preview loading
2014-04-16 12:29:29 +00:00
Adrian Roos 65d60e21ec Fix skia crash in widget preview loading
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
2014-04-16 14:16:14 +02:00
Chris Wren 466d1c9647 am b6ecd781: am 1a1fdf41: turn off LauncherAppState.DEBUG
* commit 'b6ecd7815970fd2080b1856259d25f6a0ab7f48f':
  turn off LauncherAppState.DEBUG
2014-04-15 19:10:11 +00:00
Chris Wren b6ecd78159 am 1a1fdf41: turn off LauncherAppState.DEBUG
* commit '1a1fdf4185637610b37953e901605c55ef8ba0a6':
  turn off LauncherAppState.DEBUG
2014-04-15 19:08:45 +00:00
Chris Wren 1a1fdf4185 turn off LauncherAppState.DEBUG
Change-Id: Ia6d54235c353c27c8716d7fd9270a7f2ee7bc93f
2014-04-15 13:57:15 -04:00
Winson Chung cbdca25c07 am f2a791a7: am babb53ef: Adding external path for drag/drops.
* commit 'f2a791a798ce24d81f3410c83873087690db4ffd':
  Adding external path for drag/drops.
2014-04-15 10:51:39 +00:00
Winson Chung f2a791a798 am babb53ef: Adding external path for drag/drops.
* commit 'babb53ef8fd0fcba32fcc8fc213663f0f27b8f5e':
  Adding external path for drag/drops.
2014-04-15 10:50:19 +00:00
Winson Chung babb53ef8f Adding external path for drag/drops.
Change-Id: I3b315c4d14cadb9210f15d3c3e0b9545f4591be4
2014-04-14 18:44:21 -07:00
Mathew Inwood 4210ce7016 am 72f0eab8: am b90860a9: Expose workspace.moveToDefaultScreen.
* commit '72f0eab89d36610e736dc63979b570da55c19337':
  Expose workspace.moveToDefaultScreen.
2014-04-14 16:17:36 +00:00
Mathew Inwood 72f0eab89d am b90860a9: Expose workspace.moveToDefaultScreen.
* commit 'b90860a99630bbd24f90cc205d8990187b0ed12e':
  Expose workspace.moveToDefaultScreen.
2014-04-14 16:15:19 +00:00
Mathew Inwood b90860a996 Expose workspace.moveToDefaultScreen.
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
2014-04-11 17:22:56 +01:00
Adam Cohen d0343b8a1c am d08da56f: am 8ac896b8: Merge "Fix serious data loss issue for folders and hotseat items" into ub-now-mister-ugly
* commit 'd08da56f0a4b56d16836fb85c2764e57ecdfcc20':
  Fix serious data loss issue for folders and hotseat items
2014-04-11 01:20:43 +00:00
Adam Cohen d08da56f0a am 8ac896b8: Merge "Fix serious data loss issue for folders and hotseat items" into ub-now-mister-ugly
* commit '8ac896b8c84066c109c2c4b97805f36270636121':
  Fix serious data loss issue for folders and hotseat items
2014-04-11 01:18:25 +00:00
Adam Cohen 8ac896b8c8 Merge "Fix serious data loss issue for folders and hotseat items" into ub-now-mister-ugly 2014-04-11 01:14:56 +00:00
Adam Cohen a7946070dc Fix serious data loss issue for folders and hotseat items
Change-Id: I37a5b44c670c2a1f99eb97b77cfdbc78534fdf91

bug 13964735
2014-04-11 01:13:46 +00:00
Baligh Uddin 1a614dafcb am 4b4c835b: (-s ours) am 6a641a56: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
* commit '4b4c835bd9c5d9a815f09c1fb8068f57e47f4c85':
  Import translations. DO NOT MERGE
2014-04-10 16:01:38 +00:00
Baligh Uddin 4b4c835bd9 am 6a641a56: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
* commit '6a641a569987f5edd725cb2dea6a992751cfbfbe':
  Import translations. DO NOT MERGE
2014-04-10 15:58:27 +00:00
Baligh Uddin 27eebc0f46 am 87909274: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-nova
* commit '8790927424ce0b1e76f15843a3980c14b4a55073':
  Import translations. DO NOT MERGE
2014-04-10 15:58:04 +00:00
Baligh Uddin 0ec0fc315d Merge "Import translations. DO NOT MERGE" into ub-now-master 2014-04-10 15:54:08 +00:00
Baligh Uddin 6a641a5699 Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly 2014-04-10 15:54:06 +00:00
Baligh Uddin 8790927424 Merge "Import translations. DO NOT MERGE" into ub-now-nova 2014-04-10 15:54:03 +00:00
Baligh Uddin bd45770b8a Import translations. DO NOT MERGE
Change-Id: Ib7afd2524a24e257197b9e93c98edb93eea64b1a
Auto-generated-cl: translation import
2014-04-09 13:28:04 -07:00
Baligh Uddin a7b99b59c2 Import translations. DO NOT MERGE
Change-Id: I79cba96f30222edc7c238c69ba39c42e5796dc94
Auto-generated-cl: translation import
2014-04-09 13:27:43 -07:00
Baligh Uddin f948de55b1 Import translations. DO NOT MERGE
Change-Id: I89383ffb25894d0ed5b037dc496726b49af69ce7
Auto-generated-cl: translation import
2014-04-09 13:27:23 -07:00
Adam Cohen ea8e507c85 am 134cb7da: am f6a47bbc: Merge "Ensure the intro view is always the top view in the draglayer if it is present" into ub-now-mister-ugly
* commit '134cb7daca37731a3361e7876af892070b6fde26':
  Ensure the intro view is always the top view in the draglayer if it is present
2014-04-09 19:00:43 +00:00
Adam Cohen 8de1417ce5 am daeeb31a: am 646fdf70: Upping activity start delay
* commit 'daeeb31ac0932f470437aa94d65f0f972d81d2f2':
  Upping activity start delay
2014-04-09 19:00:42 +00:00
Adam Cohen 134cb7daca am f6a47bbc: Merge "Ensure the intro view is always the top view in the 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
2014-04-09 18:58:16 +00:00
Adam Cohen daeeb31ac0 am 646fdf70: Upping activity start delay
* commit '646fdf70b45f330a02104106a65ab7a529e70c6e':
  Upping activity start delay
2014-04-09 18:58:16 +00:00
Adam Cohen f6a47bbc05 Merge "Ensure the intro view is always the top view in the draglayer if it is present" into ub-now-mister-ugly 2014-04-09 17:37:26 +00:00
Adam Cohen 646fdf70b4 Upping activity start delay
Change-Id: I4b72ae9d719825e1be8f1feb3643f9311dde2534
2014-04-08 17:02:08 -07:00
Adam Cohen b670f195ff Ensure the intro view is always the top view in the draglayer if it is present
-> 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
2014-04-08 16:56:09 -07:00