a972685b45
am bb608246: am 40d172c1: am 303f621e: Merge "Send correctly populated Accessibility event on Launcher state change." into jb-mr1-dev
...
* commit 'bb608246b4d109a649dc147769b267acecb9416b':
Send correctly populated Accessibility event on Launcher state change.
2012-10-19 14:30:15 -07:00
bb608246b4
am 40d172c1: am 303f621e: Merge "Send correctly populated Accessibility event on Launcher state change." into jb-mr1-dev
...
* commit '40d172c1b5ba885797a7f9ea7aa4488e8721ea83':
Send correctly populated Accessibility event on Launcher state change.
2012-10-19 14:27:51 -07:00
40d172c1b5
am 303f621e: Merge "Send correctly populated Accessibility event on Launcher state change." into jb-mr1-dev
...
* commit '303f621e574e69d46e207530737e279ed42d9c43':
Send correctly populated Accessibility event on Launcher state change.
2012-10-19 14:25:14 -07:00
303f621e57
Merge "Send correctly populated Accessibility event on Launcher state change." into jb-mr1-dev
2012-10-19 14:22:45 -07:00
16f23880c0
am a3505bfe: am 2a11598a: am 381fe4ce: Adding width / height to cling text style
...
* commit 'a3505bfe99a0ef2dc0e0ad8c844b3d6d45c6a9f7':
Adding width / height to cling text style
2012-10-19 10:51:12 -07:00
a3505bfe99
am 2a11598a: am 381fe4ce: Adding width / height to cling text style
...
* commit '2a11598a4ab2a67876ee7fb8d5b0f313311e4cb7':
Adding width / height to cling text style
2012-10-19 10:49:28 -07:00
2a11598a4a
am 381fe4ce: Adding width / height to cling text style
...
* commit '381fe4ce6fb465253c8e9bc42c2836f0c40e6231':
Adding width / height to cling text style
2012-10-19 10:46:43 -07:00
381fe4ce6f
Adding width / height to cling text style
...
Change-Id: Ia39b049fe414edf926c221baed3b1223199ce2a7
2012-10-19 10:17:18 -07:00
87f68f186b
am ea77b790: am e6401ece: am 5b449dc3: Merge "Bring dummy cling strings back as \'strings\'" into jb-mr1-dev
...
* commit 'ea77b790e4ba0b56fb7e43c48b91817d260dd753':
Bring dummy cling strings back as 'strings'
2012-10-19 09:18:32 -07:00
ea77b790e4
am e6401ece: am 5b449dc3: Merge "Bring dummy cling strings back as \'strings\'" into jb-mr1-dev
...
* commit 'e6401ece8a3502b9ad4329a572b596175676f1d0':
Bring dummy cling strings back as 'strings'
2012-10-19 09:16:19 -07:00
e6401ece8a
am 5b449dc3: Merge "Bring dummy cling strings back as \'strings\'" into jb-mr1-dev
...
* commit '5b449dc3095192fecd4760d9f550de65e588e3dc':
Bring dummy cling strings back as 'strings'
2012-10-19 09:13:55 -07:00
06daf3ca08
am 05565f5f: am d5bc834f: am 964e2a63: Merge "Fix NPE" into jb-mr1-dev
...
* commit '05565f5f01d062672dc27ffce5a2f85227c4bfaf':
Fix NPE
2012-10-19 09:13:15 -07:00
7318f72ffa
am 9160410e: am eb91462f: am d6dd7c8a: Fix NPE
...
* commit '9160410e40c8e060a7012a35b38f2532fa159084':
Fix NPE
2012-10-19 09:13:14 -07:00
05565f5f01
am d5bc834f: am 964e2a63: Merge "Fix NPE" into jb-mr1-dev
...
* commit 'd5bc834f413d08c6c9db89b0d27e636361661d51':
Fix NPE
2012-10-19 09:11:18 -07:00
9160410e40
am eb91462f: am d6dd7c8a: Fix NPE
...
* commit 'eb91462f087028e2ce22552ba8ce4e17b9a4f9c1':
Fix NPE
2012-10-19 09:11:17 -07:00
5b449dc309
Merge "Bring dummy cling strings back as 'strings'" into jb-mr1-dev
2012-10-19 09:11:13 -07:00
d5bc834f41
am 964e2a63: Merge "Fix NPE" into jb-mr1-dev
...
* commit '964e2a63c29ed81c2dbd82a3386fda2af7d4662c':
Fix NPE
2012-10-19 09:08:58 -07:00
eb91462f08
am d6dd7c8a: Fix NPE
...
* commit 'd6dd7c8a21e416d7c118517569a242ac7de6c696':
Fix NPE
2012-10-19 09:08:57 -07:00
964e2a63c2
Merge "Fix NPE" into jb-mr1-dev
2012-10-19 09:07:02 -07:00
023c71eb3b
Fix NPE
...
Bug: 7356682
Change-Id: Ic6522da1ec6ac0d57f1565cef9c43949f2d7fd70
2012-10-19 17:32:24 +02:00
7eed60454d
Get rid of explicit GC requests
...
Bug: 7370913
2012-10-19 17:22:00 +02:00
d6dd7c8a21
Fix NPE
...
Bug: 7371837
2012-10-19 17:15:16 +02:00
22057fe9b8
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-19 06:59:57 -07:00
bc5fb26739
am 5c69a9cc: am 08c2f804: am 4cd7f281: remove old fashioned dream, no longer supported
...
* commit '5c69a9cc21815a2b5f62162fc807adb796c5ca0b':
remove old fashioned dream, no longer supported
2012-10-18 14:46:51 -07:00
5c69a9cc21
am 08c2f804: am 4cd7f281: remove old fashioned dream, no longer supported
...
* commit '08c2f8048f02eac6269a2f81ef3e1b6d23444b14':
remove old fashioned dream, no longer supported
2012-10-18 14:44:21 -07:00
08c2f8048f
am 4cd7f281: remove old fashioned dream, no longer supported
...
* commit '4cd7f281056740cc22eccd156c34b98b5816d370':
remove old fashioned dream, no longer supported
2012-10-18 14:41:40 -07:00
4cd7f28105
remove old fashioned dream, no longer supported
...
Change-Id: I87370e8dc7f3159182dac9f650223ce010d6286b
2012-10-18 12:10:03 -07:00
41aeb57975
Bring dummy cling strings back as 'strings'
...
The translations import recognizes 'string', 'string-array' and
'plurals' as valid items to parse, all others are ignored. This is the
reason, why these strings have not been imported back into the codebase.
Making the string declaration same as when it was removed in cl/236665
Change-Id: I6d53ba9d6267706834cb66e9ca99a1335aa01d14
Bug: 7203884
2012-10-18 10:39:11 -07:00
eb439601c7
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-17 16:07:36 -07:00
1d4fde6864
Send correctly populated Accessibility event on Launcher state change.
...
Bug: 7362253
Change-Id: I72811292e8091a21866cb4599d37a71eb475b1d5
2012-10-17 13:15:47 -07:00
e883aec0f8
am c9996802: am 181a0b22: am e34a213c: Add missing layout attributes Bug #7334849
...
* commit 'c999680213d843dce6309e1026f54992c07673cd':
Add missing layout attributes Bug #7334849
2012-10-17 12:48:55 -07:00
c999680213
am 181a0b22: am e34a213c: Add missing layout attributes Bug #7334849
...
* commit '181a0b22fbaeded3e33d09cd625fbee812a66fec':
Add missing layout attributes Bug #7334849
2012-10-17 12:46:44 -07:00
181a0b22fb
am e34a213c: Add missing layout attributes Bug #7334849
...
* commit 'e34a213c32d54c525fc1c4b6f79e449446435484':
Add missing layout attributes Bug #7334849
2012-10-17 12:44:14 -07:00
e34a213c32
Add missing layout attributes
...
Bug #7334849
Change-Id: Iae01cf5c587716951dee849e9c4116717d137d8f
2012-10-17 12:04:05 -07:00
08c0e3c671
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-15 12:31:18 -07:00
a1eeb3e952
am 2ee4be8d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '2ee4be8d3a8eb3355207d2549a7cd4ff6e0677ae':
2012-10-15 07:43:08 -07:00
2ee4be8d3a
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I204c53690f99803900e6613188a6d9a14370e007
2012-10-15 07:40:11 -07:00
0c762a978e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-15 06:59:38 -07:00
13cc47a677
am d294cac5: am dddd6c31: am 0c2388a4: Let\'s enhance
...
* commit 'd294cac5d83eb18dea9b2f84d4202b13f3ea3c43':
Let's enhance
2012-10-14 23:11:09 -07:00
d294cac5d8
am dddd6c31: am 0c2388a4: Let\'s enhance
...
* commit 'dddd6c3117c7e6a6af0dd6542c0e6225eb7e274d':
Let's enhance
2012-10-14 23:08:00 -07:00
dddd6c3117
am 0c2388a4: Let\'s enhance
...
* commit '0c2388a40c3435615afa1e9b424549d29a98f44e':
Let's enhance
2012-10-14 23:04:42 -07:00
0c2388a40c
Let's enhance
...
Add mipmap-* launcher icon assets. Removes equivalent icons from
drawable directories and fixes up the reference to them in a layout.
Bug: 6718166
Change-Id: Ic97e3208d0b47523c8fabef949b2b06825e2fa8f
2012-10-12 10:47:11 -07:00
eabb31b088
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-12 10:27:16 -07:00
b76351b392
am f5fb2a06: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit 'f5fb2a0656d21a2bcc1dd419d3bbf3dc8f11c181':
2012-10-12 07:33:50 -07:00
f5fb2a0656
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: If20e289cd34c19f80f7c2ad19587d19483a7700f
2012-10-12 07:32:00 -07:00
9dba59da31
am 4d36be5a: am cc69ee77: am 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799 " into jb-mr1-dev
...
* commit '4d36be5ac4f128531865d706359ec10f7ab5996a':
Remove unnecessary allocations during draw Bug #7327799
2012-10-11 17:54:09 -07:00
4d36be5ac4
am cc69ee77: am 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799 " into jb-mr1-dev
...
* commit 'cc69ee77b0a96baa75499c1a116d8cbbfce7422f':
Remove unnecessary allocations during draw Bug #7327799
2012-10-11 17:11:14 -07:00
5f2aa980c3
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-11 16:26:53 -07:00
cc69ee77b0
am 0d06152d: Merge "Remove unnecessary allocations during draw Bug #7327799 " into jb-mr1-dev
...
* commit '0d06152d4026e933d8308002e1d53ca4eba6cad2':
Remove unnecessary allocations during draw Bug #7327799
2012-10-11 11:12:57 -07:00
0d06152d40
Merge "Remove unnecessary allocations during draw Bug #7327799 " into jb-mr1-dev
2012-10-11 11:10:47 -07:00
Svetoslav Ganov
Adam Cohen
Baligh Uddin
Michael Jurka
The Android Automerger
Scott Main
alanv
Romain Guy
The Android Open Source Project
Jason Chen