Adam Cohen
0a5bc22273
Merge "Integrate keyguard paging hint" into jb-mr1-dev
2012-09-30 12:21:55 -07:00
Adam Cohen
b97a71e8bd
Merge "Getting rid of keyguard widget flag that isn't used" into jb-mr1-dev
2012-09-30 12:19:50 -07:00
Craig Mautner
61d32c0d0f
am a6efc965: Merge "Changing debug for b/7094175." into jb-mr1-dev
...
* commit 'a6efc965cc6f42ab88c08e48463ea4604d29cc77':
Changing debug for b/7094175.
2012-09-30 11:47:17 -07:00
Craig Mautner
a6efc965cc
Merge "Changing debug for b/7094175." into jb-mr1-dev
2012-09-30 11:45:32 -07:00
Fabrice Di Meglio
1a2fd69a1b
am ce75fef7: Merge "Fix the build" into jb-mr1-dev
...
* commit 'ce75fef756bb0d1c433eabc7e49b64fdb7bd609d':
Fix the build
2012-09-30 11:40:14 -07:00
Fabrice Di Meglio
3332a701e1
am 10c84edc: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev
...
* commit '10c84edcfa674f13d798f4de65f95c76269c6191':
Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
2012-09-30 11:37:00 -07:00
Fabrice Di Meglio
ce75fef756
Merge "Fix the build" into jb-mr1-dev
2012-09-30 11:36:47 -07:00
Romain Guy
25c8c198e6
am 8ed6b6a9: Merge "Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930 " into jb-mr1-dev
...
* commit '8ed6b6a96bf887e0b49c48838a9f22bb0f256296':
Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930
2012-09-30 11:35:16 -07:00
Fabrice Di Meglio
10c84edcfa
Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev
2012-09-30 11:33:31 -07:00
Fabrice Di Meglio
796e5bf9c3
Fix the build
...
Change-Id: I82c31a0091ee46d9e4923cf08f73f3db213c0762
2012-09-30 11:32:33 -07:00
Romain Guy
8ed6b6a96b
Merge "Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930 " into jb-mr1-dev
2012-09-30 11:28:54 -07:00
Romain Guy
dd2dd7bbb0
am 955b66d0: Merge "reset() should reset. Otherwise it would be called something else. Bug #7256095 " into jb-mr1-dev
...
* commit '955b66d07db37bcec379a5cb9ea01aa72c54cdb4':
reset() should reset. Otherwise it would be called something else. Bug #7256095
2012-09-30 11:26:41 -07:00
Romain Guy
af61cc4cbb
Perform a long computation to catch bitmap sizes > 32 bits
...
Bug #7257930
Change-Id: I28d08024fabe8103251d480524b0b0f2fd2d2aba
2012-09-30 11:26:39 -07:00
Dianne Hackborn
fc4947491f
Update APIs to JB MR1 level 17.
...
17 is current, resources are fixed, cleanup is done.
Change-Id: I6de446e209f59c5dd5fe1cde311776ab222817ea
2012-09-30 11:24:23 -07:00
Romain Guy
955b66d07d
Merge "reset() should reset. Otherwise it would be called something else. Bug #7256095 " into jb-mr1-dev
2012-09-30 11:23:51 -07:00
Fabrice Di Meglio
47fb191841
Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
...
- do not need those variables. Use what we already have in View.
- reset padding to initial values before changing it.
Change-Id: Ib396b3dca6e98a94d83a538a9b594b5eb426c453
2012-09-30 11:00:02 -07:00
Fabrice Di Meglio
93cea34a7f
am f2e5cf48: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
...
* commit 'f2e5cf487e9bda4da1b902cb5c816ba48c9b7004':
Fix bug #6427629 Clean up layout direction APIs
2012-09-30 10:55:18 -07:00
Fabrice Di Meglio
f2e5cf487e
Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
2012-09-30 10:53:26 -07:00
Baligh Uddin
c4e7719c32
am ce803d8e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'ce803d8ed8350179a8474564df8ff26be32bbe5e':
Import translations. DO NOT MERGE
2012-09-30 06:46:13 -07:00
Baligh Uddin
ce803d8ed8
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-30 06:43:10 -07:00
Svetoslav Ganov
82e21b33bd
am 9ea8f390: Explore by touch enabled when screen magnification is on.
...
* commit '9ea8f390dbe8123415b9d64ce1a31683012958d9':
Explore by touch enabled when screen magnification is on.
2012-09-29 23:54:17 -07:00
Craig Mautner
c36c49ee83
Changing debug for b/7094175.
...
Fixes bug 7094175 (but not really).
Change-Id: Ice2abb93f479ea0bda931e9643710668c25aa285
2012-09-29 16:02:43 -07:00
Svetoslav Ganov
9ea8f390db
Explore by touch enabled when screen magnification is on.
...
1. A recently added check was preventing touch exploration being
disabled when the last touch exploring service was turned off.
As a consequence enabling explore by touch was initializing the
input filter with the magnification and the not disabled
screen magnification features.
bug:7256223
Change-Id: I9ed5457705d625805462e4d316b2c8a5af9aabca
2012-09-29 10:46:16 -07:00
Mike Cleron
eb43858ea0
am a995b6e3: Merge "Getting rid of blue outline in user switcher, instead brighten the user" into jb-mr1-dev
...
* commit 'a995b6e37f20b3e7eebfb37d8868c1bc14906204':
Getting rid of blue outline in user switcher, instead brighten the user
2012-09-28 19:44:59 -07:00
Mike Cleron
a995b6e37f
Merge "Getting rid of blue outline in user switcher, instead brighten the user" into jb-mr1-dev
2012-09-28 19:43:16 -07:00
Jim Miller
c1aa6a54a7
Integrate keyguard paging hint
...
Bug 7232481
Change-Id: I1959ae61b8f5afd055158dad67bdceecc4870d24
2012-09-28 19:37:26 -07:00
Adam Cohen
82ebe6f777
Getting rid of keyguard widget flag that isn't used
...
-> issue 7238875
Change-Id: Ifad890b4061784889f3fc7711a165452cf230fbd
2012-09-28 19:33:05 -07:00
Adam Cohen
9654329008
Getting rid of blue outline in user switcher, instead brighten the user
...
Change-Id: I4817615cc28eb1fea35ecb5c3d69c4298c9cf2cf
2012-09-28 19:28:41 -07:00
Romain Guy
885d82d427
reset() should reset. Otherwise it would be called something else.
...
Bug #7256095
Change-Id: I610bbcaccdceaf2b5bb5f9d231283335911d4cd9
2012-09-28 19:24:37 -07:00
Jeff Brown
489c1e9f82
am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev
...
* commit '7f813202cb08a829b59e17be749ffee4a2f482b8':
Get rid of preventScreenOn().
2012-09-28 19:08:17 -07:00
Jeff Brown
7f813202cb
Merge "Get rid of preventScreenOn()." into jb-mr1-dev
2012-09-28 19:05:52 -07:00
Jatin Lodhia
bf07c7a93f
am 7c3586c5: Merge "Make the theme for choose account and choose account type dialogs same." into jb-mr1-dev
...
* commit '7c3586c576c7f7238274f1ffbc4577a57be0d1f1':
Make the theme for choose account and choose account type dialogs same.
2012-09-28 18:53:46 -07:00
Jatin Lodhia
7c3586c576
Merge "Make the theme for choose account and choose account type dialogs same." into jb-mr1-dev
2012-09-28 18:50:20 -07:00
Jim Miller
7b4386c617
am 1ed143ea: Merge "Clean up SIM PIN and PUK screens in keyguard." into jb-mr1-dev
...
* commit '1ed143ea341d2dac29cc3aafaf2fbeb1b13c5251':
Clean up SIM PIN and PUK screens in keyguard.
2012-09-28 18:42:29 -07:00
Jim Miller
1ed143ea34
Merge "Clean up SIM PIN and PUK screens in keyguard." into jb-mr1-dev
2012-09-28 18:40:43 -07:00
Fabrice Di Meglio
343e11345e
Fix bug #6427629 Clean up layout direction APIs
...
- remove onPaddingChanged(int) and fold it into onRtlPropertiesChanged(int)
Change-Id: I1d7f02d2b4538c6c991bd4285501bbc73e6aa5c3
2012-09-28 18:26:07 -07:00
Irfan Sheriff
bccfd5f2dc
am d3081bc9: Merge "Revert setting GO idle time out" into jb-mr1-dev
...
* commit 'd3081bc9a7bc4e3d729005d1841d2834c1fd62b5':
Revert setting GO idle time out
2012-09-28 18:24:07 -07:00
Jeff Brown
120664816a
Get rid of preventScreenOn().
...
Bug: 7165399
Change-Id: I1968265ecd74fff4d85efd2ca03b1983425ea518
2012-09-28 18:21:36 -07:00
Irfan Sheriff
d3081bc9a7
Merge "Revert setting GO idle time out" into jb-mr1-dev
2012-09-28 18:20:12 -07:00
Dianne Hackborn
66e9275226
am 84215565: Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
...
* commit '84215565dd5dda84db7fd35b8ae4ccb571465cd2':
Fix issue #7255954 : API Review: rename Dream to DreamService
2012-09-28 18:20:02 -07:00
Jason Sams
1ebb7202b6
Lighten grain and make live preview gpu friendly.
...
Preview now does yuv->rgb using the intrinsic
script. Grain uses a smaller wrapped rand buffer
so it is not just rand test.
bug 7216044
Change-Id: If74eedc7d3cf264895133671edc546af9b1527f2
2012-09-28 18:17:47 -07:00
Dianne Hackborn
84215565dd
Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
2012-09-28 18:17:13 -07:00
Dianne Hackborn
be87e2f588
Fix issue #7255954 : API Review: rename Dream to DreamService
...
Change-Id: I89ecf2c3ec4fef09c0495aa68de11576f9cfd872
2012-09-28 17:42:39 -07:00
Svetoslav Ganov
45cde607d5
am c5211780: Merge "Sending interaction end event at the end of a drag." into jb-mr1-dev
...
* commit 'c5211780ce60cd77d31b4df0f708bb760daddd5d':
Sending interaction end event at the end of a drag.
2012-09-28 17:41:04 -07:00
Svetoslav Ganov
c5211780ce
Merge "Sending interaction end event at the end of a drag." into jb-mr1-dev
2012-09-28 17:38:33 -07:00
Jean-Baptiste Queru
d872651d2f
Merge from jb-mr1-aah-dev
...
Change-Id: I80cbfca156c24f9dc1c4e1c0c717a7de2851c521
2012-09-28 17:12:26 -07:00
Robert Greenwalt
9b3f7096a5
am 2c22bb85: Merge "Update Premium-SMS detection UI." into jb-mr1-dev
...
* commit '2c22bb85f2f6233eb3986f37b92386000433c7aa':
Update Premium-SMS detection UI.
2012-09-28 17:10:00 -07:00
Adam Powell
7fb07337f8
am 4984ec72: Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev
...
* commit '4984ec7222d86a9b507a9961363bf50d2b72df1b':
Fix adjustViewBounds handling for ImageView
2012-09-28 17:09:51 -07:00
Fabrice Di Meglio
d35b2dc7cc
am be290dd8: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev
...
* commit 'be290dd850c8e2c31830e2a87205499586f55353':
Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
2012-09-28 17:09:45 -07:00
Craig Mautner
f362877193
am 106a6927: Merge "Keep callback reference from being null." into jb-mr1-dev
...
* commit '106a69271dd303baae1c428e269e1ec62994ff57':
Keep callback reference from being null.
2012-09-28 17:09:41 -07:00