Baligh Uddin
5043aab2a7
am ddf6bb81: am 70123c34: am 78b3dbc8: Merge remote-tracking branch \'origin/kitkat-dev\'
...
* commit 'ddf6bb81b9a63aac120a816722cb4c641f1b21e8':
Initial empty repository
2014-10-23 17:25:25 +00:00
Baligh Uddin
9be2b331a9
am 8cd3b4b3: (-s ours) am c1ed7f3b: (-s ours) am 322554a0: (-s ours) Import translations. DO NOT MERGE
...
* commit '8cd3b4b3e75f3dfadec98e0099aa2c9d74509360':
Import translations. DO NOT MERGE
2014-10-23 17:25:24 +00:00
Baligh Uddin
f5697c5904
am 171ed627: (-s ours) am 6670a579: (-s ours) am a8484d84: (-s ours) Import translations. DO NOT MERGE
...
* commit '171ed627eab58b017bed79d267ad3def7ab90b7e':
Import translations. DO NOT MERGE
2014-10-23 17:25:23 +00:00
Baligh Uddin
7b31b34898
am d68f6f49: (-s ours) am f9f10d03: (-s ours) am 24081d3c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'd68f6f49f0b9c8866325a555e8cfbb2c63dbb828':
Import translations. DO NOT MERGE
2014-10-23 17:25:21 +00:00
Qiwen Zhao
9a58fb53f3
am 42de0037: am bb0086ae: am 45d8f947: snap it from jb-ub-now-indigo-rose at 4d3f022c9a
...
* commit '42de0037776d933455f27a461abd29ce39a2e77d':
2014-10-23 17:25:19 +00:00
Adam Cohen
1d56243748
am 5e9680e9: (-s ours) am d53e22d2: am 4d3f022c: Merge "DO NOT MERGE: Fix leak when animations are created but never started" into jb-ub-now-indigo-rose
...
* commit '5e9680e976ea61a0d2e957c1f91e6a8a417e89d5':
2014-10-23 17:25:17 +00:00
Winson Chung
a3dd7f1fcc
am 440e66e8: (-s ours) am e1a015da: am a78b25f8: DO NOT MERGE
...
* commit '440e66e827f4658cea070df1f8dea394b2f5f69d':
2014-10-23 17:25:14 +00:00
Ed Heyl
c5afe6f8f5
am 01cc8b5e: am 7138e5e0: am 17e01a29: keep history after reset to git reset to 6811c5a414
...
* commit '01cc8b5ee415f0a79bfb1f69ad68f47732bfad21':
2014-10-23 17:25:13 +00:00
Ed Heyl
388c7d2783
am c0fa603b: am 8363be7e: am 6811c5a4: override Launcher2 (aosp)
...
* commit 'c0fa603bf1c886c91cbb37b7f0f1d1d4bcb40725':
2014-10-23 17:25:11 +00:00
Bjorn Bringert
7a20d40ffe
am 27414260: am b6ccd36a: am 235a50e0: Merge "Fix ConcurrentModificationException in InstallShortcutReceiver" into jb-ub-now-indigo-rose
...
* commit '27414260a7724290364c149fe3d0c3a153ae9662':
2014-10-23 17:25:10 +00:00
Baligh Uddin
db90cb6081
am 0e27ebef: (-s ours) am dc6f6268: (-s ours) am b178a362: (-s ours) Import translations. DO NOT MERGE
...
* commit '0e27ebef5b54b6ac2e57c29da5791e6539535e98':
2014-10-23 17:25:09 +00:00
Ed Heyl
8695789a3f
am 10f0db9f: keep history after reset to git reset to 8246a1434c
...
* commit '10f0db9f79256b7e02b65f341853d7238480f343':
override Launcher2 (aosp)
2014-10-23 17:25:08 +00:00
Sunny Goyal
24e0fc1221
Merge "Deleting workspace items from db which have an invalid placement" into ub-now-queens
2014-10-23 16:53:44 +00:00
Sunny Goyal
09c7fc7144
Merge "Removing AccessibleTabView and some other dead code." into ub-now-queens
2014-10-23 16:52:30 +00:00
Adam Cohen
b146c363d9
am 24e18aea: Merge "First pass of the Launcher Overlay interface / impl" into ub-now-queens
...
* commit '24e18aea81ad0c411ce5adb13773595005f8565f':
First pass of the Launcher Overlay interface / impl
2014-10-23 12:46:28 +00:00
Adam Cohen
24e18aea81
Merge "First pass of the Launcher Overlay interface / impl" into ub-now-queens
2014-10-23 00:41:58 +00:00
Adam Cohen
c2d6e897db
First pass of the Launcher Overlay interface / impl
...
-> Added simple reference launcher extension
-> Make launcher able to handle a null qsb
Change-Id: Ib1575243cac800a335e95bbf00cdc394bb4741c3
2014-10-22 17:40:39 -07:00
Geoff Mendal
528c95be3a
am d6a99860: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd6a99860f81211cb1afa4d6933d333907d6f1b79':
Import translations. DO NOT MERGE
2014-10-22 20:06:10 +00:00
Geoff Mendal
d6a99860f8
Import translations. DO NOT MERGE
...
Change-Id: I289d8bb325fa4037936a57c7dfe908186e077be1
Auto-generated-cl: translation import
2014-10-22 13:02:16 -07:00
Geoff Mendal
ed37724958
Import translations. DO NOT MERGE
...
Change-Id: Icff21d84b1dbb334bad3106c9e5e01168e3dca37
Auto-generated-cl: translation import
2014-10-22 13:01:39 -07:00
Neil Fuller
f1340f1810
Merge "Remove dependencies on FloatMath"
2014-10-22 15:07:55 +00:00
Cameron Neale
d5866c4e9a
Merge "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." into ub-now-master
2014-10-21 20:29:53 +00:00
Sunny Goyal
c02ccbc8c5
am 1231c074: Merge "Updating ItemInfo objects in the worker thread" into ub-now-queens
...
* commit '1231c0743cce0b6b70951d1df3e4b0876c444598':
Updating ItemInfo objects in the worker thread
2014-10-21 18:58:18 +00:00
Sunny Goyal
1231c0743c
Merge "Updating ItemInfo objects in the worker thread" into ub-now-queens
2014-10-21 18:30:20 +00:00
Adam Cohen
8ad56bd564
am e75e7ab4: Merge "Not opening all apps again when AppInfo or Uninstall is selected" into ub-now-queens
...
* commit 'e75e7ab4fd6f38cb99382c3b16300fd0f2ef6307':
Not opening all apps again when AppInfo or Uninstall is selected
2014-10-21 18:14:28 +00:00
Adam Cohen
e75e7ab4fd
Merge "Not opening all apps again when AppInfo or Uninstall is selected" into ub-now-queens
2014-10-21 18:11:34 +00:00
Sunny Goyal
1aaf6f20a7
Removing AccessibleTabView and some other dead code.
...
Change-Id: Ia122a6277f924e6077dbf15a4dc40b5042aa987d
2014-10-21 10:05:23 -07:00
Geoff Mendal
ea92e291a1
am 1aa3abea: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens
...
* commit '1aa3abea279d8b3ead93d704d424757bfe65c2bd':
Import translations. DO NOT MERGE
2014-10-21 00:00:42 +00:00
Geoff Mendal
1aa3abea27
Merge "Import translations. DO NOT MERGE" into ub-now-queens
2014-10-20 23:56:47 +00:00
Geoff Mendal
971df150aa
Merge "Import translations. DO NOT MERGE" into ub-now-master
2014-10-20 23:46:59 +00:00
Geoff Mendal
3b50cf4ebb
Import translations. DO NOT MERGE
...
Change-Id: Icd10604229b51f3870b346280be11cce2e9f8eeb
Auto-generated-cl: translation import
2014-10-20 16:46:58 -07:00
Geoff Mendal
017c22dbb5
Import translations. DO NOT MERGE
...
Change-Id: Idc5745455ed93fc24d00f55ef8912b58ccb7168c
Auto-generated-cl: translation import
2014-10-20 16:46:20 -07:00
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