Cameron Neale
9a8573250b
Removing duplicated and/or unused resources from WallpaperPicker that conflict with Launcher 3 resources. The resource duplicated between the two is now only held within Launcher3. These changes are necessary in order for GSA to build in Google3.
...
Change-Id: I70f5a250db52303c876e6abedd9c6d32d1d4761e
2014-10-20 14:26:17 -07:00
Sunny Goyal
62edad0f14
am 2fb6609c: Merge "Showing widgets in a disabled state, when running in safe mode" into ub-now-queens
...
* commit '2fb6609c318f1ba8ee75194c5cbc6de982a0a5a7':
Showing widgets in a disabled state, when running in safe mode
2014-10-20 20:44:51 +00:00
Sunny Goyal
2fb6609c31
Merge "Showing widgets in a disabled state, when running in safe mode" into ub-now-queens
2014-10-20 20:41:47 +00:00
Sunny Goyal
f745906adc
am c69b9218: Merge "Using LinearLayout for overview panel" into ub-now-queens
...
* commit 'c69b92185aeb7adc57f0007f5659c531e1a8c050':
Using LinearLayout for overview panel
2014-10-20 20:39:38 +00:00
Sunny Goyal
c69b92185a
Merge "Using LinearLayout for overview panel" into ub-now-queens
2014-10-20 20:35:32 +00:00
Sunny Goyal
da018b63f3
am 3a5a9d18: Refactoring layout parsing code
...
* commit '3a5a9d18daacb878a3eb379fce540ee6c67063e6':
Refactoring layout parsing code
2014-10-20 10:28:43 +00:00
Adam Cohen
21e2033b9b
am 91d79e82: Merge "Adding ability to list folder items in separate file" into ub-now-queens
...
* commit '91d79e820aed570ccd2b1a6b10a7b3cabad99479':
Adding ability to list folder items in separate file
2014-10-20 10:27:24 +00:00
Sunny Goyal
5bbc3f4c1e
am c565c104: Merge "Removing all traces of Market button and TabIndicator" into ub-now-queens
...
* commit 'c565c104a6b9f74e68a93108141431d8415881a5':
Removing all traces of Market button and TabIndicator
2014-10-20 10:26:38 +00:00
Sunny Goyal
3c8fbce7df
am 4514aa24: Merge "Moving the focus indicator instantly to the target position, instead of begining the next animation from the middle." into ub-now-queens
...
* commit '4514aa24c814b2c6c408b852f0d972a2d537af75':
Moving the focus indicator instantly to the target position, instead of begining the next animation from the middle.
2014-10-20 10:26:37 +00:00
Sunny Goyal
26583bcc72
am 736f5af0: Fixing some IconCache methods not thread safe
...
* commit '736f5af04cfb6f168c1f643874a7d3f82b5f51cc':
Fixing some IconCache methods not thread safe
2014-10-20 10:26:37 +00:00
Helena Josol
65ee317459
am d37a1f5a: Merge "Add more Launcher files to delete on Clear Launcher Data" into ub-now-queens
...
* commit 'd37a1f5abec5a442508d850a0e26c96ece225f91':
Add more Launcher files to delete on Clear Launcher Data
2014-10-20 10:24:56 +00:00
Adam Cohen
99bec5116d
am 34899b9c: Merge "Use LauncherCallbacks model instead of method overrides" into ub-now-queens
...
* commit '34899b9c1a65827ab510d6c6c2e3dd84a824b472':
Use LauncherCallbacks model instead of method overrides
2014-10-20 10:02:56 +00:00
Sunny Goyal
6e96068a33
am 1e76f888: Merge "Adding NPE check in InstallShortcutReceiver" into ub-now-queens
...
* commit '1e76f8882ec9b0505baf8350f000b97bddc90578':
Adding NPE check in InstallShortcutReceiver
2014-10-20 10:02:53 +00:00
Geoff Mendal
5e50d7b55e
am 6c2e0066: (-s ours) Import translations. DO NOT MERGE
...
* commit '6c2e00663442641a6bc28f4b319b6e57c86f8f77':
Import translations. DO NOT MERGE
2014-10-20 10:02:52 +00:00
Adam Cohen
42afc9d6a2
am d8b76d24: am 5e39b1ef: am e7afa51b: am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop
...
* commit 'd8b76d24b314f91c4c6520ebfaf74a207918e55a':
Fixing typo from previous CL
2014-10-18 16:37:35 +00:00
Adam Cohen
b9d25241ae
am c0afcaad: am 68743c2c: am 84a79949: am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop
...
* commit 'c0afcaad8622b8fd51b23ddc076260142c878156':
Fix missing screen when adding widget directly to provider
2014-10-18 16:37:34 +00:00
Sunny Goyal
484d73d6e5
am ff901b8a: am 9202c64f: am fdbfba88: am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created
...
* commit 'ff901b8a007db05a18517bb9efec856cdf6496a3':
DO NOT MERGE Rechecking unrestored items when launcher gets created
2014-10-18 16:37:34 +00:00
Ian Parkinson
f1ada64381
am 69cf1b87: am 1beba0a0: am 3d78b80e: am 0c2918f4: Use View.generateViewId if available
...
* commit '69cf1b8736e3c0c962653251cda6df1ed3063e7e':
Use View.generateViewId if available
2014-10-18 16:37:33 +00:00
Adam Cohen
93d7973c26
am a3116628: am b97fb75b: am 49e2f10e: am 4b8d11fc: Add missing xxhdpi asset
...
* commit 'a31166280e4cb022eb8e98b3a0d9df7c027502ea':
Add missing xxhdpi asset
2014-10-18 16:37:33 +00:00
Kenny Guy
b8e159a3a1
am b36d10d5: am ad7be0b2: am 5f2a520f: am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop
...
* commit 'b36d10d559bb0666868f1626669bf6136ef8c597':
Remove reference to CODENAME from compat code.
2014-10-18 16:37:32 +00:00
Adam Cohen
d50cbaa360
am b1e6628e: am f38a2eb1: am 91c11b28: am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop
...
* commit 'b1e6628ee8dfe797a5d5c9d15ffb890a28b38ca9':
Don't let old Launcher activity interfere with new one
2014-10-18 16:37:32 +00:00
Bjorn Bringert
c3787cc4d8
am f6b97f73: am d54cf543: am c656245b: am 2ed99e86: Build Launcher3 against prebuilt SDK 21
...
* commit 'f6b97f7391aa0c3c4f67b3c9ed4d5c6a29759c74':
Build Launcher3 against prebuilt SDK 21
2014-10-18 16:37:31 +00:00
Sunny Goyal
67eeffb0b8
am be7e26be: am cc483537: am e7599d69: am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop
...
* commit 'be7e26bee8f9f593fbcb0f6484adb1f60b89a844':
Resetting launcherProvider data if restore set was empty
2014-10-18 16:37:31 +00:00
Baligh Uddin
85bfc94ffb
am 42c645e8: (-s ours) am 32b2735a: (-s ours) am ab474588: (-s ours) am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
...
* commit '42c645e803555d70073a0eddec3d1fb477f0daa0':
Import translations. DO NOT MERGE
2014-10-18 16:37:30 +00:00
Sunny Goyal
a80fca2ec3
am 5dbae54d: am 06871183: am e43f0d64: am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
...
* commit '5dbae54dfb56b9fb343f7794c31b0dfa85e98201':
Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
2014-10-18 16:37:30 +00:00
Sunny Goyal
23f29b591b
am 5f248bd5: am 45f01219: am 50141452: am f876301d: UI Fixes
...
* commit '5f248bd5f2547191599688d931cf7edd95e36df0':
UI Fixes
2014-10-18 16:37:29 +00:00
Adam Cohen
98baf32be1
am 451d68d5: am 250678ad: am cb20616a: am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop
...
* commit '451d68d50ef7ceac4c96fb66333dff54e5cd34f2':
When ensuring screen exists, make sure it's actually referring to a screen, not a rank
2014-10-18 16:37:29 +00:00
Baligh Uddin
a8955e768a
am e8165007: (-s ours) am 1dd8d00b: (-s ours) am 6317598a: (-s ours) am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
...
* commit 'e81650071c84436cd996f73d40ad074c43782a32':
Import translations. DO NOT MERGE
2014-10-18 16:37:28 +00:00
Adam Cohen
d8b76d24b3
am 5e39b1ef: am e7afa51b: am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop
...
* commit '5e39b1ef7d7e42b08e3abb97f73c5380debeb166':
Fixing typo from previous CL
2014-10-18 16:28:00 +00:00
Adam Cohen
c0afcaad86
am 68743c2c: am 84a79949: am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop
...
* commit '68743c2ca826893ca51c2e58013258a1b366a48e':
Fix missing screen when adding widget directly to provider
2014-10-18 16:27:59 +00:00
Sunny Goyal
ff901b8a00
am 9202c64f: am fdbfba88: am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created
...
* commit '9202c64f75cfd422c8a9a143dd71dd30e109301b':
DO NOT MERGE Rechecking unrestored items when launcher gets created
2014-10-18 16:27:59 +00:00
Ian Parkinson
69cf1b8736
am 1beba0a0: am 3d78b80e: am 0c2918f4: Use View.generateViewId if available
...
* commit '1beba0a0b63293567b87e5c4a6ba6728d67c0f12':
Use View.generateViewId if available
2014-10-18 16:27:58 +00:00
Adam Cohen
a31166280e
am b97fb75b: am 49e2f10e: am 4b8d11fc: Add missing xxhdpi asset
...
* commit 'b97fb75bfd472b45bf3a3d9c71aa977c30b52341':
Add missing xxhdpi asset
2014-10-18 16:27:58 +00:00
Kenny Guy
b36d10d559
am ad7be0b2: am 5f2a520f: am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop
...
* commit 'ad7be0b20952740a1de452ffac182dd51bc4f16b':
Remove reference to CODENAME from compat code.
2014-10-18 16:27:57 +00:00
Adam Cohen
b1e6628ee8
am f38a2eb1: am 91c11b28: am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop
...
* commit 'f38a2eb1648dffc44ada50d4344f37679ae55b34':
Don't let old Launcher activity interfere with new one
2014-10-18 16:27:57 +00:00
Bjorn Bringert
f6b97f7391
am d54cf543: am c656245b: am 2ed99e86: Build Launcher3 against prebuilt SDK 21
...
* commit 'd54cf54387d8c434fefd18ce7a6bdbf3ea586b39':
Build Launcher3 against prebuilt SDK 21
2014-10-18 16:27:56 +00:00
Sunny Goyal
be7e26bee8
am cc483537: am e7599d69: am 6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop
...
* commit 'cc483537e9033a2d9c04bae85723f0f942b10a2e':
Resetting launcherProvider data if restore set was empty
2014-10-18 16:27:56 +00:00
Baligh Uddin
42c645e803
am 32b2735a: (-s ours) am ab474588: (-s ours) am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
...
* commit '32b2735ae2e720ba301d946cc8e8b2dedf556fc6':
Import translations. DO NOT MERGE
2014-10-18 16:27:55 +00:00
Sunny Goyal
5dbae54dfb
am 06871183: am e43f0d64: am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
...
* commit '06871183b1d94acd7f52db6a4892c2dbea931ca1':
Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
2014-10-18 16:27:55 +00:00
Sunny Goyal
5f248bd5f2
am 45f01219: am 50141452: am f876301d: UI Fixes
...
* commit '45f012197c41e905c84878c0826d01a3d37c15f7':
UI Fixes
2014-10-18 16:27:54 +00:00
Adam Cohen
451d68d50e
am 250678ad: am cb20616a: am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop
...
* commit '250678ad773cfa51d31e8c457b35a37e0b5b1a32':
When ensuring screen exists, make sure it's actually referring to a screen, not a rank
2014-10-18 16:27:54 +00:00
Baligh Uddin
e81650071c
am 1dd8d00b: (-s ours) am 6317598a: (-s ours) am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
...
* commit '1dd8d00ba22c44e83139af7fe2261936219863c9':
Import translations. DO NOT MERGE
2014-10-18 16:27:53 +00:00
Adam Cohen
5e39b1ef7d
am e7afa51b: am ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop
...
* commit 'e7afa51bd8f0f0b9f21bd63a9ceeb9f330259fc2':
Fixing typo from previous CL
2014-10-18 16:08:18 +00:00
Adam Cohen
68743c2ca8
am 84a79949: am 755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop
...
* commit '84a79949a478f8b91c7fcc9346525f7dd187f548':
Fix missing screen when adding widget directly to provider
2014-10-18 16:08:17 +00:00
Sunny Goyal
9202c64f75
am fdbfba88: am 8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created
...
* commit 'fdbfba88d4f08d7a721d91b7e3d30ee5a290be6e':
DO NOT MERGE Rechecking unrestored items when launcher gets created
2014-10-18 16:08:17 +00:00
Ian Parkinson
1beba0a0b6
am 3d78b80e: am 0c2918f4: Use View.generateViewId if available
...
* commit '3d78b80ecdfeec7704b2aa82ce39823fa903ea61':
Use View.generateViewId if available
2014-10-18 16:08:16 +00:00
Adam Cohen
b97fb75bfd
am 49e2f10e: am 4b8d11fc: Add missing xxhdpi asset
...
* commit '49e2f10ee205d6190f0d4c589ba31b6763e9b0d3':
Add missing xxhdpi asset
2014-10-18 16:08:15 +00:00
Kenny Guy
ad7be0b209
am 5f2a520f: am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop
...
* commit '5f2a520f0cd47b274bdf809d7b665c956c2717ed':
Remove reference to CODENAME from compat code.
2014-10-18 16:08:14 +00:00
Adam Cohen
f38a2eb164
am 91c11b28: am 52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop
...
* commit '91c11b28d57c026d507488c58feedebf7fee6f31':
Don't let old Launcher activity interfere with new one
2014-10-18 16:08:14 +00:00
Bjorn Bringert
d54cf54387
am c656245b: am 2ed99e86: Build Launcher3 against prebuilt SDK 21
...
* commit 'c656245b9cbc370537afb18e7fb38ea87c233fd1':
Build Launcher3 against prebuilt SDK 21
2014-10-18 16:08:13 +00:00