summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * am 23b816b1: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '23b816b1bafee73eee28caca3e2a2915f726bbd9': Import translations. DO NOT MERGE
| | | | | * Import translations. DO NOT MERGEBaligh Uddin2014-07-068-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff4546b8b2733909f89750e79e29fe628b4a86c8 Auto-generated-cl: translation import
* | | | | | am 72569a38: (-s ours) am 03c79df9: (-s ours) am f70d0619: (-s ours) am ↵Baligh Uddin2014-07-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0bc7603: (-s ours) Import translations. DO NOT MERGE * commit '72569a387742812be7e87362721631beaa05028c': Import translations. DO NOT MERGE
| * | | | | am 03c79df9: (-s ours) am f70d0619: (-s ours) am e0bc7603: (-s ours) Import ↵Baligh Uddin2014-07-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '03c79df9f3dca05f767493b4ffbcabb1eab44434': Import translations. DO NOT MERGE
| | * | | | am f70d0619: (-s ours) am e0bc7603: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f70d061975f732456888bfa31c81998985ed5ddf': Import translations. DO NOT MERGE
| | | * | | am e0bc7603: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0bc7603c65374edb8ebbfae08f7f0255e881fb4': Import translations. DO NOT MERGE
| | | | * | Import translations. DO NOT MERGEBaligh Uddin2014-07-066-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I23f0c37cc7d49bb8180c6c7ac13eeb576844ee24 Auto-generated-cl: translation import
* | | | | | am 6d025224: (-s ours) am 1debb60a: (-s ours) am d88a3cb7: (-s ours) Import ↵Baligh Uddin2014-07-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '6d02522461542f65c18725f3f2c6f24dcb801719': Import translations. DO NOT MERGE
| * | | | | am 1debb60a: (-s ours) am d88a3cb7: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1debb60a8088b4bc999b9b602b17b578794945a4': Import translations. DO NOT MERGE
| | * | | | am d88a3cb7: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd88a3cb7c5d39fc0e573a85cbce81796d1478d95': Import translations. DO NOT MERGE
| | | * | | Import translations. DO NOT MERGEBaligh Uddin2014-07-064-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I648d515052bb7e080ce938c299028bbc8576d3cb Auto-generated-cl: translation import
* | | | | | am a9a4c58a: (-s ours) am d9d0f513: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a9a4c58a57ee2d2bcc14c2277e8788b8a61059d2': Import translations. DO NOT MERGE
| * | | | | am d9d0f513: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd9d0f513b20f9838befb8f96fe33f7a25d68de53': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2014-07-064-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4032339b1540d1c47236148e28a6742506fb9ce3 Auto-generated-cl: translation import
* | | | | | am e95ca561: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e95ca561c515f927caae4b4de27aa73cad789b07': Import translations. DO NOT MERGE
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-07-064-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9a2d988d59a639e059355b343f0b139b753cdec9 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-07-0656-22/+385
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1a573caae29dd7e7b6d5095121991ffa1e142c05 Auto-generated-cl: translation import
* | | | | | Merge "Revert "Revert Cls stopping now-master running on googlefood"" into ↵Kenny Guy2014-07-0122-399/+175
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ub-now-master
| * | | | | | Revert "Revert Cls stopping now-master running on googlefood"Kenny Guy2014-06-3022-399/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7bc272a11b701a32d2ed91277341c382cbd84aeb. Conflicts: src/com/android/launcher3/BubbleTextView.java Change-Id: Id1fb2e1249e72658ce5477165c9bcacba9de2b04
* | | | | | | Don't show clings in guest userAmith Yamasani2014-07-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the SKIP_FIRST_USE_HINTS setting is ON, don't show clings. This is used for Guest users. Bug: 15873403 Change-Id: Icae713788c3ed26d55e8e713da7ec7d0d2b25fce
* | | | | | | Drop support for remove all dead promises.Chris Wren2014-07-013-53/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12764789 Change-Id: Id876b66cf8da4388cb3ed5670a0bbdcf73f2982d
* | | | | | | Update text on dead shortcut removal dialog.Chris Wren2014-07-011-7/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12764789 Change-Id: I9eda1abba2edc3857ce63da2c7c14e13b9a2505e
* | | | | | Offer to delete broken promise icons.Chris Wren2014-06-277-25/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track state of promise in the info, not the view. Fix bugs around moving promises to folders. Fix bugs around filterign and removing promises. Bug: 12764789 Change-Id: If5e8b6d315e463154b5bafe8aef7ef4f9889bb95
* | | | | | enable restore by default in master (for 3.7)Chris Wren2014-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3f64a9248602925c17d2e89295f02cbe64160a6a
* | | | | | Fix issue where sometimes duplicate icons are added on homescreen whenSunny Goyal2014-06-271-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installing a package Shortcuts placed by the user have no package in their intent. Ensure that this is accounted for when searching for duplicates. issue: 12888844 Change-Id: I2fb8b7c2b8f7cb74926904bf49a96aeb59a5a9f8
* | | | | | am dcc5e71b: Fix issue where focus was sometimes missing when going to all ↵Adam Cohen2014-06-241-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apps with keyboard * commit 'dcc5e71b3fd0ae450241ad820a5797225973ce73': Fix issue where focus was sometimes missing when going to all apps with keyboard
| * | | | | Fix issue where focus was sometimes missing when going to all apps with keyboardAdam Cohen2014-06-231-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue 15407977 Change-Id: I806c4f3d4c5951e4caa7eddaff366a68585f1cd9
* | | | | | Revert Cls stopping now-master running on googlefoodKenny Guy2014-06-2422-175/+399
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 01453e855fa87ee19f61223b2b1a6965071ee95a. and 242bbe1b72e4978dde8a662d164cd186305e14a7. "Add content description to bagded icons." "Remove reflection now we are building against L" Bug: 15833449 Change-Id: I81a5316f5619a9cd3b6ab9fd03b2ba96657b7f68
* | | | | | Add content description to bagded icons.Kenny Guy2014-06-239-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled accesibility so that icons badged by the managed profile have a content description that is different to the non-bagdged version. Bug: 15106236 Change-Id: Id483273173d9539916eebd59111d179087526be3
* | | | | | Merge "Remove reflection now we are building against L" into ub-now-masterKenny Guy2014-06-2015-397/+141
|\ \ \ \ \ \
| * | | | | | Remove reflection now we are building against LKenny Guy2014-06-2315-397/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove reflection and update changed renamed L APIs now that branch has L sdk. Change-Id: I223c6528487110eb328e2e229bbcbefb701e0c20
* | | | | | | am db78dc8a: Fix problem where launcher doesn\'t draw after rotation w/ ↵Adam Cohen2014-06-201-10/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | translucent activity above it * commit 'db78dc8a0aeac2e18c995ed5b7e92b963fca18e5': Fix problem where launcher doesn't draw after rotation w/ translucent activity above it
| * | | | | Fix problem where launcher doesn't draw after rotation w/ translucent ↵Adam Cohen2014-06-191-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity above it -> Removed some code which caused this. The code was intended to fix a certain issue: "Fixing issue where we were reverting to the first page of the workspace after launching an application from all apps, rotating, and returning home" -> That bug doesn't seem to occur anymore, even with the revert -> See https://googleplex-android-review.googlesource.com/#/c/209561/1 issue 11808251 Change-Id: I14ada19a294d2e5139a9e650d55f1cd985dd00d3
* | | | | | Merge "Accounting for larger search box" into ub-now-masterAdam Cohen2014-06-171-2/+2
|\ \ \ \ \ \
| * | | | | | Accounting for larger search boxAdam Cohen2014-06-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> QSB is 8dps larger, accounting for that in GEL -> Steal 8 dps from the page indicators to keep the grid unaffected Change-Id: I39f19e69e4a34e05a149b80a8d7966ea56ccc560
* | | | | | | am e25c5d1c: Prevent discordant state between Workspace and Launcher (issue ↵Adam Cohen2014-06-182-5/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15409018) * commit 'e25c5d1c94949044c4cd7416f60ea0dc12dadc8d': Prevent discordant state between Workspace and Launcher (issue 15409018)
| * | | | | | Prevent discordant state between Workspace and Launcher (issue 15409018)Adam Cohen2014-06-182-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I13bb3e51da18998a5dade49c50e5fbf2266022d3
* | | | | | | am 7fa0ae50: (-s ours) DO NOT MERGE - Catching TransactionTooLargeException ↵Adam Cohen2014-06-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in AppWidgetHost#startListening * commit '7fa0ae5056f753a26f267b633bbc160b2b86f725': DO NOT MERGE - Catching TransactionTooLargeException in AppWidgetHost#startListening
| * | | | | | DO NOT MERGE - Catching TransactionTooLargeException in ↵Adam Cohen2014-06-181-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AppWidgetHost#startListening solution b) from issue 14255011 Change-Id: I1dc521632a132de496ff9a583b1e0b29415aacdd (cherry picked from commit 084c31873e5d5015dac9eaac722a6d8387b6dd8d)
* | | | | | | am 60e1efe0: Fix NPE when dragging shortcut without component while app is ↵Adam Cohen2014-06-171-2/+2
|\| | | | | | | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | uninstalled * commit '60e1efe032821235c04376088494b44dfde4b62e': Fix NPE when dragging shortcut without component while app is uninstalled
| * | | | | Fix NPE when dragging shortcut without component while app is uninstalledAdam Cohen2014-06-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue 14601562 Change-Id: Icf0472d38c1b02de8421f146e26f2e2d79de43dd
* | | | | | Merge "Catching TransactionTooLargeException in ↵Adam Cohen2014-06-161-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | AppWidgetHost#startListening" into ub-now-master
| * | | | | | Catching TransactionTooLargeException in AppWidgetHost#startListeningAdam Cohen2014-06-161-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | solution b) from issue 14255011 Change-Id: I1dc521632a132de496ff9a583b1e0b29415aacdd
* | | | | | | am bc9efe7a: am 958315e8: Add catch for missing app icon resource.Kenny Guy2014-06-160-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * commit 'bc9efe7aaee70c7128684c6b92163788e6d7de96': Add catch for missing app icon resource.
| * | | | | am 958315e8: Add catch for missing app icon resource.Kenny Guy2014-06-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '958315e8ef448641a75401acff1e4cb38fd776e7': Add catch for missing app icon resource.
| | * | | | Add catch for missing app icon resource.Kenny Guy2014-06-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The catch was present before moving the code into the compat class. Bug: 15276879 Change-Id: I81fbd49dacd813e861a2bc4f0b41dcbeccb9def2 (cherry picked from commit c879052247b1000b9f318294024daa3c9d100621)
* | | | | | am 56c2acc3: Add method to check if there is a partner folderAdam Cohen2014-06-131-0/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '56c2acc3df4eeb97cabdd3a50983f7f53ee32139': Add method to check if there is a partner folder
| * | | | | Add method to check if there is a partner folderAdam Cohen2014-06-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6154c731edfeb2a4fc0aed94f74a556059b5d103
* | | | | | am 6f127a61: More defense for issue 14491953Adam Cohen2014-06-132-13/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6f127a614c6a3e64a5de963f3a11d68d3368cd84': More defense for issue 14491953
| * | | | | More defense for issue 14491953Adam Cohen2014-06-122-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I90de51c74e337d56aad891741233e6a857d89b62