Baligh Uddin
1f50d1241f
am a703eb0f: (-s ours) am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
...
* commit 'a703eb0fdf4b722939d601f667c0d123e86b59a7':
Import translations. DO NOT MERGE
2014-09-20 04:38:36 +00:00
Baligh Uddin
9d441e140a
am 153c3ddc: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens
...
* commit '153c3ddc833d10058433c008f9933a765f0261b8':
Import translations. DO NOT MERGE
2014-09-20 04:35:20 +00:00
Baligh Uddin
a703eb0fdf
am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
...
* commit '68207e2532b2059e513a1c4e33c3c52e1ac1e559':
Import translations. DO NOT MERGE
2014-09-20 04:32:31 +00:00
Baligh Uddin
9f7b41861f
Merge "Import translations. DO NOT MERGE" into ub-now-master
2014-09-20 04:22:33 +00:00
Baligh Uddin
68207e2532
Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
2014-09-20 04:22:31 +00:00
Baligh Uddin
153c3ddc83
Merge "Import translations. DO NOT MERGE" into ub-now-queens
2014-09-20 04:22:29 +00:00
Adam Cohen
83079e43ae
When ensuring screen exists, make sure it's actually referring to a screen, not a rank
...
Bug: 17496589
Change-Id: If60e22dd71fa32530db91e37057689de5fb25646
2014-09-19 17:46:32 -07:00
Sunny Goyal
44af472006
am f2316a73: am acefecbf: Merge "Updating promise icon\'s bitmap and label when onBadgingChanged is received" into ub-now-porkchop
...
* commit 'f2316a7386e6fc0c0b5caf6e341876a26c6cddad':
Updating promise icon's bitmap and label when onBadgingChanged is received
2014-09-19 20:09:46 +00:00
Sunny Goyal
f2316a7386
am acefecbf: Merge "Updating promise icon\'s bitmap and label when onBadgingChanged is received" into ub-now-porkchop
...
* commit 'acefecbff3141b43dc55fe18146cf842d1d4a8ae':
Updating promise icon's bitmap and label when onBadgingChanged is received
2014-09-19 20:03:48 +00:00
Sunny Goyal
d7e1005c6c
am 06f4dc5d: am 7e053f87: Merge "Changing intent action for auto installs" into ub-now-porkchop
...
* commit '06f4dc5dfcaa1fd11a7be387d6b233a61a4a55fe':
Changing intent action for auto installs
2014-09-19 20:03:36 +00:00
Sunny Goyal
36332a0fb9
am cb0ec764: am 66af82cc: Merge "Adding support to delete unrestored icons and widgets" into ub-now-porkchop
...
* commit 'cb0ec764daa41302cbd2a5bac038ac33d9fc6866':
Adding support to delete unrestored icons and widgets
2014-09-19 20:03:35 +00:00
Sunny Goyal
acefecbff3
Merge "Updating promise icon's bitmap and label when onBadgingChanged is received" into ub-now-porkchop
2014-09-19 19:58:07 +00:00
Sunny Goyal
06f4dc5dfc
am 7e053f87: Merge "Changing intent action for auto installs" into ub-now-porkchop
...
* commit '7e053f8784c886359f911161db5fd8b61333450d':
Changing intent action for auto installs
2014-09-19 19:57:35 +00:00
Sunny Goyal
cb0ec764da
am 66af82cc: Merge "Adding support to delete unrestored icons and widgets" into ub-now-porkchop
...
* commit '66af82cca76b313366e5429489aed85679c2c76e':
Adding support to delete unrestored icons and widgets
2014-09-19 19:57:34 +00:00
Sunny Goyal
7e053f8784
Merge "Changing intent action for auto installs" into ub-now-porkchop
2014-09-19 19:51:42 +00:00
Sunny Goyal
66af82cca7
Merge "Adding support to delete unrestored icons and widgets" into ub-now-porkchop
2014-09-19 19:50:26 +00:00
Sunny Goyal
2233c8850d
Changing intent action for auto installs
...
Bug: 17425805
Change-Id: I12e94860206ed62d6ba04f0b5734cc55ba414e45
2014-09-19 12:23:34 -07:00
Sunny Goyal
9448536b11
Adding support to delete unrestored icons and widgets
...
Bug: 17584719
Change-Id: If8e76fc80ea885c9004c50b7b6a9353525a50105
2014-09-19 12:19:07 -07:00
Sunny Goyal
a22666f681
Updating promise icon's bitmap and label when onBadgingChanged is received
...
Bug: 17583799
Change-Id: I68b4f9d4086c43bd949ad8b46b574ec78edb32db
2014-09-19 12:16:52 -07:00
Sunny Goyal
81eca46952
am 2e9eb2a6: am 92e97dcc: Merge "Fix: First run cling shoud show \'Welcome\' when there is no migration cling" into ub-now-porkchop
...
* commit '2e9eb2a6a0995aa94248b9b230fefc92feec6b1f':
Fix: First run cling shoud show 'Welcome' when there is no migration cling
2014-09-19 18:15:58 +00:00
Sunny Goyal
2e9eb2a6a0
am 92e97dcc: Merge "Fix: First run cling shoud show \'Welcome\' when there is no migration cling" into ub-now-porkchop
...
* commit '92e97dccab3d7016e0740648e1d467e37a42f3f8':
Fix: First run cling shoud show 'Welcome' when there is no migration cling
2014-09-19 18:09:53 +00:00
Sunny Goyal
92e97dccab
Merge "Fix: First run cling shoud show 'Welcome' when there is no migration cling" into ub-now-porkchop
2014-09-19 18:02:25 +00:00
Sunny Goyal
af0628f84e
Fix: First run cling shoud show 'Welcome' when there is no migration cling
...
Bug: 17582926
Change-Id: I662e0ed9f12d237ee34a8f4540b339edee08c611
2014-09-19 10:59:35 -07:00
Adam Cohen
ebdb34f3cd
am 0d89e1d7: am ddd5aaaf: Merge "Perform null check in animation complete" into ub-now-porkchop
...
* commit '0d89e1d764216baf4e57f1dee7bbf7b3c462be97':
Perform null check in animation complete
2014-09-18 15:33:21 +00:00
Adam Cohen
0d89e1d764
am ddd5aaaf: Merge "Perform null check in animation complete" into ub-now-porkchop
...
* commit 'ddd5aaaf354beb5add6bcc2560c4f975d49a9f6a':
Perform null check in animation complete
2014-09-18 15:27:49 +00:00
Adam Cohen
ddd5aaaf35
Merge "Perform null check in animation complete" into ub-now-porkchop
2014-09-18 15:19:40 +00:00
Adam Cohen
493f6bc142
Perform null check in animation complete
...
Bug 17561235
Change-Id: I280dca9e03eed3f4e1edd97f2f8efac0b5e4b29d
2014-09-18 08:14:05 -07:00
Kenny Guy
4921cdefb8
am e4bafbb3: am c0b89b72: Merge "Update calls now we have an L API version." into ub-now-porkchop
...
* commit 'e4bafbb3ce33f6d0017de3c00d967bba48737464':
Update calls now we have an L API version.
2014-09-18 12:27:46 +00:00
Kenny Guy
f43009407d
am a7b95f2a: am 850d471b: Remove catch now api has hit googlefood.
...
* commit 'a7b95f2a39e9059b7229cf73e6a2e5b8eac98df9':
Remove catch now api has hit googlefood.
2014-09-18 12:27:46 +00:00
Kenny Guy
e4bafbb3ce
am c0b89b72: Merge "Update calls now we have an L API version." into ub-now-porkchop
...
* commit 'c0b89b72af01c6e7bf805f29fa6cc531d6388b6f':
Update calls now we have an L API version.
2014-09-18 12:22:45 +00:00
Kenny Guy
a7b95f2a39
am 850d471b: Remove catch now api has hit googlefood.
...
* commit '850d471b29f853d12cdba7104b3d8ba0159c9540':
Remove catch now api has hit googlefood.
2014-09-18 12:22:45 +00:00
Kenny Guy
c0b89b72af
Merge "Update calls now we have an L API version." into ub-now-porkchop
2014-09-18 12:16:02 +00:00
Kenny Guy
d794a3f465
Update calls now we have an L API version.
...
Bug: 17543647
Change-Id: I92c652a4ced5a5e783b24e42f9da4d9dfe1118ba
2014-09-18 13:07:49 +01:00
Kenny Guy
850d471b29
Remove catch now api has hit googlefood.
...
Bug: 17543647
Change-Id: Ie0b57719393a705e8c02b226d3e3f57dbf43d800
2014-09-18 12:58:18 +01:00
Adam Cohen
1025eeb175
am 90f9f957: am 83e5941d: Fix NPE in Workspace
...
* commit '90f9f9577322205ff6f17bdc22fea9954b1ff783':
Fix NPE in Workspace
2014-09-18 00:46:46 +00:00
Adam Cohen
90f9f95773
am 83e5941d: Fix NPE in Workspace
...
* commit '83e5941d8ef6ca33bdd6278f6089c8d6d00de942':
Fix NPE in Workspace
2014-09-18 00:40:38 +00:00
Adam Cohen
83e5941d8e
Fix NPE in Workspace
...
Bug: 17503479
Change-Id: Ib20dfd67c5a755cd4b684163bb538a1bf77fa6ca
2014-09-17 16:47:08 -07:00
Sunny Goyal
2e48757cc6
am 3fcb2c75: am 136882c1: Merge "Setting context in LauncherAppState before initialising it, as it can be called from a BroadcastReceiver" into ub-now-porkchop
...
* commit '3fcb2c75055ad423094c6bb1c980b34a3dfd5a69':
Setting context in LauncherAppState before initialising it, as it can be called from a BroadcastReceiver
2014-09-17 20:55:20 +00:00
Sunny Goyal
ae37bf662f
am 7b0982d8: am d8293fbf: Merge "Null check in flushInvalidIcons" into ub-now-porkchop
...
* commit '7b0982d819b2baf5e4061f5d64a6b7b3da459e7f':
Null check in flushInvalidIcons
2014-09-17 20:55:14 +00:00
Sunny Goyal
545f24e86d
am 4824965f: am 16fe1dfd: Merge "Updating shourcuts only when the corresponding user also matches the AppInfo" into ub-now-porkchop
...
* commit '4824965fc5b403d3ca5018f65077d953e3b80b42':
Updating shourcuts only when the corresponding user also matches the AppInfo
2014-09-17 20:55:12 +00:00
Sunny Goyal
5288159681
am bc60df98: am 72f98657: Merge "Using ApplicationContext in static objects" into ub-now-porkchop
...
* commit 'bc60df98c957523db0f9e72ce41da1262af95673':
Using ApplicationContext in static objects
2014-09-17 20:55:06 +00:00
Sunny Goyal
3fcb2c7505
am 136882c1: Merge "Setting context in LauncherAppState before initialising it, as it can be called from a BroadcastReceiver" into ub-now-porkchop
...
* commit '136882c1950da1e5f0a24a8b6807b186a3297d8e':
Setting context in LauncherAppState before initialising it, as it can be called from a BroadcastReceiver
2014-09-17 20:46:27 +00:00
Sunny Goyal
7b0982d819
am d8293fbf: Merge "Null check in flushInvalidIcons" into ub-now-porkchop
...
* commit 'd8293fbf284a8375da7473660c2ffeddfc08189e':
Null check in flushInvalidIcons
2014-09-17 20:46:27 +00:00
Sunny Goyal
4824965fc5
am 16fe1dfd: Merge "Updating shourcuts only when the corresponding user also matches the AppInfo" into ub-now-porkchop
...
* commit '16fe1dfd30ee44be2c7c7f67b680afce875a3c3d':
Updating shourcuts only when the corresponding user also matches the AppInfo
2014-09-17 20:46:26 +00:00
Sunny Goyal
bc60df98c9
am 72f98657: Merge "Using ApplicationContext in static objects" into ub-now-porkchop
...
* commit '72f9865780d42ab685bc05daa6e8d7cd4e8a4cb9':
Using ApplicationContext in static objects
2014-09-17 20:46:26 +00:00
Sunny Goyal
136882c195
Merge "Setting context in LauncherAppState before initialising it, as it can be called from a BroadcastReceiver" into ub-now-porkchop
2014-09-17 20:07:10 +00:00
Sunny Goyal
d8293fbf28
Merge "Null check in flushInvalidIcons" into ub-now-porkchop
2014-09-17 19:43:14 +00:00
Sunny Goyal
16fe1dfd30
Merge "Updating shourcuts only when the corresponding user also matches the AppInfo" into ub-now-porkchop
2014-09-17 19:30:55 +00:00
Sunny Goyal
72f9865780
Merge "Using ApplicationContext in static objects" into ub-now-porkchop
2014-09-17 19:30:36 +00:00
Dharmesh Mokani
c23b8b7e95
am ae5c0ad2: am cc4e84ee: Merge "Remove STOPSHIPs from GSA 4.0" into ub-now-porkchop
...
* commit 'ae5c0ad20c6e3cf1c71ad706b4f0800292867c21':
Remove STOPSHIPs from GSA 4.0
2014-09-17 14:02:43 +00:00