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
a7946070dc
Fix serious data loss issue for folders and hotseat items
...
Change-Id: I37a5b44c670c2a1f99eb97b77cfdbc78534fdf91
bug 13964735
2014-04-11 01:13:46 +00:00
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
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
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
0ec0fc315d
Merge "Import translations. DO NOT MERGE" into ub-now-master
2014-04-10 15:54:08 +00:00
6a641a5699
Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
2014-04-10 15:54:06 +00:00
8790927424
Merge "Import translations. DO NOT MERGE" into ub-now-nova
2014-04-10 15:54:03 +00:00
bd45770b8a
Import translations. DO NOT MERGE
...
Change-Id: Ib7afd2524a24e257197b9e93c98edb93eea64b1a
Auto-generated-cl: translation import
2014-04-09 13:28:04 -07:00
a7b99b59c2
Import translations. DO NOT MERGE
...
Change-Id: I79cba96f30222edc7c238c69ba39c42e5796dc94
Auto-generated-cl: translation import
2014-04-09 13:27:43 -07:00
f948de55b1
Import translations. DO NOT MERGE
...
Change-Id: I89383ffb25894d0ed5b037dc496726b49af69ce7
Auto-generated-cl: translation import
2014-04-09 13:27:23 -07:00
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
8de1417ce5
am daeeb31a: am 646fdf70: Upping activity start delay
...
* commit 'daeeb31ac0932f470437aa94d65f0f972d81d2f2':
Upping activity start delay
2014-04-09 19:00:42 +00:00
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
daeeb31ac0
am 646fdf70: Upping activity start delay
...
* commit '646fdf70b45f330a02104106a65ab7a529e70c6e':
Upping activity start delay
2014-04-09 18:58:16 +00:00
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
646fdf70b4
Upping activity start delay
...
Change-Id: I4b72ae9d719825e1be8f1feb3643f9311dde2534
2014-04-08 17:02:08 -07:00
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
72cb32fdc7
am ea2c0d4c: (-s ours) am 37b49b18: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
...
* commit 'ea2c0d4c1483da719e0ae5fee51bec0994087777':
Import translations. DO NOT MERGE
2014-04-08 02:31:35 +00:00
ea2c0d4c14
am 37b49b18: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
...
* commit '37b49b18730b39677d068827377228616297116a':
Import translations. DO NOT MERGE
2014-04-08 02:24:43 +00:00
c8be8e76f2
am 56f14991: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-nova
...
* commit '56f149915447452ab4cadf8d07eb8f698cca1905':
Import translations. DO NOT MERGE
2014-04-08 02:24:08 +00:00
75493179cc
Merge "Import translations. DO NOT MERGE" into ub-now-master
2014-04-08 02:20:32 +00:00
37b49b1873
Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly
2014-04-08 02:20:30 +00:00
56f1499154
Merge "Import translations. DO NOT MERGE" into ub-now-nova
2014-04-08 02:20:28 +00:00
7309d9a227
am 38e7a6af: am c4cf34de: Merge "Fix pre sdk-18 compatibility (crash in dispatchDraw)" into ub-now-mister-ugly
...
* commit '38e7a6af269b89e9b2c40f498a93bfa9f842f610':
Fix pre sdk-18 compatibility (crash in dispatchDraw)
2014-04-07 22:39:53 +00:00
38e7a6af26
am c4cf34de: Merge "Fix pre sdk-18 compatibility (crash in dispatchDraw)" into ub-now-mister-ugly
...
* commit 'c4cf34dedb5fc21fce30924105729fa3dad6aa90':
Fix pre sdk-18 compatibility (crash in dispatchDraw)
2014-04-07 22:36:09 +00:00
c4cf34dedb
Merge "Fix pre sdk-18 compatibility (crash in dispatchDraw)" into ub-now-mister-ugly
2014-04-07 22:32:58 +00:00
2d783ce2f4
Fix pre sdk-18 compatibility (crash in dispatchDraw)
...
issue 13801679
Change-Id: I25b997179fd8eb7cdec6fc48d81533fb1c3094ce
2014-04-07 14:12:54 -07:00
26970efd23
Import translations. DO NOT MERGE
...
Change-Id: If1b27543739c08858de732abebe4911924591d03
Auto-generated-cl: translation import
2014-04-07 12:51:09 -07:00
a42534f948
Import translations. DO NOT MERGE
...
Change-Id: I1e236770eb6f0b892aa0062eee00f9cdb918d307
Auto-generated-cl: translation import
2014-04-07 12:50:46 -07:00
bf752dfb53
Import translations. DO NOT MERGE
...
Change-Id: Iae7812f4545d15af9c64542de43e67fe2b528cbe
Auto-generated-cl: translation import
2014-04-07 12:50:19 -07:00
ec0d39dd59
am 757167c2: am 59551217: Merge "Attempt to fix crash on workspace drag and drop on certain JB devices" into ub-now-mister-ugly
...
* commit '757167c27ebe82f694db853fa6bf55220e03a64e':
Attempt to fix crash on workspace drag and drop on certain JB devices
2014-04-05 03:00:41 +00:00
36f24acf89
am 45df45fc: am 69dffdb8: Disabling the focused hotseat app cling if GEL is not preinstalled on the device. (Bug. 13551957)
...
* commit '45df45fc020beb0e6cd55c17452f980e5983b740':
Disabling the focused hotseat app cling if GEL is not preinstalled on the device. (Bug. 13551957)
2014-04-05 03:00:41 +00:00
d2e69a6ad6
am f8f1ec37: am eaabe7c8: Merge "Cleanup orphaned workspace items on db upgrade" into ub-now-mister-ugly
...
* commit 'f8f1ec378ee9176e922eef5ef736e4c257a2d56a':
Cleanup orphaned workspace items on db upgrade
2014-04-05 03:00:40 +00:00
757167c27e
am 59551217: Merge "Attempt to fix crash on workspace drag and drop on certain JB devices" into ub-now-mister-ugly
...
* commit '59551217428a9cfbe11f727d0b69246a291931b5':
Attempt to fix crash on workspace drag and drop on certain JB devices
2014-04-05 02:57:37 +00:00
45df45fc02
am 69dffdb8: Disabling the focused hotseat app cling if GEL is not preinstalled on the device. (Bug. 13551957)
...
* commit '69dffdb83a614a6b02a2363e0ade510948549972':
Disabling the focused hotseat app cling if GEL is not preinstalled on the device. (Bug. 13551957)
2014-04-05 02:57:36 +00:00
f8f1ec378e
am eaabe7c8: Merge "Cleanup orphaned workspace items on db upgrade" into ub-now-mister-ugly
...
* commit 'eaabe7c89a778afdcc0c0be538bff807ea1304ae':
Cleanup orphaned workspace items on db upgrade
2014-04-05 02:57:16 +00:00
5955121742
Merge "Attempt to fix crash on workspace drag and drop on certain JB devices" into ub-now-mister-ugly
2014-04-05 00:13:46 +00:00
69dffdb83a
Disabling the focused hotseat app cling if GEL is not preinstalled on the device. (Bug. 13551957)
...
Change-Id: I24b25a0eada1ac9273a57b02d80a2451d08b02b0
2014-04-04 17:06:02 -07:00
d3a4e420f8
Attempt to fix crash on workspace drag and drop on certain JB devices
...
issue 13801679
Change-Id: I4769220ddeab566a869050b20d6064809c70bc19
2014-04-04 16:53:02 -07:00
eaabe7c89a
Merge "Cleanup orphaned workspace items on db upgrade" into ub-now-mister-ugly
2014-04-04 20:42:10 +00:00
31fdc9cf75
am 5c61d17f: am 8f006edb: Prevent exception in production when icons collide during bind
...
* commit '5c61d17f0ff67440ce9fb578043a4507b537aa0c':
Prevent exception in production when icons collide during bind
2014-04-04 01:57:48 +00:00
5c61d17f0f
am 8f006edb: Prevent exception in production when icons collide during bind
...
* commit '8f006edba228622422088a358aafee069e1d9cfb':
Prevent exception in production when icons collide during bind
2014-04-04 01:52:27 +00:00
8f006edba2
Prevent exception in production when icons collide during bind
...
-> 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
2014-04-03 18:14:30 -07:00
119285e755
Cleanup orphaned workspace items on db upgrade
...
-> 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
2014-04-02 17:04:41 -07:00
0fd2877e2f
am dc1f5c4d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-nova
...
* commit 'dc1f5c4dcb39146320a692606a7371d130afbfe7':
Import translations. DO NOT MERGE
2014-04-02 21:16:40 +00:00
dc1f5c4dcb
Merge "Import translations. DO NOT MERGE" into ub-now-nova
2014-04-02 21:11:28 +00:00
66cba496ef
am 1ca63ead: (-s ours) am cc95d18d: (-s ours) Import translations. DO NOT MERGE
...
* commit '1ca63ead10a25dca9889529f44fc4fb0139bb410':
Import translations. DO NOT MERGE
2014-04-02 20:16:07 +00:00
1ca63ead10
am cc95d18d: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cc95d18d6ddeaf247b1f43659153edb1b3f315d7':
Import translations. DO NOT MERGE
2014-04-02 20:12:21 +00:00
cda6fc3430
Import translations. DO NOT MERGE
...
Change-Id: I3c16fbad924bbc62bcb4ff0b419e7409c1d796b4
Auto-generated-cl: translation import
2014-04-02 12:34:59 -07:00
Adam Cohen
Baligh Uddin
Winson Chung