Geoff Mendal
c80da28385
am ec791c3e: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ec791c3e1663f7066de5637ffb8bc1ad163de969':
Import translations. DO NOT MERGE
2015-07-01 13:33:25 +00:00
Geoff Mendal
7898febe04
Import translations. DO NOT MERGE
...
Change-Id: Ifb3567f7d719dc0cf6d9b48890808f7281cf7942
Auto-generated-cl: translation import
2015-07-01 06:25:23 -07:00
Geoff Mendal
ec791c3e16
Import translations. DO NOT MERGE
...
Change-Id: I7be33e4f70f0dc9de6452e6b512310e069d5342f
Auto-generated-cl: translation import
2015-07-01 06:24:57 -07:00
Sunny Goyal
c08c350193
am e8e81563: (-s ours) am 5aa2fe13: (-s ours) [DO NOT MERGE] Build fix.
...
* commit 'e8e81563305b2ef2b8082dfc4b28d22b50c76eb4':
[DO NOT MERGE] Build fix.
2015-06-29 17:52:54 +00:00
Sunny Goyal
3e9731388e
am 7a3235c5: (-s ours) am c767689b: (-s ours) Merge "[DO NOT MERGE] Removing junit.framework.Assert from wallpaper picker code" into ub-launcher3-almonte
...
* commit '7a3235c598fa46fbc540746648f129f6ef8dc647':
[DO NOT MERGE] Removing junit.framework.Assert from wallpaper picker code
2015-06-29 17:52:53 +00:00
Sunny Goyal
aa3fd71a1f
am c738e4f0: (-s ours) am 42ea0db8: (-s ours) [DO NOT MERGE] Adding constants already available in burnaby
...
* commit 'c738e4f02662055c8f7ccca0212144af29360de9':
[DO NOT MERGE] Adding constants already available in burnaby
2015-06-29 17:52:52 +00:00
Dave Hawkey
ce9ba82246
am cb5f6197: am 79f25bed: Merge "Add LauncherCallbacks for requesting permissions on MNC" into ub-launcher3-almonte
...
* commit 'cb5f619770df68e6cd323c85602bb64c4acea8cc':
Add LauncherCallbacks for requesting permissions on MNC
2015-06-29 17:52:51 +00:00
Sunny Goyal
fd14d87861
am 7162944c: (-s ours) am bb87053e: (-s ours) [DO NOT MERGE] Making some constants public
...
* commit '7162944c155778c64d6179a83c23cf9a5653a14b':
[DO NOT MERGE] Making some constants public
2015-06-29 17:52:50 +00:00
Winson Chung
37cbee8291
am 5ddd9836: am 21a4ccc6: (-s ours) Merge "Add extras required for compilation" into ub-launcher3-almonte
...
* commit '5ddd98364b8a66912ce75207cae11c648e828bc0':
Add extras required for compilation
2015-06-29 17:52:49 +00:00
Sunny Goyal
e8e8156330
am 5aa2fe13: (-s ours) [DO NOT MERGE] Build fix.
...
* commit '5aa2fe13b5c5f7d34f653e70943b45e0231c5d09':
[DO NOT MERGE] Build fix.
2015-06-29 17:41:17 +00:00
Sunny Goyal
7a3235c598
am c767689b: (-s ours) Merge "[DO NOT MERGE] Removing junit.framework.Assert from wallpaper picker code" into ub-launcher3-almonte
...
* commit 'c767689be7ace9a282ca895e79c1a5c82f5cf5a9':
[DO NOT MERGE] Removing junit.framework.Assert from wallpaper picker code
2015-06-29 17:41:16 +00:00
Sunny Goyal
c738e4f026
am 42ea0db8: (-s ours) [DO NOT MERGE] Adding constants already available in burnaby
...
* commit '42ea0db8892020cc07046979892460bad55d2b45':
[DO NOT MERGE] Adding constants already available in burnaby
2015-06-29 17:41:15 +00:00
Dave Hawkey
cb5f619770
am 79f25bed: Merge "Add LauncherCallbacks for requesting permissions on MNC" into ub-launcher3-almonte
...
* commit '79f25bedd2ed13613323b085b46b9b42aee21696':
Add LauncherCallbacks for requesting permissions on MNC
2015-06-29 17:41:14 +00:00
Sunny Goyal
7162944c15
am bb87053e: (-s ours) [DO NOT MERGE] Making some constants public
...
* commit 'bb87053ef98014fb4693aa4ff7e9d44ca30f7b9a':
[DO NOT MERGE] Making some constants public
2015-06-29 17:41:13 +00:00
Winson Chung
5ddd98364b
am 21a4ccc6: (-s ours) Merge "Add extras required for compilation" into ub-launcher3-almonte
...
* commit '21a4ccc6275a6a3328fc4951f6942b43b0a7726b':
Add extras required for compilation
2015-06-29 17:41:12 +00:00
Geoff Mendal
67b39c2281
am ee1fa395: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ee1fa39520d6a7d5326f26b90140ebaf24ce7923':
Import translations. DO NOT MERGE
2015-06-29 12:26:36 +00:00
Geoff Mendal
1faeb11bad
Import translations. DO NOT MERGE
...
Change-Id: I7cf48bfb2f615fdc593b5a102326611616f2064b
Auto-generated-cl: translation import
2015-06-29 05:14:07 -07:00
Geoff Mendal
ee1fa39520
Import translations. DO NOT MERGE
...
Change-Id: I104e6a1c5710ee96b63a86e7f9d1d23e2ca0d05b
Auto-generated-cl: translation import
2015-06-29 05:13:40 -07:00
Sunny Goyal
18a676deb3
am 2b642450: Merge "Allowing UserHandle to be passed in the intent when creating AppInfo" into ub-launcher3-burnaby
...
* commit '2b642450163a6f2d33b85115e5f455ae812dedf2':
Allowing UserHandle to be passed in the intent when creating AppInfo
2015-06-26 23:46:12 +00:00
Sunny Goyal
2b64245016
Merge "Allowing UserHandle to be passed in the intent when creating AppInfo" into ub-launcher3-burnaby
2015-06-26 23:37:50 +00:00
Sunny Goyal
5aa2fe13b5
[DO NOT MERGE] Build fix.
...
Change-Id: I625b92d6e4e19aa903e1e1e483c4330e2b631ce3
2015-06-26 15:52:54 -07:00
Sunny Goyal
c767689be7
Merge "[DO NOT MERGE] Removing junit.framework.Assert from wallpaper picker code" into ub-launcher3-almonte
2015-06-26 22:43:01 +00:00
Sunny Goyal
42ea0db889
[DO NOT MERGE] Adding constants already available in burnaby
...
Change-Id: I653fe653c4a7ee3644d17f45f3df34e3621aaee8
2015-06-26 15:35:27 -07:00
Sunny Goyal
1a4b1eacd6
[DO NOT MERGE] Removing junit.framework.Assert from wallpaper picker code
...
Bug: 22124692
Change-Id: Ifd41727a2ce4af660818b4f0cd6b95110ffdeec4
2015-06-26 15:34:39 -07:00
Sunny Goyal
0495d0dc54
am 320a27b5: Removing junit.framework.Assert from wallpaper picker code
...
* commit '320a27b539b7d4ff5b4f1329644d20e550eb55dd':
Removing junit.framework.Assert from wallpaper picker code
2015-06-26 21:18:11 +00:00
Sunny Goyal
9b49569a15
am 11d49117: Removing junit.framework.Assert
...
* commit '11d491173206313a65801961e02425c0526e891e':
Removing junit.framework.Assert
2015-06-26 21:18:10 +00:00
Sunny Goyal
320a27b539
Removing junit.framework.Assert from wallpaper picker code
...
Bug: 22124692
Change-Id: Ifd41727a2ce4af660818b4f0cd6b95110ffdeec4
2015-06-26 14:10:44 -07:00
Sunny Goyal
11d4911732
Removing junit.framework.Assert
...
Bug: 22124692
Change-Id: Ie9c920ec6ef9631392a70b9ab2a5659ba23385b3
2015-06-26 21:04:55 +00:00
Sunny Goyal
a1d1bf3119
Allowing UserHandle to be passed in the intent when creating AppInfo
...
> Removing createShortcut with userHandle, as shortcuts can only be
for the primary user.
Bug: 22070517
Change-Id: Ifc58a76d0f1e0ab8f1943b46588cc19dd88bdda1
2015-06-26 13:51:11 -07:00
Dave Hawkey
79f25bedd2
Merge "Add LauncherCallbacks for requesting permissions on MNC" into ub-launcher3-almonte
2015-06-26 16:48:32 +00:00
Dave Hawkey
3a43ed61cb
Add LauncherCallbacks for requesting permissions on MNC
...
Change-Id: Ia8f704590e03e16db04c2f7acee1e79ce7334749
2015-06-26 10:27:47 -06:00
Sunny Goyal
bb87053ef9
[DO NOT MERGE] Making some constants public
...
Change-Id: I95665184b100ab83b2171718d82fcc1e31c2fae1
2015-06-26 09:07:39 -07:00
Hyunyoung Song
75739996c9
am 1a8a6e0b: Merge "Announce content desc of workspace immediately after unlocking the lock screen. b/22051420" into ub-launcher3-burnaby
...
* commit '1a8a6e0baabf636f9b429280cba536450d594089':
Announce content desc of workspace immediately after unlocking the lock screen. b/22051420
2015-06-26 04:16:40 +00:00
Hyunyoung Song
1a8a6e0baa
Merge "Announce content desc of workspace immediately after unlocking the lock screen. b/22051420" into ub-launcher3-burnaby
2015-06-26 04:08:14 +00:00
Hyunyoung Song
166e6488e6
Announce content desc of workspace immediately after unlocking the lock screen.
...
b/22051420
Change-Id: I41ab93782383c04e0074d87632ebe8d884a8e208
2015-06-25 21:06:07 -07:00
Sunny Goyal
20dbc6925b
am 187f9665: Merge "Fixing backup restore" into ub-launcher3-burnaby
...
* commit '187f9665f69745518ebc65327bd662cab3f90cb8':
Fixing backup restore
2015-06-26 01:37:06 +00:00
Sunny Goyal
e8af73a776
am 72db10a9: Moving LauncherExtension to a separate package
...
* commit '72db10a93c41fd3c53fdfefad52bad11d9728597':
Moving LauncherExtension to a separate package
2015-06-26 01:37:05 +00:00
Sunny Goyal
187f9665f6
Merge "Fixing backup restore" into ub-launcher3-burnaby
2015-06-26 01:34:45 +00:00
Sunny Goyal
72db10a93c
Moving LauncherExtension to a separate package
...
Change-Id: I6eef1cbb17295e59eae04f90fa44037be5f7da4b
2015-06-25 18:21:41 -07:00
Sunny Goyal
4428003599
am b41b8369: Merge "Enabling translation for preference string" into ub-launcher3-burnaby
...
* commit 'b41b8369687025fe8d661eae8928cbbd9733da21':
Enabling translation for preference string
2015-06-26 00:42:07 +00:00
Sunny Goyal
4e5cc64eaf
Fixing backup restore
...
> Not deleting icons from cache, which have not been restored yet
> Not checking if activity exists during DB migration. Missing
components are removed during loader anyway
> Backing up and restoring bitmaps even when iconType is resource.
This allows us to show a proper bitmap icon, until the correct
resource is available.
> Loading proper shortcutResource icon for promiseIcons
> Checking against promise intent when verifying duplicates
> A launcher App intent can contain EXTRA_PROFILE
Bug: 22094970
Change-Id: I982971338846733833ec133119393af0bea0eb08
2015-06-25 17:41:06 -07:00
Sunny Goyal
b41b836968
Merge "Enabling translation for preference string" into ub-launcher3-burnaby
2015-06-26 00:35:53 +00:00
Sunny Goyal
b6e358f2f2
Enabling translation for preference string
...
> Removing description string
Bug: 22065032
Change-Id: I8acb51b113066924f028b4dd891b508027e7cb6a
2015-06-25 17:35:14 -07:00
Winson Chung
7cfa902dd4
am 1cddad6c: Fixing issue with casting context to activity.
...
* commit '1cddad6c6bff0b271e8ebde44013a5a09f273436':
Fixing issue with casting context to activity.
2015-06-26 00:17:40 +00:00
Winson Chung
1cddad6c6b
Fixing issue with casting context to activity.
2015-06-26 00:08:34 +00:00
Winson Chung
26619c630b
am ca0f7d77: Merge "Exposing drag methods with user info." into ub-launcher3-burnaby
...
* commit 'ca0f7d7728c76c3fb1f657c09d9e9fac9b1c2066':
Exposing drag methods with user info.
2015-06-25 20:26:36 +00:00
Winson Chung
ca0f7d7728
Merge "Exposing drag methods with user info." into ub-launcher3-burnaby
2015-06-25 20:19:49 +00:00
Winson Chung
5ffd51db0c
Exposing drag methods with user info.
...
Change-Id: I974b67d23d3d29795c1c1d24e1ecf212b52e3912
2015-06-25 13:14:14 -07:00
Winson Chung
ea02a2a4f2
am 91c05954: Ensuring that we always update the predicted apps set.
...
* commit '91c05954435b10f52dfff1bc9025c4ea8ba4652b':
Ensuring that we always update the predicted apps set.
2015-06-25 19:40:55 +00:00
Winson Chung
91c0595443
Ensuring that we always update the predicted apps set.
...
Change-Id: Ieecf019442dcf4af42463ed6cbc4cdcd19468dec
2015-06-25 19:24:24 +00:00