Dianne Hackborn
7981909339
am 11d8481f: Merge "Fix framework side of #7132432 com.android.vending:..." into jb-mr1-dev
...
* commit '11d8481f10a12caef0cfd9be7fe86e61d953d58f':
Fix framework side of #7132432 com.android.vending:...
2012-10-02 09:26:34 -07:00
Dianne Hackborn
11d8481f10
Merge "Fix framework side of #7132432 com.android.vending:..." into jb-mr1-dev
2012-10-02 09:22:12 -07:00
Chris Wren
c03d65bba7
am 0f9deb3c: Merge "renaming Sleep Mode feature." into jb-mr1-dev
...
* commit '0f9deb3c1ab2c09ea59e5c53bfbb4fab9d9fa7e4':
renaming Sleep Mode feature.
2012-10-02 08:42:12 -07:00
Chris Wren
0f9deb3c1a
Merge "renaming Sleep Mode feature." into jb-mr1-dev
2012-10-02 08:40:03 -07:00
John Spurlock
81f8927884
am bd27ea2e: Merge "Update javadocs for DreamService." into jb-mr1-dev
...
* commit 'bd27ea2e125efd57676d34b4d6f24445f139c2e7':
Update javadocs for DreamService.
2012-10-02 07:58:32 -07:00
John Spurlock
bd27ea2e12
Merge "Update javadocs for DreamService." into jb-mr1-dev
2012-10-02 07:56:06 -07:00
Irfan Sheriff
06182b6158
am 56925d65: Always update peer list in display controller
...
* commit '56925d65fde7f1ac8676ada6f91d0e604645c0a5':
Always update peer list in display controller
2012-10-02 07:55:53 -07:00
Chris Wren
a64544748d
renaming Sleep Mode feature.
...
Bug: 7267485
Change-Id: If54495436f0df1c0bf90f9bb77b043e40884bbd7
2012-10-02 10:40:57 -04:00
Svetoslav Ganov
ef89d33f5b
am 30ed33b1: Merge "Owner should not be announces as a user switch." into jb-mr1-dev
...
* commit '30ed33b141dd1add916466c193b6735cd0bf8315':
Owner should not be announces as a user switch.
2012-10-01 23:33:27 -07:00
Svetoslav Ganov
a640417078
am 0a551d6b: Merge "Upading the strings for the global accessibility enabling gesture." into jb-mr1-dev
...
* commit '0a551d6b36ace1388bea572be1a5b7c53c506a51':
Upading the strings for the global accessibility enabling gesture.
2012-10-01 23:33:18 -07:00
Svetoslav Ganov
52f3c3eb89
am 5b7b999a: Merge "Hiding appropriate nodes for accessibility in recents. Bug: 6855305 Change-Id: I2c9fac2cfc777f912ff78283bbe6b3a9666f17c6" into jb-mr1-dev
...
* commit '5b7b999a1cd013be1a5e560c421bc21b60743373':
Hiding appropriate nodes for accessibility in recents. Bug: 6855305 Change-Id: I2c9fac2cfc777f912ff78283bbe6b3a9666f17c6
2012-10-01 23:33:14 -07:00
Adam Cohen
8d668b5a30
am 0207c099: Fixing a coupld lockscreen bugs
...
* commit '0207c0992cb05d0acc60540748c8ae6985917abb':
Fixing a coupld lockscreen bugs
2012-10-01 23:33:10 -07:00
Irfan Sheriff
56925d65fd
Always update peer list in display controller
...
Display controller should always stay in sync with peer list to avoid
showing incorrect available status on peers which would
cause connectivity issues.
Bug: 7268307
Change-Id: If04644339c1ee3f567939e4441dd6f6a45e4179a
2012-10-01 23:01:57 -07:00
Svetoslav Ganov
30ed33b141
Merge "Owner should not be announces as a user switch." into jb-mr1-dev
2012-10-01 21:19:11 -07:00
Svetoslav Ganov
0a551d6b36
Merge "Upading the strings for the global accessibility enabling gesture." into jb-mr1-dev
2012-10-01 21:19:11 -07:00
Svetoslav Ganov
5b7b999a1c
Merge "Hiding appropriate nodes for accessibility in recents. Bug: 6855305 Change-Id: I2c9fac2cfc777f912ff78283bbe6b3a9666f17c6" into jb-mr1-dev
2012-10-01 21:16:49 -07:00
Baligh Uddin
506a922469
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
2012-10-01 21:09:08 -07:00
Baligh Uddin
bab210d597
Revert "Import translations. DO NOT MERGE"
...
Broken build - sorry
This reverts commit a239b46722427ec7d37710c20917d97649b85127
Change-Id: Id74623459743790046573b2f018aee9a6b509886
2012-10-01 21:02:56 -07:00
Svetoslav Ganov
59f07690c2
Owner should not be announces as a user switch.
...
1. The accessibility layer announces user switches. Even though
the initial switch to the owner on a singe user device is a
valid use switch we should not announce it for accessibility.
bug:7264693
Change-Id: Idf022fab6b74c84b7a96bc4ed7c7fee2b83029a6
2012-10-01 19:22:43 -07:00
Adam Cohen
0207c0992c
Fixing a coupld lockscreen bugs
...
-> Showing correct page, as per discussions (issue 7205431)
-> Hide the time when the system status widget is showsing (issue 7216577)
Change-Id: I5b79d72e8fd8226952f6a8ea99b776feb4ddde1f
2012-10-01 19:13:56 -07:00
Svetoslav Ganov
9a455fbe71
Upading the strings for the global accessibility enabling gesture.
...
bug:7255486
Change-Id: I10b0e5a97518bbb442656c142bf2c822f897331b
2012-10-01 18:45:21 -07:00
Dianne Hackborn
689586d067
Fix framework side of #7132432 com.android.vending:...
...
...java.lang.IllegalStateException: Can not perform this action
after onSaveInstanceStateat android.support.v4.app.FragmentManagerImpl
.checkStateLoss(FragmentManager.java:1300)
Framework fragment manager also needs to be told its state is not
saved earlier.
Change-Id: Ie5bb327fca6208f7eea6146a1b3223c61c9ecef6
2012-10-01 18:23:04 -07:00
Jim Miller
fda4c4f848
am b35000f3: Merge "Attempt to fix missing lock sounds" into jb-mr1-dev
...
* commit 'b35000f3f48c5f2c620c4aa30275b92e38afb6c1':
Attempt to fix missing lock sounds
2012-10-01 18:20:19 -07:00
Jim Miller
b35000f3f4
Merge "Attempt to fix missing lock sounds" into jb-mr1-dev
2012-10-01 18:17:39 -07:00
Jim Miller
b14288d4b1
Attempt to fix missing lock sounds
...
bug 7254629
Change-Id: I65eee674fe014a0e84d5ec20ead81abdec38f890
2012-10-01 18:14:41 -07:00
Casey Burkhardt
2868059d93
Hiding appropriate nodes for accessibility in recents.
...
Bug: 6855305
Change-Id: I2c9fac2cfc777f912ff78283bbe6b3a9666f17c6
2012-10-01 17:57:16 -07:00
Victoria Lease
d8295ff432
am 3750db17: Merge "Route GPS notifications to all users." into jb-mr1-dev
...
* commit '3750db176adbaf3f9779df5eadf335f673b2ac4f':
Route GPS notifications to all users.
2012-10-01 17:50:18 -07:00
Dianne Hackborn
30b07b50ef
am 6f354ed9: Merge "Fix issue #7226101 : Secure image capture takes 5 seconds to start" into jb-mr1-dev
...
* commit '6f354ed9994b4ea7612cc4499413de108dcac7d4':
Fix issue #7226101 : Secure image capture takes 5 seconds to start
2012-10-01 17:50:15 -07:00
Victoria Lease
3750db176a
Merge "Route GPS notifications to all users." into jb-mr1-dev
2012-10-01 17:46:27 -07:00
Dianne Hackborn
6f354ed999
Merge "Fix issue #7226101 : Secure image capture takes 5 seconds to start" into jb-mr1-dev
2012-10-01 17:46:27 -07:00
Jeff Brown
67bd39b3b4
am 046cff13: Merge "Fix CTS test failures." into jb-mr1-dev
...
* commit '046cff13fc897e9e958ef387884eb97fd901840b':
Fix CTS test failures.
2012-10-01 17:44:56 -07:00
Jeff Brown
046cff13fc
Merge "Fix CTS test failures." into jb-mr1-dev
2012-10-01 17:41:53 -07:00
Jeff Brown
9ba8d78186
Fix CTS test failures.
...
Bug: 7001730
Change-Id: I5649b601c310458de5d64b549a407e251d745b7c
2012-10-01 17:34:07 -07:00
Baligh Uddin
a109e9478b
am 9f5ed35d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '9f5ed35d8afd23ecf5fea7e0a641a11feb039fdd':
Import translations. DO NOT MERGE
2012-10-01 17:33:05 -07:00
Ian Rogers
31c594f2d5
am bfa10630: Merge "Fix target utilization property_get." into jb-mr1-dev
...
* commit 'bfa10630c8da31b0a15095a6432595f12927dd7d':
Fix target utilization property_get.
2012-10-01 17:33:05 -07:00
Baligh Uddin
9f5ed35d8a
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-01 17:30:34 -07:00
Ian Rogers
7fef2b8a37
Fix target utilization property_get.
...
Copy and paste error where wrong compare meant the code thought a target
utilization option was specified even if there wasn't one.
b/7062303
Change-Id: Ibf1c6cf72743c5fbec7618a719d12d0373184754
2012-10-01 17:30:32 -07:00
Baligh Uddin
8146624382
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-01 17:27:20 -07:00
Ian Rogers
bfa10630c8
Merge "Fix target utilization property_get." into jb-mr1-dev
2012-10-01 17:25:55 -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
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
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
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
Dianne Hackborn
cc5a055613
Fix issue #7226101 : Secure image capture takes 5 seconds to start
...
Mostly (turned off) debug output. Main fix is to resume the next
activity if we are pausing while sleeping and the top activity is
not the now pausing activity. Also helped things by fixing a problem
where removing a task would leave around dead destroy timeout
messages.
Change-Id: I9d550c216b4d7e2afe3d93553bb680cec41e2ed1
2012-10-01 16:32:39 -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