Baligh Uddin
448858dff3
am aae92acf: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'aae92acf9c44a2ee27c0010e62e0703bda485fe8':
Import translations. DO NOT MERGE
2012-10-01 17:20:31 -07:00
Baligh Uddin
aae92acf9c
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-01 17:17:42 -07:00
Fabrice Di Meglio
36eeab6813
am 43f5815c: am 2b77c102: Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev
...
* commit '43f5815c488a674dc02384c2f0c708ca55ef55c5':
Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
2012-10-01 16:59:23 -07:00
Jeff Brown
7b5ec18984
am 6b6e710c: am f16b6256: Merge "Allow "factory.long_press_power_off" to be toggled at runtime." into jb-mr1-dev
...
* commit '6b6e710c6518481218c90ef678430a9ab308b8c5':
Allow "factory.long_press_power_off" to be toggled at runtime.
2012-10-01 16:59:20 -07:00
Fabrice Di Meglio
43f5815c48
am 2b77c102: Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev
...
* commit '2b77c102d231c692cc6cbe22b23a4183ea5a9ecc':
Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
2012-10-01 16:55:57 -07:00
Jeff Brown
6b6e710c65
am f16b6256: Merge "Allow "factory.long_press_power_off" to be toggled at runtime." into jb-mr1-dev
...
* commit 'f16b6256ebb613d53efea202c603e72ba7517e48':
Allow "factory.long_press_power_off" to be toggled at runtime.
2012-10-01 16:55:53 -07:00
Fabrice Di Meglio
2b77c102d2
Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev
2012-10-01 16:52:37 -07:00
Jeff Brown
f16b6256eb
Merge "Allow "factory.long_press_power_off" to be toggled at runtime." into jb-mr1-dev
2012-10-01 16:52:37 -07:00
Svetoslav Ganov
f7d1589067
am e56dfc1f: am d8357cee: Merge "Sets accessibility importance for the home/up button. Bug: 7196985 Change-Id: I4d27470eccb8933f751db892218a8032a80df3da" into jb-mr1-dev
...
* commit 'e56dfc1f8cf588b8e13b4991858385c984bc5436':
Sets accessibility importance for the home/up button. Bug: 7196985 Change-Id: I4d27470eccb8933f751db892218a8032a80df3da
2012-10-01 16:46:39 -07:00
Svetoslav Ganov
e56dfc1f8c
am d8357cee: Merge "Sets accessibility importance for the home/up button. Bug: 7196985 Change-Id: I4d27470eccb8933f751db892218a8032a80df3da" into jb-mr1-dev
...
* commit 'd8357ceec04ca8b9d8a5e25cb5484ce8f8e56e00':
Sets accessibility importance for the home/up button. Bug: 7196985 Change-Id: I4d27470eccb8933f751db892218a8032a80df3da
2012-10-01 16:43:31 -07:00
Craig Mautner
80944c5c92
am 397c8629: am b97d8764: Merge "Switch from uevent model to /dev/input/event." into jb-mr1-dev
...
* commit '397c862913c2c50e54d18dee7766b0ac93971ae3':
Switch from uevent model to /dev/input/event.
2012-10-01 16:43:27 -07:00
Craig Mautner
397c862913
am b97d8764: Merge "Switch from uevent model to /dev/input/event." into jb-mr1-dev
...
* commit 'b97d8764a0aa600d7bcc6242e7173453c87ee658':
Switch from uevent model to /dev/input/event.
2012-10-01 16:40:24 -07:00
Svetoslav Ganov
d8357ceec0
Merge "Sets accessibility importance for the home/up button. Bug: 7196985 Change-Id: I4d27470eccb8933f751db892218a8032a80df3da" into jb-mr1-dev
2012-10-01 16:40:18 -07:00
Craig Mautner
b97d8764a0
Merge "Switch from uevent model to /dev/input/event." into jb-mr1-dev
2012-10-01 16:38:46 -07:00
Fabrice Di Meglio
44bfaedd1e
am 338a3853: am efe9b483: Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev
...
* commit '338a3853e8cdd05fb87d623d8a1b476a329646e3':
Fix bug #7259242 text is left justified with no padding
2012-10-01 16:09:08 -07:00
Fabrice Di Meglio
338a3853e8
am efe9b483: Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev
...
* commit 'efe9b483547ac44dbc88bdfd6a54be5c95c2d889':
Fix bug #7259242 text is left justified with no padding
2012-10-01 16:06:58 -07:00
Fabrice Di Meglio
efe9b48354
Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev
2012-10-01 16:04:40 -07:00
Adam Powell
5c68e4003b
am e9234dd1: am 075bb6b3: Merge "DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout" into jb-mr1-dev
...
* commit 'e9234dd1edc8988f41f1cb947e4df6e245d37cd1':
DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout
2012-10-01 16:00:11 -07:00
Scott Main
e11a1dc965
am ba66dc3b: am 7fde078e: am e9d5d627: am 94b94fc5: am 32a1d2db: dashboard update for 10/1
...
* commit 'ba66dc3bb83d334ceab6882433a1584d6e07c065':
dashboard update for 10/1
2012-10-01 15:58:17 -07:00
Casey Burkhardt
4aeb961de2
Sets accessibility importance for the home/up button.
...
Bug: 7196985
Change-Id: I4d27470eccb8933f751db892218a8032a80df3da
2012-10-01 15:57:17 -07:00
Adam Powell
e9234dd1ed
am 075bb6b3: Merge "DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout" into jb-mr1-dev
...
* commit '075bb6b3dfb9e58aa44c3b8588ab233a832956a3':
DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout
2012-10-01 15:56:58 -07:00
Scott Main
ba66dc3bb8
am 7fde078e: am e9d5d627: am 94b94fc5: am 32a1d2db: dashboard update for 10/1
...
* commit '7fde078e06313751a1bdce0740329fd97fe405b7':
dashboard update for 10/1
2012-10-01 15:55:09 -07:00
Adam Powell
075bb6b3df
Merge "DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout" into jb-mr1-dev
2012-10-01 15:53:49 -07:00
Fabrice Di Meglio
6e6d78116b
Fix bug #7259242 text is left justified with no padding
...
(padding is still hard)
- fix Toasts: basically the background drawable padding was not
taken into account
Change-Id: Iefd29782f50b6f6a56578cfeb2af119d381207f0
2012-10-01 15:53:01 -07:00
Scott Main
7fde078e06
am e9d5d627: am 94b94fc5: am 32a1d2db: dashboard update for 10/1
...
* commit 'e9d5d6271eeaef696891740ab830fbf7e7df6681':
dashboard update for 10/1
2012-10-01 15:52:09 -07:00
Scott Main
e9d5d6271e
am 94b94fc5: am 32a1d2db: dashboard update for 10/1
...
* commit '94b94fc5b35f3e55574ce8b12b65e46f0144d743':
dashboard update for 10/1
2012-10-01 15:49:15 -07:00
Scott Main
94b94fc5b3
am 32a1d2db: dashboard update for 10/1
...
* commit '32a1d2dbf9e396ae77bc621ec583c92b6774ed32':
dashboard update for 10/1
2012-10-01 15:46:20 -07:00
Jeff Brown
9c1a6f402b
am 0fa30848: am 410bc60a: Merge changes I790820b1,I3fcf3619,Ia0d5a156 into jb-mr1-dev
...
* commit '0fa30848638df704ce40e163652635fbfde5843c':
Enable hardware acceleration for pointer location overlay.
Disable use of twilight mode for auto-brightness.
Use new API to override user activity timeout from keyguard.
2012-10-01 15:27:27 -07:00
Jeff Brown
0fa3084863
am 410bc60a: Merge changes I790820b1,I3fcf3619,Ia0d5a156 into jb-mr1-dev
...
* commit '410bc60a77ee3ba6e596e84d44ec23f3325ae310':
Enable hardware acceleration for pointer location overlay.
Disable use of twilight mode for auto-brightness.
Use new API to override user activity timeout from keyguard.
2012-10-01 15:25:35 -07:00
Jeff Brown
13176e639c
am cd781ce2: am cb6f950f: Merge "New internal API to eliminate poke locks." into jb-mr1-dev
...
* commit 'cd781ce2ebc104cf83d630889ae330a980635c9e':
New internal API to eliminate poke locks.
2012-10-01 15:25:30 -07:00
Jeff Brown
cd781ce2eb
am cb6f950f: Merge "New internal API to eliminate poke locks." into jb-mr1-dev
...
* commit 'cb6f950f15919794d26a55c20090fe5dacd11e4a':
New internal API to eliminate poke locks.
2012-10-01 15:22:45 -07:00
Jeff Brown
410bc60a77
Merge changes I790820b1,I3fcf3619,Ia0d5a156 into jb-mr1-dev
...
* changes:
Enable hardware acceleration for pointer location overlay.
Disable use of twilight mode for auto-brightness.
Use new API to override user activity timeout from keyguard.
2012-10-01 15:22:43 -07:00
Chris Craik
63808449ca
am 385f4478: am 4b08e074: Merge "Quick reject empty paths" into jb-mr1-dev
...
* commit '385f4478a2eef0a93873eae9a846dd7712e5cabd':
Quick reject empty paths
2012-10-01 15:22:14 -07:00
Jeff Brown
cb6f950f15
Merge "New internal API to eliminate poke locks." into jb-mr1-dev
2012-10-01 15:20:23 -07:00
Chris Craik
385f4478a2
am 4b08e074: Merge "Quick reject empty paths" into jb-mr1-dev
...
* commit '4b08e07477f1763a93d9658f618606c1f1e9f249':
Quick reject empty paths
2012-10-01 15:19:28 -07:00
Jeff Brown
850c5b7ca5
Allow "factory.long_press_power_off" to be toggled at runtime.
...
Bug: 6847329
Change-Id: I7a303dba4482c1897d38f9064a2c49583218ffd0
2012-10-01 15:17:22 -07:00
Chris Craik
4b08e07477
Merge "Quick reject empty paths" into jb-mr1-dev
2012-10-01 15:16:23 -07:00
Fabrice Di Meglio
8135814af2
am 9b6f05f8: am 749a9970: Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev
...
* commit '9b6f05f8df9a754f5240b610c556d7946aa7aad8':
Fix bug #7259242 text is left justified with no padding
2012-10-01 15:08:45 -07:00
Adam Powell
5d3c3e2a98
am 7b5a57c4: am 3f00ffbe: Merge "MediaRouter/Wifi Display improvements" into jb-mr1-dev
...
* commit '7b5a57c414f3ec5693cb0ad4d9e4f1d3b1df3361':
MediaRouter/Wifi Display improvements
2012-10-01 15:08:41 -07:00
Victoria Lease
b57852ab87
am 80faaa35: am 2961d111: Merge "Avoid NPE in GpsLocationProvider" into jb-mr1-dev
...
* commit '80faaa3558a6d21990ae6bcf24eb7f8015db710f':
Avoid NPE in GpsLocationProvider
2012-10-01 15:06:57 -07:00
Adam Powell
946d05b95f
DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout
...
MeasureSpec.makeMeasureSpec has a bug where a negative or very large
size parameter will cause the resulting MeasureSpec value to
overflow. RelativeLayout partially relies on this when measuring
children with mode UNSPECIFIED; a default value of -1 in a local
variable ends up being passed to makeMeasureSpec, overflowing a mode
value to create a measurespec that is very large in size, with AT_MOST
as the mode. The correct behavior is for RelativeLayout to propagate
the UNSPECIFIED mode.
Unfortunately a number of custom view implementations in apps rely on
the buggy behavior as they do not implement their own onMeasure
method. This makes them fall back to View's default onMeasure
implementation, which accepts the spec's size unconditionally for
AT_MOST or EXACTLY modes, but falls back on
getSuggestedMinimum[Width|Height] for UNSPECIFIED. If the view had no
background drawable with dimensions and no minWidth field set, this
fix for RelativeLayout causes some views to measure with a size of 0
rather than a size of the 30-bit version of 0xFF...
Revert these fixes in the interests of compatibility. The next version
will conditionally use the new behavior if targetSdk > JB-MR1.
This also required reverting a fix for ImageView's adjustViewBounds
functionality, as it cannot be implemented reliably if this
RelativeLayout fix is not also in place.
Revert "Fix UNSPECIFIED measurement in RelativeLayout"
This reverts commit 132a742b94b9716451ddef30cec20548b346f1b9.
Revert "Fix adjustViewBounds handling for ImageView"
This reverts commit d5edc7721791ad807b9a8fbd923b8d6e73c399cc.
2012-10-01 15:06:46 -07:00
Fabrice Di Meglio
9b6f05f8df
am 749a9970: Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev
...
* commit '749a997093751a5d2e5b71f0ae3ab5b7527b68bd':
Fix bug #7259242 text is left justified with no padding
2012-10-01 15:06:19 -07:00
Adam Powell
7b5a57c414
am 3f00ffbe: Merge "MediaRouter/Wifi Display improvements" into jb-mr1-dev
...
* commit '3f00ffbe2b97f8acd9edcd683ed48cc65710e6f1':
MediaRouter/Wifi Display improvements
2012-10-01 15:04:37 -07:00
Fabrice Di Meglio
749a997093
Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev
2012-10-01 15:04:03 -07:00
Victoria Lease
80faaa3558
am 2961d111: Merge "Avoid NPE in GpsLocationProvider" into jb-mr1-dev
...
* commit '2961d111570d310b3ba504784e7cff651bc93207':
Avoid NPE in GpsLocationProvider
2012-10-01 15:02:34 -07:00
Adam Powell
3f00ffbe2b
Merge "MediaRouter/Wifi Display improvements" into jb-mr1-dev
2012-10-01 15:01:25 -07:00
Victoria Lease
2961d11157
Merge "Avoid NPE in GpsLocationProvider" into jb-mr1-dev
2012-10-01 14:59:57 -07:00
Jeff Brown
90fc905919
Enable hardware acceleration for pointer location overlay.
...
Bug: 7256639
Change-Id: I790820b18365c126afc500a5ea3d222bc1ea2774
2012-10-01 14:44:24 -07:00
Jeff Brown
db21284a7f
Disable use of twilight mode for auto-brightness.
...
This adjustment is still experimental.
Bug: 7165399
Change-Id: I3fcf361933995d02a5329eeaec80155b39371ba3
2012-10-01 14:33:42 -07:00
Craig Mautner
3840b27b5e
am 190ca7dd: am 1f7a09b5: Merge "Only inform DisplayManager of visible content." into jb-mr1-dev
...
* commit '190ca7ddad52ad78a0f313313ab744ed4c7848c8':
Only inform DisplayManager of visible content.
2012-10-01 14:27:53 -07:00