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
6b646024a1
am 7b6c0da3: am 78fbf987: Merge "Fix occasional widget flashing" into jb-mr2-dev
...
* commit '7b6c0da3292857af8f6126b9b2450dca606034e3':
Fix occasional widget flashing
2013-04-04 11:20:51 -07:00
eea318c3e1
am f681be94: am c9d55c0d: Merge "Fixing issue where drag view is jumping when you scroll from hovering over an edge. (Bug 8522679)" into jb-mr2-dev
...
* commit 'f681be949fbb326a24b7b3ae8d329f5f62d86f5a':
Fixing issue where drag view is jumping when you scroll from hovering over an edge. (Bug 8522679)
2013-04-04 11:20:50 -07:00
7b6c0da329
am 78fbf987: Merge "Fix occasional widget flashing" into jb-mr2-dev
...
* commit '78fbf9871d3c377360b209ac73b0d6bb63480612':
Fix occasional widget flashing
2013-04-04 11:16:00 -07:00
f681be949f
am c9d55c0d: Merge "Fixing issue where drag view is jumping when you scroll from hovering over an edge. (Bug 8522679)" into jb-mr2-dev
...
* commit 'c9d55c0dd03d4e6ecf56f860e78140b779fa54c8':
Fixing issue where drag view is jumping when you scroll from hovering over an edge. (Bug 8522679)
2013-04-04 11:15:59 -07:00
78fbf9871d
Merge "Fix occasional widget flashing" into jb-mr2-dev
2013-04-04 18:11:19 +00:00
7607c2fb27
Fix occasional widget flashing
...
Bug: 7619759
Change-Id: Ic07ddfcc3ee76862691f940ad018f2c271d3614a
2013-04-04 11:10:40 -07:00
c9d55c0dd0
Merge "Fixing issue where drag view is jumping when you scroll from hovering over an edge. (Bug 8522679)" into jb-mr2-dev
2013-04-04 18:10:02 +00:00
061df1a1c1
am a119866d: am df96add0: Fix crash in draw listener
...
* commit 'a119866d10246124554cddb5980f0b068f92a6a0':
Fix crash in draw listener
2013-04-03 18:05:36 -07:00
33aa662ddb
am f1bfab47: Reconcile with jb-mr2-release - do not merge
...
* commit 'f1bfab47b89c8fab7811339c02848ee5a10ec335':
2013-04-03 18:05:29 -07:00
045d613fdd
Fix crash in draw listener
...
Bug: 8528246
Change-Id: Ie3600bed58dc393fcf71f735213a32b51551b52d
2013-04-03 17:03:53 -07:00
a119866d10
am df96add0: Fix crash in draw listener
...
* commit 'df96add095c82f9083f75305d8fa155c8192a4e6':
Fix crash in draw listener
2013-04-03 16:49:03 -07:00
df96add095
Fix crash in draw listener
...
Bug: 8528246
Change-Id: Ie3600bed58dc393fcf71f735213a32b51551b52d
2013-04-03 16:46:07 -07:00
f1bfab47b8
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Icf2700c6f34ca44ac74b72334809e3e5d3f14917
2013-04-03 16:43:39 -07:00
0191be1d67
am 526a09b3: Reconcile with jb-mr2-release - do not merge
...
* commit '526a09b39f2c4d80731bdb8352f00dd022fee3ad':
2013-04-02 11:04:17 -07:00
5164789faf
am c7322c31: am fe1fe268: Fixing RTL issues with apps ordering and snapping to page. (Bug 8238938, Bug 8374016, Bug 8373578)
...
* commit 'c7322c3146ab96bbc43aac8c5be271e8f97b5124':
Fixing RTL issues with apps ordering and snapping to page. (Bug 8238938, Bug 8374016, Bug 8373578)
2013-04-02 11:04:07 -07:00
e04112a20c
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-02 09:19:09 -07:00
526a09b39f
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ica8969ad3d63f92950481e984bfafc2b978cfda2
2013-04-02 08:39:45 -07:00
c7322c3146
am fe1fe268: Fixing RTL issues with apps ordering and snapping to page. (Bug 8238938, Bug 8374016, Bug 8373578)
...
* commit 'fe1fe268b6d9ffd99218117795b3524a87e5110b':
Fixing RTL issues with apps ordering and snapping to page. (Bug 8238938, Bug 8374016, Bug 8373578)
2013-04-02 08:24:20 -07:00
25460a1d5c
Fixing issue where drag view is jumping when you scroll from hovering over an edge. (Bug 8522679)
...
Change-Id: Ie523e718bd1b558db9608aa66f6c353e4b8e1a14
2013-04-01 18:21:28 -07:00
fe1fe268b6
Fixing RTL issues with apps ordering and snapping to page. (Bug 8238938, Bug 8374016, Bug 8373578)
...
Change-Id: I57ff58a6202a2794f02cfc13ed6124b10256dbbf
2013-04-01 17:07:39 -07:00
e05e6f277c
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-01 05:56:10 -07:00
a819b2c526
am 55d1fe8a: am e233a8bf: Hide clings in child mode
...
* commit '55d1fe8a903c5c065825616f752660aacfd8eeb3':
Hide clings in child mode
2013-03-29 16:06:13 -07:00
55d1fe8a90
am e233a8bf: Hide clings in child mode
...
* commit 'e233a8bf79d624c5419805fde4bb0e025c66b020':
Hide clings in child mode
2013-03-29 16:02:58 -07:00
Michael Jurka
The Android Open Source Project
The Android Automerger
Baligh Uddin
Fabrice Di Meglio
Winson Chung