Baligh Uddin
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
The Android Automerger
eb439601c7
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-17 16:07:36 -07:00
alanv
1d4fde6864
Send correctly populated Accessibility event on Launcher state change.
...
Bug: 7362253
Change-Id: I72811292e8091a21866cb4599d37a71eb475b1d5
2012-10-17 13:15:47 -07:00
Romain Guy
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
Romain Guy
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
Romain Guy
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
Romain Guy
e34a213c32
Add missing layout attributes
...
Bug #7334849
Change-Id: Iae01cf5c587716951dee849e9c4116717d137d8f
2012-10-17 12:04:05 -07:00
The Android Automerger
08c0e3c671
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-15 12:31:18 -07:00
The Android Open Source Project
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
The Android Open Source Project
2ee4be8d3a
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I204c53690f99803900e6613188a6d9a14370e007
2012-10-15 07:40:11 -07:00
The Android Automerger
0c762a978e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-15 06:59:38 -07:00
Jason Chen
13cc47a677
am d294cac5: am dddd6c31: am 0c2388a4: Let\'s enhance
...
* commit 'd294cac5d83eb18dea9b2f84d4202b13f3ea3c43':
Let's enhance
2012-10-14 23:11:09 -07:00
Jason Chen
d294cac5d8
am dddd6c31: am 0c2388a4: Let\'s enhance
...
* commit 'dddd6c3117c7e6a6af0dd6542c0e6225eb7e274d':
Let's enhance
2012-10-14 23:08:00 -07:00
Jason Chen
dddd6c3117
am 0c2388a4: Let\'s enhance
...
* commit '0c2388a40c3435615afa1e9b424549d29a98f44e':
Let's enhance
2012-10-14 23:04:42 -07:00
Jason Chen
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
The Android Automerger
eabb31b088
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-12 10:27:16 -07:00
The Android Open Source Project
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
The Android Open Source Project
f5fb2a0656
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: If20e289cd34c19f80f7c2ad19587d19483a7700f
2012-10-12 07:32:00 -07:00
Romain Guy
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
Romain Guy
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
The Android Automerger
5f2aa980c3
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-11 16:26:53 -07:00
Romain Guy
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
Romain Guy
0d06152d40
Merge "Remove unnecessary allocations during draw Bug #7327799 " into jb-mr1-dev
2012-10-11 11:10:47 -07:00
Michael Jurka
1c8a5734ce
am 74c697c7: am 80d64c28: am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev
...
* commit '74c697c7102c66c37f1588201750236234f20b12':
Add entries for string resources that appear in clings
2012-10-11 08:27:50 -07:00
Michael Jurka
74c697c710
am 80d64c28: am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev
...
* commit '80d64c28f45e0378e05021dc9222982b3d67150e':
Add entries for string resources that appear in clings
2012-10-11 08:26:07 -07:00
Michael Jurka
80d64c28f4
am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev
...
* commit 'dfe0c29383049b269094a51fd74e693a8cb9b5b0':
Add entries for string resources that appear in clings
2012-10-11 08:24:57 -07:00
Michael Jurka
dfe0c29383
Merge "Add entries for string resources that appear in clings" into jb-mr1-dev
2012-10-11 08:23:10 -07:00
The Android Automerger
3e40565ed1
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-11 08:19:41 -07:00
The Android Open Source Project
a038e71dcb
am c476f09d: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'c476f09d4a8c37c16e352cbcf3745e1b33ede7fb':
2012-10-11 08:08:17 -07:00
The Android Open Source Project
c476f09d4a
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ice7d89d927b01c03db60deaa0f00840df514ee96
2012-10-11 08:05:52 -07:00
The Android Automerger
efd3b17e64
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-11 07:04:12 -07:00
The Android Open Source Project
ac2e710afe
am af503b04: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'af503b044475dc29ce58f715739158036807e94e':
2012-10-11 06:02:20 -07:00
The Android Open Source Project
af503b0444
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Idf9e1ad5fe56ee4d56e5266630b6f971ecba10c7
2012-10-11 05:57:54 -07:00
Michael Jurka
22beb9043e
Add entries for string resources that appear in clings
2012-10-11 11:04:43 +02:00
Baligh Uddin
dfe087fce5
am eddbe4e9: (-s ours) am 61854931: am 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
...
* commit 'eddbe4e9946b1175f4549617abc4b792e778ac4a':
Revert "Import translations. DO NOT MERGE"
2012-10-10 21:20:28 -07:00
Baligh Uddin
e221a3f2b6
am 9fe1a25b: (-s ours) am ae5a2a4a: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
...
* commit '9fe1a25ba84ce7dace44c98c3bc8beb47bab1a4a':
Revert "Import translations. DO NOT MERGE"
2012-10-10 21:19:03 -07:00
Baligh Uddin
eddbe4e994
am 61854931: am 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
...
* commit '61854931252710cedbb596918dee6524723d1223':
Revert "Import translations. DO NOT MERGE"
2012-10-10 21:18:36 -07:00
Baligh Uddin
9fe1a25ba8
am ae5a2a4a: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
...
* commit 'ae5a2a4a4ef055fc0403b2cefa860b29ae88c998':
Revert "Import translations. DO NOT MERGE"
2012-10-10 21:16:59 -07:00
Baligh Uddin
6185493125
am 260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
...
* commit '260eb9c6ff598d792b51e5c24608602a1f5b1504':
Revert "Import translations. DO NOT MERGE"
2012-10-10 21:16:54 -07:00
Baligh Uddin
ae5a2a4a4e
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
2012-10-10 21:14:57 -07:00
Baligh Uddin
339308c1e0
Revert "Import translations. DO NOT MERGE"
...
broken build
This reverts commit 4caeee6e08
Change-Id: Ie3456538cf40d34ca9d1121cc523f968f2c3a9e2
2012-10-10 21:14:47 -07:00
Baligh Uddin
260eb9c6ff
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
2012-10-10 21:14:37 -07:00
Baligh Uddin
f371a36e2e
Revert "Import translations. DO NOT MERGE"
...
broken build
This reverts commit 2826bc4fb6
Change-Id: I232f8abdf1fdb592ba76216fc82d836294ca4e09
2012-10-10 21:14:29 -07:00
Baligh Uddin
a49e107473
Merge "Revert "Import translations. DO NOT MERGE""
2012-10-10 21:13:41 -07:00
Baligh Uddin
b3ffc617b1
Revert "Import translations. DO NOT MERGE"
...
broken build
This reverts commit 83e8b46884
Change-Id: I42878c0de6156d23aa73fbf36ab699542b387c20
2012-10-10 21:13:25 -07:00
Baligh Uddin
159d561ace
am 9870efdd: (-s ours) am db983fa7: am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '9870efdd359eef447709a92fef474afc04aba24a':
Import translations. DO NOT MERGE
2012-10-10 21:00:47 -07:00
Baligh Uddin
9870efdd35
am db983fa7: am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'db983fa7c46da75469d0042425b41f84b5cdc9ac':
Import translations. DO NOT MERGE
2012-10-10 20:58:34 -07:00
Baligh Uddin
d64131a83d
am a2e9f101: (-s ours) am a7b29405: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'a2e9f101bd2369d4d344d04c317882d1ef90058c':
Import translations. DO NOT MERGE
2012-10-10 20:56:51 -07:00
Baligh Uddin
db983fa7c4
am f8a49f86: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'f8a49f869d6d0303998e8483ca7f650a0d4e5963':
Import translations. DO NOT MERGE
2012-10-10 20:55:53 -07:00
Baligh Uddin
a2e9f101bd
am a7b29405: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'a7b294057a5ec8f72e8f261ab00960565e4efd3b':
Import translations. DO NOT MERGE
2012-10-10 20:55:33 -07:00