Michael Jurka
00a4093fa6
Merge "Add script to push changes to system wallpaper cropper" into jb-ub-now-jetsonic
2013-10-23 11:54:45 +00:00
Winson Chung
0091e3766e
Removing unused cling, tweaking translation character limits (Bug 11151675)
...
Change-Id: I601d92ecca5a479d7778824e3b120634bdae6a45
2013-10-22 14:40:17 -07:00
Baligh Uddin
d68f6f49f0
am f9f10d03: (-s ours) am 24081d3c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'f9f10d03de653910287a3a44cc264889a634c535':
Import translations. DO NOT MERGE
2013-10-22 12:59:53 -07:00
Baligh Uddin
f9f10d03de
am 24081d3c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '24081d3cb7c9c7742bf457a3be42fc58f5bbfda0':
Import translations. DO NOT MERGE
2013-10-22 12:57:00 -07:00
Baligh Uddin
24081d3cb7
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-22 19:55:32 +00:00
Qiwen Zhao
42de003777
am bb0086ae: am 45d8f947: snap it from jb-ub-now-indigo-rose at 4d3f022c9a
...
* commit 'bb0086ae73549164cf9842d37ea082374dcee3b4':
2013-10-22 11:46:27 -07:00
Adam Cohen
5e9680e976
am d53e22d2: am 4d3f022c: Merge "DO NOT MERGE: Fix leak when animations are created but never started" into jb-ub-now-indigo-rose
...
* commit 'd53e22d28dea0fef7a4011fd34d07772724268b6':
DO NOT MERGE: Fix leak when animations are created but never started
2013-10-22 11:46:26 -07:00
Winson Chung
440e66e827
am e1a015da: am a78b25f8: DO NOT MERGE
...
* commit 'e1a015da4ba03b6524eb9452b0244ebd4a2d290b':
DO NOT MERGE
2013-10-22 11:46:26 -07:00
Qiwen Zhao
bb0086ae73
am 45d8f947: snap it from jb-ub-now-indigo-rose at 4d3f022c9a
...
* commit '45d8f94731ba8c55e1a9162c4168e7e3b02883de':
2013-10-22 11:43:10 -07:00
Adam Cohen
d53e22d28d
am 4d3f022c: Merge "DO NOT MERGE: Fix leak when animations are created but never started" into jb-ub-now-indigo-rose
...
* commit '4d3f022c9a7170dd4b069ee71534f1baf30cb2f4':
DO NOT MERGE: Fix leak when animations are created but never started
2013-10-22 11:43:10 -07:00
Winson Chung
e1a015da4b
am a78b25f8: DO NOT MERGE
...
* commit 'a78b25f89de49b68a6dd7ddef5aaefe7919f3698':
DO NOT MERGE
2013-10-22 11:43:09 -07:00
Qiwen Zhao
45d8f94731
snap it from jb-ub-now-indigo-rose at 4d3f022c9a
2013-10-22 11:37:15 -07:00
Winson Chung
7bed521ecf
am 39789cba: Merge "Removing tablet-specific assets." into jb-ub-now-jetsonic
...
* commit '39789cba2ba6dab39cf8ca4c6cc9406440d7de2e':
Removing tablet-specific assets.
2013-10-22 11:13:41 -07:00
Winson Chung
39789cba2b
Merge "Removing tablet-specific assets." into jb-ub-now-jetsonic
2013-10-22 18:11:46 +00:00
Ed Heyl
01cc8b5ee4
am 7138e5e0: am 17e01a29: keep history after reset to git reset to 6811c5a414
...
* commit '7138e5e03f3709c0912947fa9108c510f25a1497':
2013-10-22 09:37:51 -07:00
Ed Heyl
c0fa603bf1
am 8363be7e: am 6811c5a4: override Launcher2 (aosp)
...
* commit '8363be7e61d1a0bb39dd76fbebc948a1fcfc8c39':
override Launcher2 (aosp)
2013-10-22 09:37:50 -07:00
Bjorn Bringert
27414260a7
am b6ccd36a: am 235a50e0: Merge "Fix ConcurrentModificationException in InstallShortcutReceiver" into jb-ub-now-indigo-rose
...
* commit 'b6ccd36ac05debadbe1b0e2749ca7c830c362d64':
Fix ConcurrentModificationException in InstallShortcutReceiver
2013-10-22 09:37:50 -07:00
Baligh Uddin
0e27ebef5b
am dc6f6268: (-s ours) am b178a362: (-s ours) Import translations. DO NOT MERGE
...
* commit 'dc6f6268beeaf1e9e739fb06f9c42834bdc8224e':
Import translations. DO NOT MERGE
2013-10-22 09:37:50 -07:00
Ed Heyl
7138e5e03f
am 17e01a29: keep history after reset to git reset to 6811c5a414
...
* commit '17e01a2985ec67f411927aaea1ab144ecdbfa24e':
2013-10-22 09:34:16 -07:00
Ed Heyl
8363be7e61
am 6811c5a4: override Launcher2 (aosp)
...
* commit '6811c5a414a15fa34b4f6917c3f250b3498a89ed':
override Launcher2 (aosp)
2013-10-22 09:34:15 -07:00
Bjorn Bringert
b6ccd36ac0
am 235a50e0: Merge "Fix ConcurrentModificationException in InstallShortcutReceiver" into jb-ub-now-indigo-rose
...
* commit '235a50e0d1a303e586c36bc5e70d560b8b924d58':
Fix ConcurrentModificationException in InstallShortcutReceiver
2013-10-22 09:34:15 -07:00
Baligh Uddin
dc6f6268be
am b178a362: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b178a36244e4498b482978e1b49cf1a54467f55d':
Import translations. DO NOT MERGE
2013-10-22 09:34:15 -07:00
Adam Cohen
cd3b8ccf02
am 401dc411: (-s ours) am 4d3f022c: (-s ours) Merge "DO NOT MERGE: Fix leak when animations are created but never started" into jb-ub-now-indigo-rose
...
* commit '401dc4117bddec60cacb2abdf9a3eb9696c1dc48':
DO NOT MERGE: Fix leak when animations are created but never started
2013-10-22 02:50:23 -07:00
Winson Chung
1a3708ec0f
am 9ba343d7: (-s ours) am a78b25f8: (-s ours) DO NOT MERGE
...
* commit '9ba343d7348301fc02c2eb2cd0f7d16081e417e2':
DO NOT MERGE
2013-10-22 02:50:22 -07:00
Adam Cohen
401dc4117b
am 4d3f022c: (-s ours) Merge "DO NOT MERGE: Fix leak when animations are created but never started" into jb-ub-now-indigo-rose
...
* commit '4d3f022c9a7170dd4b069ee71534f1baf30cb2f4':
DO NOT MERGE: Fix leak when animations are created but never started
2013-10-22 02:47:40 -07:00
Winson Chung
9ba343d734
am a78b25f8: (-s ours) DO NOT MERGE
...
* commit 'a78b25f89de49b68a6dd7ddef5aaefe7919f3698':
DO NOT MERGE
2013-10-22 02:47:40 -07:00
Adam Cohen
4d3f022c9a
Merge "DO NOT MERGE: Fix leak when animations are created but never started" into jb-ub-now-indigo-rose
2013-10-22 00:25:08 +00:00
Adam Cohen
9fdc19ea9c
am 313bbd2f: Merge "Clearing reference to SavedState bundle after restoring from it. (Bug 11322014)" into jb-ub-now-jetsonic
...
* commit '313bbd2f3bb66597e14913696eaebd1b596ebba7':
Clearing reference to SavedState bundle after restoring from it. (Bug 11322014)
2013-10-21 17:21:28 -07:00
Winson Chung
a78b25f89d
DO NOT MERGE
...
Clearing reference to SavedState bundle after restoring from it. (Bug 11322014)
(cherry picked from commit d8e596db4b )
Change-Id: I106f4897ef4ab43d996c0b926ce08ab6ccb2d8a4
2013-10-22 00:20:19 +00:00
Adam Cohen
313bbd2f3b
Merge "Clearing reference to SavedState bundle after restoring from it. (Bug 11322014)" into jb-ub-now-jetsonic
2013-10-22 00:19:35 +00:00
Winson Chung
d8e596db4b
Clearing reference to SavedState bundle after restoring from it. (Bug 11322014)
2013-10-21 17:14:12 -07:00
Michael Jurka
7e839ec8f6
DO NOT MERGE: Fix leak when animations are created but never started
...
Bug: 11322014
(cherry picked from commit e206ff0f73 )
Change-Id: I5aaf76d7c96e4a7878946d7de337acd858c11f44
2013-10-22 00:13:12 +00:00
Michael Jurka
327d5ce359
am 4edc9315: Merge "Fix leak when animations are created but never started" into jb-ub-now-jetsonic
...
* commit '4edc931562d94422c90c0d3d80eb0f54ee79c73f':
Fix leak when animations are created but never started
2013-10-21 16:03:52 -07:00
Michael Jurka
4edc931562
Merge "Fix leak when animations are created but never started" into jb-ub-now-jetsonic
2013-10-21 23:00:42 +00:00
Michael Jurka
e206ff0f73
Fix leak when animations are created but never started
...
Bug: 11322014
2013-10-21 15:57:38 -07:00
Michael Jurka
df087f53b6
am 862f7e39: Load images on a bg thread
...
* commit '862f7e395004b00d871cbe507fd5f2a70c797ef7':
Load images on a bg thread
2013-10-21 15:30:05 -07:00
Michael Jurka
862f7e3950
Load images on a bg thread
...
Bug: 11134758
Change-Id: Ie789a2fcb2024832ac104cd9cdbc3602abee85ee
2013-10-21 14:51:49 -07:00
Ed Heyl
17e01a2985
keep history after reset to git reset to 6811c5a414
2013-10-21 14:51:00 -07:00
Baligh Uddin
cdd1b6f559
Import translations. DO NOT MERGE
...
Change-Id: I7d8df8c393285daf3f102589bc80e4d787bd046b
Auto-generated-cl: translation import
2013-10-21 11:45:08 -07:00
Winson Chung
5e02abeae6
Removing tablet-specific assets.
...
Change-Id: Ia1115911ae476c6218a5bd21e1c07e3039f704ac
2013-10-21 11:32:16 -07:00
Ed Heyl
3c4dd3217b
am 4f98332b: am 6811c5a4: override Launcher2 (aosp)
...
* commit '4f98332b98bbe95cb0574e51ef1514bade9a5e76':
override Launcher2 (aosp)
2013-10-18 11:18:27 -07:00
Ed Heyl
4f98332b98
am 6811c5a4: override Launcher2 (aosp)
...
* commit '6811c5a414a15fa34b4f6917c3f250b3498a89ed':
override Launcher2 (aosp)
2013-10-18 11:08:18 -07:00
Ed Heyl
6811c5a414
override Launcher2 (aosp)
...
Change-Id: I25ec98abeba3cf115d594aa215bfde8e965c1cd1
2013-10-17 17:08:14 -07:00
Ed Heyl
10f0db9f79
keep history after reset to git reset to 8246a1434c
2013-10-17 16:23:31 -07:00
Winson Chung
0d166d8771
am 1fa05179: Merge "Ensuring that we have a valid name for installed shortcuts. (Bug 11266005)" into jb-ub-now-jetsonic
...
* commit '1fa05179eb4ccbe264c67b6acb3abf2793b03197':
Ensuring that we have a valid name for installed shortcuts. (Bug 11266005)
2013-10-17 13:46:12 -07:00
Winson Chung
9e8e38a8d7
am 681a4ace: Merge "Updating folder icons when the shortcut is updated. (Bug 10803060)" into jb-ub-now-jetsonic
...
* commit '681a4aced8e3b5029aafdc3f45d3f47b96d26f9c':
Updating folder icons when the shortcut is updated. (Bug 10803060)
2013-10-17 13:46:12 -07:00
Winson Chung
42bfb12c54
am 6d00d54e: Merge "Ensuring disabled packages remove all components on the workspace. (Bug 11172454)" into jb-ub-now-jetsonic
...
* commit '6d00d54ea1ec1330de4ffc1daf4b507e3cdaeb72':
Ensuring disabled packages remove all components on the workspace. (Bug 11172454)
2013-10-17 13:46:11 -07:00
Winson Chung
1fa05179eb
Merge "Ensuring that we have a valid name for installed shortcuts. (Bug 11266005)" into jb-ub-now-jetsonic
2013-10-17 20:44:10 +00:00
Winson Chung
681a4aced8
Merge "Updating folder icons when the shortcut is updated. (Bug 10803060)" into jb-ub-now-jetsonic
2013-10-17 20:44:04 +00:00
Winson Chung
6d00d54ea1
Merge "Ensuring disabled packages remove all components on the workspace. (Bug 11172454)" into jb-ub-now-jetsonic
2013-10-17 20:44:00 +00:00