summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEGeoff Mendal2015-07-0675-76/+76
| | | | | Change-Id: I7e48169b1393f02ef4a152b8052f5243f3363f3a Auto-generated-cl: translation import
* Merge "Using RGB_565 for low-res icons" into ub-launcher3-burnabySunny Goyal2015-07-024-31/+70
|\
| * Using RGB_565 for low-res iconsSunny Goyal2015-07-014-31/+70
| | | | | | | | | | | | | | | | | | > Using a non-transparent image with flat background for low-res icons > Changing the scale factor from 8 to 5 > The overall size change is 1/50 instead of 1/64 Bug: 22204941 Change-Id: I6cda4b4b3450c23a7bb8218ebd2de2b09af9c414
* | am 1d8f4ad5: Revert "Add "option javanano_use_deprecated_package = true;\n" ↵Sunny Goyal2015-07-021-1/+0
|\ \ | | | | | | | | | | | | | | | | | | to protos compiled with the nano proto compiler that are referenced in Java files." * commit '1d8f4ad59dbb17d80c6b910be8ad85904cb08d68': Revert "Add "option javanano_use_deprecated_package = true;\n" to protos compiled with the nano proto compiler that are referenced in Java files."
| * | Revert "Add "option javanano_use_deprecated_package = true;\n" to protos ↵Sunny Goyal2015-07-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | compiled with the nano proto compiler that are referenced in Java files." This reverts commit 469fea0b390e893c1eb8115ff6c5f997916be4c1. Change-Id: I2977f49a9836fd08038028c6cd8d3eed73185dde
* | | am 469fea0b: Add "option javanano_use_deprecated_package = true;\n" to ↵Sunny Goyal2015-07-021-0/+1
|\| | | | | | | | | | | | | | | | | | | | protos compiled with the nano proto compiler that are referenced in Java files. * commit '469fea0b390e893c1eb8115ff6c5f997916be4c1': Add "option javanano_use_deprecated_package = true;\n" to protos compiled with the nano proto compiler that are referenced in Java files.
| * | Add "option javanano_use_deprecated_package = true;\n" to protos compiled ↵Sunny Goyal2015-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | with the nano proto compiler that are referenced in Java files. Bug: 21273801 Change-Id: I6d9986f5f93980d8a3400e488609a28082fc2cdb
* | | Updating the pick-image tile in wallpaper pickerSunny Goyal2015-07-016-1/+1
| |/ |/| | | | | | | | | | | | | > Changing the label to My photos > Changing the icon to photo-library icon Bug: 22019397 Change-Id: I068d8d5fa11392642bb0a84cb466d8f679e49b54
* | am 922eed57: (-s ours) Removing unused loggingSunny Goyal2015-07-010-0/+0
|\| | | | | | | | | * commit '922eed5762f3253183726a5acb0edcd9a3f38fc4': Removing unused logging
| * Removing unused loggingSunny Goyal2015-06-302-145/+6
| | | | | | | | | | | | | | | | > We store some local logs which are never propagated to the server and cause unnecessary file-io during app launch Change-Id: I2b41c3af182de2a87f38ad88f3bae9d250574c26 Bug: 19940630
* | Import translations. DO NOT MERGEGeoff Mendal2015-07-0125-50/+25
| | | | | | | | | | Change-Id: I7be33e4f70f0dc9de6452e6b512310e069d5342f Auto-generated-cl: translation import
* | am 5aa2fe13: (-s ours) [DO NOT MERGE] Build fix.Sunny Goyal2015-06-290-0/+0
|\| | | | | | | | | * commit '5aa2fe13b5c5f7d34f653e70943b45e0231c5d09': [DO NOT MERGE] Build fix.
| * [DO NOT MERGE] Build fix.Sunny Goyal2015-06-261-1/+1
| | | | | | | | Change-Id: I625b92d6e4e19aa903e1e1e483c4330e2b631ce3
* | am c767689b: (-s ours) Merge "[DO NOT MERGE] Removing junit.framework.Assert ↵Sunny Goyal2015-06-290-0/+0
|\| | | | | | | | | | | | | from wallpaper picker code" into ub-launcher3-almonte * commit 'c767689be7ace9a282ca895e79c1a5c82f5cf5a9': [DO NOT MERGE] Removing junit.framework.Assert from wallpaper picker code
| * Merge "[DO NOT MERGE] Removing junit.framework.Assert from wallpaper picker ↵Sunny Goyal2015-06-263-7/+7
| |\ | | | | | | | | | code" into ub-launcher3-almonte
| | * [DO NOT MERGE] Removing junit.framework.Assert from wallpaper picker codeSunny Goyal2015-06-263-7/+7
| | | | | | | | | | | | | | | Bug: 22124692 Change-Id: Ifd41727a2ce4af660818b4f0cd6b95110ffdeec4
* | | am 42ea0db8: (-s ours) [DO NOT MERGE] Adding constants already available in ↵Sunny Goyal2015-06-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | burnaby * commit '42ea0db8892020cc07046979892460bad55d2b45': [DO NOT MERGE] Adding constants already available in burnaby
| * | [DO NOT MERGE] Adding constants already available in burnabySunny Goyal2015-06-261-0/+3
| |/ | | | | | | Change-Id: I653fe653c4a7ee3644d17f45f3df34e3621aaee8
* | am 79f25bed: Merge "Add LauncherCallbacks for requesting permissions on MNC" ↵Dave Hawkey2015-06-293-0/+16
|\| | | | | | | | | | | | | into ub-launcher3-almonte * commit '79f25bedd2ed13613323b085b46b9b42aee21696': Add LauncherCallbacks for requesting permissions on MNC
| * Merge "Add LauncherCallbacks for requesting permissions on MNC" into ↵Dave Hawkey2015-06-263-0/+16
| |\ | | | | | | | | | ub-launcher3-almonte
| | * Add LauncherCallbacks for requesting permissions on MNCDave Hawkey2015-06-263-0/+16
| | | | | | | | | | | | Change-Id: Ia8f704590e03e16db04c2f7acee1e79ce7334749
* | | am bb87053e: (-s ours) [DO NOT MERGE] Making some constants publicSunny Goyal2015-06-290-0/+0
|\| | | | | | | | | | | | | | * commit 'bb87053ef98014fb4693aa4ff7e9d44ca30f7b9a': [DO NOT MERGE] Making some constants public
| * | [DO NOT MERGE] Making some constants publicSunny Goyal2015-06-261-43/+43
| |/ | | | | | | Change-Id: I95665184b100ab83b2171718d82fcc1e31c2fae1
* | am 21a4ccc6: (-s ours) Merge "Add extras required for compilation" into ↵Winson Chung2015-06-290-0/+0
|\| | | | | | | | | | | | | ub-launcher3-almonte * commit '21a4ccc6275a6a3328fc4951f6942b43b0a7726b': Add extras required for compilation
| * Merge "Add extras required for compilation" into ub-launcher3-almonteWinson Chung2015-06-191-0/+16
| |\
| | * Add extras required for compilationAdam Cohen2015-06-191-0/+16
| | | | | | | | | | | | | | | | | | -> Patching back from a future branch Change-Id: I5127a82560e39bf391fe083d0eb8932cf2473562
* | | Import translations. DO NOT MERGEGeoff Mendal2015-06-2973-0/+98
| | | | | | | | | | | | | | | Change-Id: I104e6a1c5710ee96b63a86e7f9d1d23e2ca0d05b Auto-generated-cl: translation import
* | | Merge "Allowing UserHandle to be passed in the intent when creating AppInfo" ↵Sunny Goyal2015-06-261-21/+14
|\ \ \ | | | | | | | | | | | | into ub-launcher3-burnaby
| * | | Allowing UserHandle to be passed in the intent when creating AppInfoSunny Goyal2015-06-261-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Removing createShortcut with userHandle, as shortcuts can only be for the primary user. Bug: 22070517 Change-Id: Ifc58a76d0f1e0ab8f1943b46588cc19dd88bdda1
* | | | Removing junit.framework.Assert from wallpaper picker codeSunny Goyal2015-06-263-8/+7
| | | | | | | | | | | | | | | | | | | | Bug: 22124692 Change-Id: Ifd41727a2ce4af660818b4f0cd6b95110ffdeec4
* | | | Removing junit.framework.AssertSunny Goyal2015-06-261-4/+3
|/ / / | | | | | | | | | | | | Bug: 22124692 Change-Id: Ie9c920ec6ef9631392a70b9ab2a5659ba23385b3
* | | Merge "Announce content desc of workspace immediately after unlocking the ↵Hyunyoung Song2015-06-261-0/+2
|\ \ \ | | | | | | | | | | | | lock screen. b/22051420" into ub-launcher3-burnaby
| * | | Announce content desc of workspace immediately after unlocking the lock screen.Hyunyoung Song2015-06-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | b/22051420 Change-Id: I41ab93782383c04e0074d87632ebe8d884a8e208
* | | | Merge "Fixing backup restore" into ub-launcher3-burnabySunny Goyal2015-06-268-98/+178
|\ \ \ \
| * | | | Fixing backup restoreSunny Goyal2015-06-258-98/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > 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
* | | | | Moving LauncherExtension to a separate packageSunny Goyal2015-06-252-3/+13
|/ / / / | | | | | | | | | | | | Change-Id: I6eef1cbb17295e59eae04f90fa44037be5f7da4b
* | | | Merge "Enabling translation for preference string" into ub-launcher3-burnabySunny Goyal2015-06-262-4/+1
|\ \ \ \
| * | | | Enabling translation for preference stringSunny Goyal2015-06-252-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Removing description string Bug: 22065032 Change-Id: I8acb51b113066924f028b4dd891b508027e7cb6a
* | | | | Fixing issue with casting context to activity.Winson Chung2015-06-262-9/+2
| | | | |
* | | | | Merge "Exposing drag methods with user info." into ub-launcher3-burnabyWinson Chung2015-06-251-9/+30
|\ \ \ \ \
| * | | | | Exposing drag methods with user info.Winson Chung2015-06-251-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I974b67d23d3d29795c1c1d24e1ecf212b52e3912
* | | | | | Ensuring that we always update the predicted apps set.Winson Chung2015-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieecf019442dcf4af42463ed6cbc4cdcd19468dec
* | | | | | Merge "Fixing crash when using app name comparator with empty titles." into ↵Winson Chung2015-06-251-2/+4
|\| | | | | | |/ / / / |/| | | | | | | | | ub-launcher3-burnaby
| * | | | Fixing crash when using app name comparator with empty titles.Winson Chung2015-06-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22065752 Change-Id: I4160f5e1728e46ce85fd2579889e7952de01a752
* | | | | Merge "Prevent extra animation when scrolling the recycler view." into ↵Winson Chung2015-06-251-3/+5
|\| | | | | |/ / / |/| | | | | | | ub-launcher3-burnaby
| * | | Prevent extra animation when scrolling the recycler view.Winson Chung2015-06-241-3/+5
| | | | | | | | | | | | | | | | Change-Id: I362b557ae63a2cbef77ebf7fac9a7a27adeabb49
* | | | Removing some synthetic methodsSunny Goyal2015-06-242-11/+15
| | | | | | | | | | | | | | | | Change-Id: I08310e21871c7d670eb384ef1e835d155540c3e8
* | | | Merge "Fixing issue with popup arrow direction in RTL." into ↵Winson Chung2015-06-241-0/+0
|\| | | | | | | | | | | | | | | ub-launcher3-burnaby
| * | | Fixing issue with popup arrow direction in RTL.Winson Chung2015-06-241-0/+0
| | | | | | | | | | | | | | | | Change-Id: I454596d8122ae7c44bb22fe74f229d19a5fbd4d4
* | | | Merge "Ensure that Launcher Activity has an exclusive task" into ↵Adam Cohen2015-06-241-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | ub-launcher3-burnaby