summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | am c8d31ff2: Add null check for empty MediaStore cursorAdam Cohen2014-06-121-5/+8
|\| | | | | | | | | | | | | | * commit 'c8d31ff228511d815aa8b46d5bd24c6cc8183333': Add null check for empty MediaStore cursor
| * | Add null check for empty MediaStore cursorAdam Cohen2014-06-121-5/+8
| | | | | | | | | | | | | | | | | | issue 15397853 Change-Id: I1c28262e181a4f32e1f7a58813121db72746d6a8
* | | am 76308c3b: am 6ea3b116: Override app launch transition for LMP previewAdam Cohen2014-06-115-0/+98
|\| | | | | | | | | | | | | | * commit '76308c3b6222d98e4dbc0fbabd21ad9b57f27e88': Override app launch transition for LMP preview
| * | am 6ea3b116: Override app launch transition for LMP previewAdam Cohen2014-06-115-0/+98
| |\| | | | | | | | | | | | | * commit '6ea3b116fc2eea7cc1a6892c548da45a4f581a1d': Override app launch transition for LMP preview
| | * Override app launch transition for LMP previewAdam Cohen2014-06-115-0/+98
| | | | | | | | | | | | | | | | | | issue 15544569 j) Change-Id: I8aff85a154cb98d865a8834f37b13e30cd03de6c
* | | am 128d1c8e: am 71b0473f: Add new assets for LMP previewAdam Cohen2014-06-1147-0/+107
|\| | | | | | | | | | | | | | * commit '128d1c8e1d0a2bcdbe1d58e62c9d60deb5424e1b': Add new assets for LMP preview
| * | am 71b0473f: Add new assets for LMP previewAdam Cohen2014-06-1147-0/+107
| |\| | | | | | | | | | | | | * commit '71b0473f24a7d77263aae88139f13298a1d64b27': Add new assets for LMP preview
| | * Add new assets for LMP previewAdam Cohen2014-06-1147-0/+107
| | | | | | | | | | | | | | | | | | issue 15544569 c), d), e) Change-Id: Ib352ef1fa7c19c3695c82f3ea31936a4b41da5aa
* | | am 74ba0c31: am ada8d7df: Merge "Make folder stack more vertical for LMP ↵Adam Cohen2014-06-111-0/+12
|\| | | | | | | | | | | | | | | | | | | | preview" into ub-now-nova * commit '74ba0c31a87b06c0ed7a78aad92586955d7ca241': Make folder stack more vertical for LMP preview
| * | am ada8d7df: Merge "Make folder stack more vertical for LMP preview" into ↵Adam Cohen2014-06-111-0/+12
| |\| | | | | | | | | | | | | | | | | | | ub-now-nova * commit 'ada8d7dfe1a52eab1e2a0954cf369ed6d198de94': Make folder stack more vertical for LMP preview
| | * Merge "Make folder stack more vertical for LMP preview" into ub-now-novaAdam Cohen2014-06-101-0/+12
| | |\
| | | * Make folder stack more vertical for LMP previewAdam Cohen2014-06-101-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | issue 15544569 h) Change-Id: Ie9830429f629db0963f5313d9e4c0c18b14bff4a
* | | | am 2854d54b: (-s ours) am a629f268: (-s ours) Merge "Revert "Revert ↵Adam Cohen2014-06-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | transparent bars for L in 3.5. DO NOT MERGE"" into ub-now-nova * commit '2854d54b94203c3e4070de475edcfcb3f8140507': Revert "Revert transparent bars for L in 3.5. DO NOT MERGE"
| * | | am a629f268: (-s ours) Merge "Revert "Revert transparent bars for L in 3.5. ↵Adam Cohen2014-06-110-0/+0
|/| | | | |/ / | | | | | | | | | | | | | | | DO NOT MERGE"" into ub-now-nova * commit 'a629f26824c1f1b82cd6ecb5eb88df56eab6cdfe': Revert "Revert transparent bars for L in 3.5. DO NOT MERGE"
| * | Merge "Revert "Revert transparent bars for L in 3.5. DO NOT MERGE"" into ↵Adam Cohen2014-06-101-0/+47
| |\ \ | | |/ | |/| | | | ub-now-nova
| | * Revert "Revert transparent bars for L in 3.5. DO NOT MERGE"Adam Cohen2014-06-091-0/+47
| | | | | | | | | | | | | | | | | | This reverts commit e1cdf5253d8c61218fe3b308803408c04f71ffa3. Change-Id: If107c46fcc3062d990b0de9758045946c8017569
* | | am aa4c8c1f: Fix for regression which made issue 14491953 occur more easilyAdam Cohen2014-06-090-0/+0
|\| | | | | | | | | | | | | | * commit 'aa4c8c1fea577431e218a927ae8ba6c47e51bfdb': Fix for regression which made issue 14491953 occur more easily