Adam Cohen
c00a311b30
am 6d9c3992: am 0a5bc222: Merge "Integrate keyguard paging hint" into jb-mr1-dev
...
* commit '6d9c3992defced0c0f2779576a10957f7d42c7ff':
Integrate keyguard paging hint
2012-10-01 10:15:22 -07:00
Adam Cohen
2e16cf67c1
am e1430669: am b97a71e8: Merge "Getting rid of keyguard widget flag that isn\'t used" into jb-mr1-dev
...
* commit 'e14306690096fc3a1ae78f411ba9a7b616224df7':
Getting rid of keyguard widget flag that isn't used
2012-10-01 10:15:17 -07:00
Craig Mautner
7b9a263b50
am 61d32c0d: am a6efc965: Merge "Changing debug for b/7094175." into jb-mr1-dev
...
* commit '61d32c0d0f05a394129e03d774589b8d93f5f8fb':
Changing debug for b/7094175.
2012-10-01 10:15:05 -07:00
Fabrice Di Meglio
6065c73e9f
am 1a2fd69a: am ce75fef7: Merge "Fix the build" into jb-mr1-dev
...
* commit '1a2fd69a1b53b990518c73b85e434fd5d08a92f4':
Fix the build
2012-10-01 10:14:53 -07:00
Fabrice Di Meglio
e05c172638
am 3332a701: am 10c84edc: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev
...
* commit '3332a701e1cd6453089d7b0c6501c7f37cb69327':
Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
2012-10-01 10:14:47 -07:00
Romain Guy
d49faf39ec
am 25c8c198: am 8ed6b6a9: Merge "Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930 " into jb-mr1-dev
...
* commit '25c8c198e6abc053fbba19145ed485e31dc5927e':
Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930
2012-10-01 10:14:40 -07:00
Romain Guy
b9a0a23111
am dd2dd7bb: am 955b66d0: Merge "reset() should reset. Otherwise it would be called something else. Bug #7256095 " into jb-mr1-dev
...
* commit 'dd2dd7bbb0cac897db9406f7271689e36397b80e':
reset() should reset. Otherwise it would be called something else. Bug #7256095
2012-10-01 10:14:37 -07:00
Fabrice Di Meglio
840ea01fcb
am 93cea34a: am f2e5cf48: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
...
* commit '93cea34a7f7834f42f921402415f7797b677e442':
Fix bug #6427629 Clean up layout direction APIs
2012-10-01 10:14:31 -07:00
Baligh Uddin
e4fc679d57
am c4e7719c: am ce803d8e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c4e7719c3253074bb06777c41649ec8ff7c50302':
Import translations. DO NOT MERGE
2012-10-01 10:14:23 -07:00
Svetoslav Ganov
798af86dcc
am 82e21b33: am 9ea8f390: Explore by touch enabled when screen magnification is on.
...
* commit '82e21b33bde057ba21dde9ee2023d785b4b5a757':
Explore by touch enabled when screen magnification is on.
2012-10-01 10:14:19 -07:00
Mike Cleron
25bc59dd08
am eb43858e: am a995b6e3: Merge "Getting rid of blue outline in user switcher, instead brighten the user" into jb-mr1-dev
...
* commit 'eb43858ea041dcb61b2de94f8fa9d069be5fc93c':
Getting rid of blue outline in user switcher, instead brighten the user
2012-10-01 10:13:58 -07:00
Jeff Brown
843b014aca
am 489c1e9f: am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev
...
* commit '489c1e9f82250770004ec9080778546b040f6146':
Get rid of preventScreenOn().
2012-10-01 10:13:52 -07:00
Jatin Lodhia
6c7169722f
am bf07c7a9: am 7c3586c5: Merge "Make the theme for choose account and choose account type dialogs same." into jb-mr1-dev
...
* commit 'bf07c7a93f7d8ae2d67eecf98ad76e60212e161b':
Make the theme for choose account and choose account type dialogs same.
2012-10-01 10:13:47 -07:00
Jim Miller
7b439a0e11
am 7b4386c6: am 1ed143ea: Merge "Clean up SIM PIN and PUK screens in keyguard." into jb-mr1-dev
...
* commit '7b4386c6177c874208f7f221787fca9079d2b7c4':
Clean up SIM PIN and PUK screens in keyguard.
2012-10-01 10:13:43 -07:00
Irfan Sheriff
97a59e3be1
am bccfd5f2: am d3081bc9: Merge "Revert setting GO idle time out" into jb-mr1-dev
...
* commit 'bccfd5f2dc0674ee8ae3c2fbf1482843393f72d6':
Revert setting GO idle time out
2012-10-01 10:13:34 -07:00
Dianne Hackborn
d698542867
am 66e92752: am 84215565: Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
...
* commit '66e92752260e4ef21e77a44379f3a6b8969b4d65':
Fix issue #7255954 : API Review: rename Dream to DreamService
2012-10-01 10:13:25 -07:00
Svetoslav Ganov
8173646ea4
am 45cde607: am c5211780: Merge "Sending interaction end event at the end of a drag." into jb-mr1-dev
...
* commit '45cde607d5c6dfe39675a12d3bc47a0bc74565a2':
Sending interaction end event at the end of a drag.
2012-10-01 10:13:12 -07:00
Adam Cohen
6d9c3992de
am 0a5bc222: Merge "Integrate keyguard paging hint" into jb-mr1-dev
...
* commit '0a5bc22273fc274a0d4bd9aa4bc80ee5116e11ef':
Integrate keyguard paging hint
2012-09-30 12:24:04 -07:00
Adam Cohen
e143066900
am b97a71e8: Merge "Getting rid of keyguard widget flag that isn\'t used" into jb-mr1-dev
...
* commit 'b97a71e8bd9877f4d4e47ec41408079552ab165b':
Getting rid of keyguard widget flag that isn't used
2012-09-30 12:22:20 -07:00
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
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