70168d3a74
am 5a030078: Merge "Fixing issue where accessibility was reporting items behind an open folder. (Bug 8331717)" into jb-mr2-dev
...
* commit '5a0300783cef1216f5d13dcbe98ef44f8cc78fc7':
Fixing issue where accessibility was reporting items behind an open folder. (Bug 8331717)
2013-04-16 10:17:54 -07:00
5a0300783c
Merge "Fixing issue where accessibility was reporting items behind an open folder. (Bug 8331717)" into jb-mr2-dev
2013-04-16 17:15:34 +00:00
ed2a2f44d1
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-16 05:55:40 -07:00
9bfa37432b
am 8de76702: am 79721945: Merge "Fixing issue with qsb icons not being sized correctly. (Bug 8543618)" into jb-mr2-dev
...
* commit '8de7670284b6da8f714e26d04d88fa69b57939e4':
Fixing issue with qsb icons not being sized correctly. (Bug 8543618)
2013-04-15 16:09:29 -07:00
8de7670284
am 79721945: Merge "Fixing issue with qsb icons not being sized correctly. (Bug 8543618)" into jb-mr2-dev
...
* commit '7972194528cde392ce2b42779a6d5c2d77e86993':
Fixing issue with qsb icons not being sized correctly. (Bug 8543618)
2013-04-15 16:06:05 -07:00
7972194528
Merge "Fixing issue with qsb icons not being sized correctly. (Bug 8543618)" into jb-mr2-dev
2013-04-15 23:00:02 +00:00
9b55b3696a
am e9dd491d: Reconcile with jb-mr2-release - do not merge
...
* commit 'e9dd491d2295204fa5d4c1ea62e2cc80b80b1a59':
Fix NPE
2013-04-15 10:53:13 -07:00
e9dd491d22
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I326745b5eab66b6e7ec49cb0db1b66db6ca884fc
2013-04-15 10:46:23 -07:00
e8ddd6e700
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-15 05:56:16 -07:00
ef39d2085b
am 451dc081: am ae45db05: Update to match API rename
...
* commit '451dc0811e2a32c2446b7b5dea9c97e43a721015':
Update to match API rename
2013-04-13 17:25:17 -07:00
451dc0811e
am ae45db05: Update to match API rename
...
* commit 'ae45db052a5e3e7817a09461558158a6670c013e':
Update to match API rename
2013-04-13 17:22:10 -07:00
ae45db052a
Update to match API rename
...
Change-Id: Id5af08f9556a81d0efb778ccbe81bb70938947c1
2013-04-13 16:46:23 -07:00
21a89d56fe
am f0a0efaa: am 75d29e40: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'f0a0efaa04e5684ff844d327e42495a76ffc79db':
Import translations. DO NOT MERGE
2013-04-12 16:45:42 -07:00
f0a0efaa04
am 75d29e40: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '75d29e40f37568e54c08497a8b72ac50c120c839':
Import translations. DO NOT MERGE
2013-04-12 16:42:11 -07:00
c12b929475
Merge "Import translations. DO NOT MERGE"
2013-04-12 23:37:30 +00:00
75d29e40f3
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-12 23:37:08 +00:00
0a633f895d
am 288d8570: am 9178ed86: Follow API change to isUserLimited()
...
* commit '288d8570686a9f30fde0e7fae5be5f957b4c81eb':
Follow API change to isUserLimited()
2013-04-12 15:42:48 -07:00
288d857068
am 9178ed86: Follow API change to isUserLimited()
...
* commit '9178ed862d35680c3200a903444d9d6ef5bef3e1':
Follow API change to isUserLimited()
2013-04-12 15:36:24 -07:00
9178ed862d
Follow API change to isUserLimited()
...
Change-Id: Ibbaad903c07a8e3dc96b37536d438fbee6b0356f
2013-04-12 15:16:23 -07:00
83ca480941
Fixing issue where accessibility was reporting items behind an open folder. (Bug 8331717)
...
Change-Id: Ibaec4144ee911c6d784737cf56a4fc8a1dad2886
2013-04-12 15:15:07 -07:00
b301f3fcff
Fixing issue with qsb icons not being sized correctly. (Bug 8543618)
...
Change-Id: I807eaa8323e138c3ad13b6b923a3598c072c0588
2013-04-12 12:37:56 -07:00
44b7587df7
Import translations. DO NOT MERGE
...
Change-Id: I19d95d32c55b331f6f077a9836c47b55a05fe3f6
Auto-generated-cl: translation import
2013-04-12 11:31:38 -07:00
ff0c0ea635
Import translations. DO NOT MERGE
...
Change-Id: If487ff1fc4549435c73a9e205b4059e68ce7df05
Auto-generated-cl: translation import
2013-04-12 11:30:51 -07:00
6a34dadf0e
am 962a40fa: am b68e03a8: Fix NPE
...
* commit '962a40fafb2b5d7fc66c46bdcb1e8d587d355c30':
Fix NPE
2013-04-11 14:58:27 -07:00
10f0f145ae
Fix NPE
...
Bug: 8596760
Change-Id: I401aa0f9a1b8b1c167b502f6aad11cb0f98b7c33
2013-04-11 14:46:17 -07:00
962a40fafb
am b68e03a8: Fix NPE
...
* commit 'b68e03a83cfc8e59c0c93d070c5e3cc13cc2996b':
Fix NPE
2013-04-11 14:13:00 -07:00
b68e03a83c
Fix NPE
...
Bug: 8596760
Change-Id: I401aa0f9a1b8b1c167b502f6aad11cb0f98b7c33
2013-04-11 11:40:21 -07:00
de272d2a9d
am 34716a89: Reconcile with jb-mr2-release - do not merge
...
* commit '34716a89e247aff6853122472a09762eed4a2fc6':
2013-04-11 07:50:53 -07:00
34716a89e2
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I49fd5e4403bfbd598174527115887dd252dcf17a
2013-04-11 07:45:25 -07:00
c07014e251
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-11 05:55:55 -07:00
0d657a1fd8
am 299cf6da: am 813a757b: Import translations. DO NOT MERGE
...
* commit '299cf6da2ecf2177f01985e283cdd78a1c05d4d0':
Import translations. DO NOT MERGE
2013-04-10 13:06:59 -07:00
299cf6da2e
am 813a757b: Import translations. DO NOT MERGE
...
* commit '813a757b2223fcfa57a1108d9dd31c16293720b8':
Import translations. DO NOT MERGE
2013-04-10 13:04:03 -07:00
cbe3a70c2d
Merge "Import translations. DO NOT MERGE"
2013-04-10 20:00:13 +00:00
4f295c4466
Import translations. DO NOT MERGE
...
Change-Id: I52dc4dabd747505e33432b7d63c42e9bdbec6452
Auto-generated-cl: translation import
2013-04-10 12:03:41 -07:00
813a757b22
Import translations. DO NOT MERGE
...
Change-Id: Idde5fc7418842df4751c0fdac0b9739523752503
Auto-generated-cl: translation import
2013-04-10 12:02:22 -07:00
f650229a91
am 4b0cebb4: Reconcile with jb-mr2-release - do not merge
...
* commit '4b0cebb4939aa4431f8d0c607db3a8f3424e2a84':
Fix bug where folder open animation gets finished early
2013-04-10 10:08:23 -07:00
4b0cebb493
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ic2d8fb42f01f3d9ffeeffd2b0a02bc3ddbad2ed7
2013-04-10 10:05:56 -07:00
65e6966389
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-10 05:56:44 -07:00
32b59c122c
Fix bug where folder open animation gets finished early
...
Also, sync FirstFrameAnimatorHelper with changes
made in Recents
Bug: 8530231
Change-Id: Ibf1a43f67d91df89a2338f0f0c0fb52ee5496e57
2013-04-09 16:02:00 -07:00
34a6d01289
am 9fdf3868: am 29a0390b: Merge "Fix bug where folder open animation gets finished early" into jb-mr2-dev
...
* commit '9fdf3868aa4f1fdc7295759e24a0c7498ee98c60':
Fix bug where folder open animation gets finished early
2013-04-09 15:26:31 -07:00
c0bd6ac257
am cf66d8a9: am bb8ba253: Merge "Fix for bug #8456352 [BiDi][fa] Widget dimensions are RTL in Farsi" into jb-mr2-dev
...
* commit 'cf66d8a95590d8fba47d83bd17a5650e3ded2fb8':
Fix for bug #8456352 [BiDi][fa] Widget dimensions are RTL in Farsi
2013-04-09 15:26:30 -07:00
9fdf3868aa
am 29a0390b: Merge "Fix bug where folder open animation gets finished early" into jb-mr2-dev
...
* commit '29a0390b33d2fb6b1e610d5ab2fd2dc0c199d699':
Fix bug where folder open animation gets finished early
2013-04-09 15:24:40 -07:00
cf66d8a955
am bb8ba253: Merge "Fix for bug #8456352 [BiDi][fa] Widget dimensions are RTL in Farsi" into jb-mr2-dev
...
* commit 'bb8ba253b630bcad7761fd12178e14b27c741229':
Fix for bug #8456352 [BiDi][fa] Widget dimensions are RTL in Farsi
2013-04-09 15:24:40 -07:00
29a0390b33
Merge "Fix bug where folder open animation gets finished early" into jb-mr2-dev
2013-04-09 22:23:54 +00:00
bb8ba253b6
Merge "Fix for bug #8456352 [BiDi][fa] Widget dimensions are RTL in Farsi" into jb-mr2-dev
2013-04-09 22:22:25 +00:00
39b599e064
Fix bug where folder open animation gets finished early
...
Also, sync FirstFrameAnimatorHelper with changes
made in Recents
Bug: 8530231
Change-Id: Ibf1a43f67d91df89a2338f0f0c0fb52ee5496e57
2013-04-09 14:50:33 -07:00
e38ed4577a
am 48ff7c75: Reconcile with jb-mr2-release - do not merge
...
* commit '48ff7c754131a9b3f08f4e83106dfb8f0c1a5743':
Fix crash in draw listener
2013-04-08 13:40:32 -07:00
2d8387154e
Fix for bug #8456352 [BiDi][fa] Widget dimensions are RTL in Farsi
...
- make the string translatable
After this patch, there will need to have the string translated for all
supported languages.
For Farsi (the only exception), the string should be defined as:
<string name="widget_dims_format">%2$d \u00d7 %1$d</string>
Change-Id: I7acd305b677a8dbc0d12a751a6faad54424c641d
2013-04-08 13:37:20 -07:00
48ff7c7541
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ia58e3622b8f48598feeae9a089adb7af125e8013
2013-04-08 13:36:26 -07:00
fd71c0429d
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-08 05:56:53 -07:00
Winson Chung
The Android Automerger
The Android Open Source Project
Amith Yamasani
Baligh Uddin
Michael Jurka
Fabrice Di Meglio