Jeff Brown
131c791954
am 33c30e36: am 102e97bb: am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev
...
* commit '33c30e36a5f2630cf7f3b2bced899009fead3460':
Blank or unblank all displays as need.
2012-10-09 00:09:35 -07:00
Jeff Brown
33c30e36a5
am 102e97bb: am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev
...
* commit '102e97bb6dda1b211acbc4e6e3d3ae58039c9a0d':
Blank or unblank all displays as need.
2012-10-09 00:07:05 -07:00
Jeff Brown
102e97bb6d
am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev
...
* commit '8f4baad387d8ad63efbc05cfa8c4e4c472793deb':
Blank or unblank all displays as need.
2012-10-09 00:05:26 -07:00
Jeff Brown
9e316a1a2a
Blank or unblank all displays as need.
...
Ensures that both the internal display and HDMI are blanked
or unblanked in tandem.
Bug: 7309812
Change-Id: Ie8b96d393e8bb20d23c92f3320142d9f7cf42aff
2012-10-08 19:23:15 -07:00
Dianne Hackborn
94feaa3b3b
am a4c88ee9: am 1b94df8a: am 4efbab48: Merge "Framework side of issue #7302511 : GCM client needs to use new framework API..." into jb-mr1-dev
...
* commit 'a4c88ee991e452d0adbc3a5f1bcdc00a68afcc77':
Framework side of issue #7302511 : GCM client needs to use new framework API...
2012-10-08 16:22:17 -07:00
Dianne Hackborn
a4c88ee991
am 1b94df8a: am 4efbab48: Merge "Framework side of issue #7302511 : GCM client needs to use new framework API..." into jb-mr1-dev
...
* commit '1b94df8af9a6922bfba7e2ecca24bb0d7578a8e2':
Framework side of issue #7302511 : GCM client needs to use new framework API...
2012-10-08 15:15:36 -07:00
Dianne Hackborn
1b94df8af9
am 4efbab48: Merge "Framework side of issue #7302511 : GCM client needs to use new framework API..." into jb-mr1-dev
...
* commit '4efbab480d7e1b770c5515a76b897359730c1a4d':
Framework side of issue #7302511 : GCM client needs to use new framework API...
2012-10-08 15:05:04 -07:00
Dianne Hackborn
4efbab480d
Merge "Framework side of issue #7302511 : GCM client needs to use new framework API..." into jb-mr1-dev
2012-10-08 15:02:56 -07:00
Dianne Hackborn
36d337adff
Framework side of issue #7302511 : GCM client needs to use new framework API...
...
...to fix background->shutdown delivery race
Add ACTION_STOPPING and ACTION_STARTING to allow such apps to keep track of
which users are started/stopped, and be involved in the process of stopping
a user.
Also get rid of the scale part of the wallpaper transitions, since it seems
like I have still failed at getting the user switch to wait until the new
wallpaper is displayed.
Change-Id: If7e8fdae3544a9d7987a1b9274dc8b49022f6f62
2012-10-08 14:33:47 -07:00
Justin Mattson
386800e7c8
am 25e9ace1: am a009ee22: Merge "Reverse movement direction of DPAD events" into jb-mr1-aah-dev
...
* commit '25e9ace1211edaa6c6f36e6ff550d21c330fad56':
Reverse movement direction of DPAD events
2012-10-08 12:57:11 -07:00
Justin Mattson
25e9ace121
am a009ee22: Merge "Reverse movement direction of DPAD events" into jb-mr1-aah-dev
...
* commit 'a009ee2261ee68d0d8c0efb6d1670ecb29252ba5':
Reverse movement direction of DPAD events
2012-10-08 12:55:15 -07:00
Justin Mattson
a009ee2261
Merge "Reverse movement direction of DPAD events" into jb-mr1-aah-dev
2012-10-08 12:52:36 -07:00
Raph Levien
cb98505e94
am e9d419f5: am 6594eca0: am 9704b563: Merge "Fix for 7301594 Html.toHtml creating potentially invalid html" into jb-mr1-dev
...
* commit 'e9d419f524317828a5edaf2b3350acaacf91cab8':
Fix for 7301594 Html.toHtml creating potentially invalid html
2012-10-08 12:47:56 -07:00
Raph Levien
e9d419f524
am 6594eca0: am 9704b563: Merge "Fix for 7301594 Html.toHtml creating potentially invalid html" into jb-mr1-dev
...
* commit '6594eca0a9d9e9e0b429f950a673fa1820d43813':
Fix for 7301594 Html.toHtml creating potentially invalid html
2012-10-08 12:46:03 -07:00
Raph Levien
6594eca0a9
am 9704b563: Merge "Fix for 7301594 Html.toHtml creating potentially invalid html" into jb-mr1-dev
...
* commit '9704b563d63d8b5fe8e568dfb7190f8440b56698':
Fix for 7301594 Html.toHtml creating potentially invalid html
2012-10-08 12:43:12 -07:00
Raph Levien
9704b563d6
Merge "Fix for 7301594 Html.toHtml creating potentially invalid html" into jb-mr1-dev
2012-10-08 12:40:17 -07:00
Justin Mattson
86cf0cdfe1
Reverse movement direction of DPAD events
...
The first way I had it produces somewhat unexpected behavior. If you
scroll past the top of the list, focus moves down to the control
below.
This changes it so scrolling past the bottom of the list moves focus
to the next control below.
Change-Id: I886e1854df85ceb203dac61c7f8c7daf6749e90e
2012-10-08 11:59:38 -07:00
Justin Koh
39952fa74b
am 4e6e0ace: am 1a7cfd67: Merge "Fix for the clearing of fling events" into jb-mr1-aah-dev
...
* commit '4e6e0ace3309d74b582e2d18e7df5e788beeb5da':
Fix for the clearing of fling events
2012-10-08 11:00:34 -07:00
Justin Koh
4e6e0ace33
am 1a7cfd67: Merge "Fix for the clearing of fling events" into jb-mr1-aah-dev
...
* commit '1a7cfd67c2b3f789e6be420958dff60034884491':
Fix for the clearing of fling events
2012-10-08 10:54:32 -07:00
Justin Koh
1a7cfd67c2
Merge "Fix for the clearing of fling events" into jb-mr1-aah-dev
2012-10-08 10:52:07 -07:00
Amith Yamasani
1a8d0f7a94
am 45e3c4f0: am 1409c99f: am 9c2a38ed: Merge "Fix resource reading for secondary users" into jb-mr1-dev
...
* commit '45e3c4f0c75eafc1ee6d3fe97d42992eab6c3741':
Fix resource reading for secondary users
2012-10-07 23:44:35 -07:00
Romain Guy
acf74db4ac
am bfb2883b: am b0f85147: am 133fcdf4: Merge "Clear draw flags when updating TextureView\'s layer Bug #7171323 " into jb-mr1-dev
...
* commit 'bfb2883b57a0eabb83d786a1f9d187a26e36d7f5':
Clear draw flags when updating TextureView's layer Bug #7171323
2012-10-07 23:44:19 -07:00
Amith Yamasani
45e3c4f0c7
am 1409c99f: am 9c2a38ed: Merge "Fix resource reading for secondary users" into jb-mr1-dev
...
* commit '1409c99f8b64adcedf30b8709a22dbb257710f94':
Fix resource reading for secondary users
2012-10-07 23:41:13 -07:00
Romain Guy
bfb2883b57
am b0f85147: am 133fcdf4: Merge "Clear draw flags when updating TextureView\'s layer Bug #7171323 " into jb-mr1-dev
...
* commit 'b0f85147539f0ee2b165c07534a540deccfcd348':
Clear draw flags when updating TextureView's layer Bug #7171323
2012-10-07 23:40:59 -07:00
Amith Yamasani
1409c99f8b
am 9c2a38ed: Merge "Fix resource reading for secondary users" into jb-mr1-dev
...
* commit '9c2a38ed10592a54d9bb753ef882632f7a8cd446':
Fix resource reading for secondary users
2012-10-07 23:36:22 -07:00
Romain Guy
b0f8514753
am 133fcdf4: Merge "Clear draw flags when updating TextureView\'s layer Bug #7171323 " into jb-mr1-dev
...
* commit '133fcdf44bccbda1fe7931bca7d911806435491b':
Clear draw flags when updating TextureView's layer Bug #7171323
2012-10-07 23:36:08 -07:00
Svetoslav Ganov
fb1245243e
am 1b07e93f: am f0b8e3ad: Merge "Adding support to NumberPicker" into jb-mr1-aah-dev
...
* commit '1b07e93f3b81fd3a8c0bf3ae46ab15f59507980d':
Adding support to NumberPicker
2012-10-07 23:24:11 -07:00
Svetoslav Ganov
1b07e93f3b
am f0b8e3ad: Merge "Adding support to NumberPicker" into jb-mr1-aah-dev
...
* commit 'f0b8e3adc4031898714e81f4beafedaa13546978':
Adding support to NumberPicker
2012-10-07 23:21:20 -07:00
Amith Yamasani
9c2a38ed10
Merge "Fix resource reading for secondary users" into jb-mr1-dev
2012-10-07 22:53:18 -07:00
Svetoslav Ganov
f0b8e3adc4
Merge "Adding support to NumberPicker" into jb-mr1-aah-dev
2012-10-07 19:00:02 -07:00
Svetoslav Ganov
5dc21d9b34
Adding support to NumberPicker
...
Change-Id: I471b995c8d364c2bd5eef3ab0397c17fc77f6ccc
2012-10-07 18:54:42 -07:00
Romain Guy
133fcdf44b
Merge "Clear draw flags when updating TextureView's layer Bug #7171323 " into jb-mr1-dev
2012-10-07 18:00:41 -07:00
Romain Guy
52b307ebc8
Clear draw flags when updating TextureView's layer
...
Bug #7171323
Finally!
Change-Id: Iefef8fb9a8ef1fe4b374005067145319312c57cf
2012-10-07 17:57:30 -07:00
Raph Levien
286da7b6f5
Fix for 7301594 Html.toHtml creating potentially invalid html
...
Generate <p dir="rtl"> instead of <p dir=rtl>. The form with the quotes
is cleaner and will reduce warnings in apps that consume the output.
Change-Id: Ic9879c8c882c42079598b741e897a24415d96374
2012-10-07 16:57:27 -07:00
Amith Yamasani
64442c1155
Fix resource reading for secondary users
...
Bug: 7086881
Load resources for the correct user.
Also clean up package monitoring and locking.
Added dump method to SearchManagerService.
Sneaking in a change to make crash dialogs visible to current user.
Change-Id: Id56dd15428d66084de995e28be242db27c15fda3
2012-10-07 15:56:34 -07:00
Adam Cohen
7bd02a4f11
am 5e386b7f: am ee1108be: am 5745a676: Merge "Suppress unnecessary calls to update widget size (issue 7287744)" into jb-mr1-dev
...
* commit '5e386b7fd22da4fd95008ec5039c75489d044fc4':
Suppress unnecessary calls to update widget size (issue 7287744)
2012-10-07 13:03:11 -07:00
Adam Cohen
5e386b7fd2
am ee1108be: am 5745a676: Merge "Suppress unnecessary calls to update widget size (issue 7287744)" into jb-mr1-dev
...
* commit 'ee1108be3532d73dfbdb79e497d2dca040b7d094':
Suppress unnecessary calls to update widget size (issue 7287744)
2012-10-07 12:59:26 -07:00
Adam Cohen
ee1108be35
am 5745a676: Merge "Suppress unnecessary calls to update widget size (issue 7287744)" into jb-mr1-dev
...
* commit '5745a6763a5647db5b461fbe57a643738fa2fe25':
Suppress unnecessary calls to update widget size (issue 7287744)
2012-10-07 12:56:33 -07:00
Adam Cohen
5745a6763a
Merge "Suppress unnecessary calls to update widget size (issue 7287744)" into jb-mr1-dev
2012-10-07 12:38:33 -07:00
Craig Mautner
8565363126
am 337aa27a: am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev
...
* commit '337aa27a6307e0f40705ee676551dda4bf6cb894':
Adds showWhenLocked attribute to Activities.
2012-10-07 11:55:58 -07:00
Craig Mautner
337aa27a63
am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev
...
* commit '8ee7ac22e6aec5df5405a3e2130d593c50bc39b2':
Adds showWhenLocked attribute to Activities.
2012-10-07 11:53:43 -07:00
Craig Mautner
8ee7ac22e6
am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev
...
* commit '33877e15b8bfc50bd874027689a4794aa93b923d':
Adds showWhenLocked attribute to Activities.
2012-10-07 11:50:54 -07:00
Craig Mautner
33877e15b8
Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev
2012-10-07 11:48:50 -07:00
Adam Powell
02ff76c5d9
am fee7dded: am f94da061: am 786d1092: Merge "Quick settings user display and switching" into jb-mr1-dev
...
* commit 'fee7ddedc99e377002aa6a88c3e287cb6e6c405d':
Quick settings user display and switching
2012-10-07 11:40:19 -07:00
Adam Powell
fee7ddedc9
am f94da061: am 786d1092: Merge "Quick settings user display and switching" into jb-mr1-dev
...
* commit 'f94da0619c524ec9faf7def068d6888aa5304c96':
Quick settings user display and switching
2012-10-07 11:37:54 -07:00
Adam Powell
f94da0619c
am 786d1092: Merge "Quick settings user display and switching" into jb-mr1-dev
...
* commit '786d10921b2c525ed22b78ec40ae2554eec85912':
Quick settings user display and switching
2012-10-07 11:35:34 -07:00
Adam Powell
786d10921b
Merge "Quick settings user display and switching" into jb-mr1-dev
2012-10-07 11:33:29 -07:00
Dianne Hackborn
bbf0c3b592
am 71c66f0d: am 6d5d7fcb: am 52177738: Merge "Fix issue #7296314 , issue #7296314." into jb-mr1-dev
...
* commit '71c66f0ddaf3db93d0afa9d215a48e44cc23dc43':
Fix issue #7296314 , issue #7296314 .
2012-10-07 09:10:08 -07:00
Dianne Hackborn
71c66f0dda
am 6d5d7fcb: am 52177738: Merge "Fix issue #7296314 , issue #7296314." into jb-mr1-dev
...
* commit '6d5d7fcba944e772041f20022ac275a2ac057eb5':
Fix issue #7296314 , issue #7296314 .
2012-10-07 09:06:48 -07:00
Dianne Hackborn
6d5d7fcba9
am 52177738: Merge "Fix issue #7296314 , issue #7296314." into jb-mr1-dev
...
* commit '52177738e8fa38e2f7769db1bcad40e7405baf17':
Fix issue #7296314 , issue #7296314 .
2012-10-07 09:02:15 -07:00