Jean-Michel Trivi
c203ecfd9f
Use device availability to start WFD audio routing
...
Don't use the force_use mechanism to start WFD audio routing,
but rather only the availability of the remote submix audio
device. This is matched by a change in the audio policy
manager.
Bug 7318180
Change-Id: I756f032d8ca0375c3dbeddb7c321261c497539bc
2012-10-11 18:30:11 -07:00
Baligh Uddin
40ad86e026
Import translations. DO NOT MERGE
...
Change-Id: I4ef6935d25a8428069225adb3648701e93fd9c17
Auto-generated-cl: translation import
2012-10-11 18:30:04 -07:00
Baligh Uddin
c60b9f66fa
Import translations. DO NOT MERGE
...
Change-Id: Ie30e500b62e03b710b99ec0eb1a8f98d9ad46106
Auto-generated-cl: translation import
2012-10-11 18:28:27 -07:00
John Reck
be0786ae0b
am b746febc: Merge "Center text selection point to avoid rounding glitches" into jb-mr1-dev
...
* commit 'b746febca2e3f21704556647cd987fdf902fb779':
Center text selection point to avoid rounding glitches
2012-10-11 18:27:56 -07:00
John Reck
b746febca2
Merge "Center text selection point to avoid rounding glitches" into jb-mr1-dev
2012-10-11 18:25:55 -07:00
Jim Miller
8a4408ccdf
am fdb6be8b: Merge "Always show emergency button on selector view screen in keyguard." into jb-mr1-dev
...
* commit 'fdb6be8b1f76caf0f2ba64fb68d5d0b8e33a7a54':
Always show emergency button on selector view screen in keyguard.
2012-10-11 18:22:51 -07:00
Jim Miller
fdb6be8b1f
Merge "Always show emergency button on selector view screen in keyguard." into jb-mr1-dev
2012-10-11 18:21:13 -07:00
Christopher Tate
39944808b5
DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity
...
Based on 3rd party developer observation, this is a source of much
confusion and layout mistakes.
Change-Id: I2cb6ae1540fe2444582403d9100478ebe02df985
2012-10-11 18:14:23 -07:00
John Reck
9fcef3d023
Center text selection point to avoid rounding glitches
...
Bug: 7313424
Change-Id: I5356bec61e3d1244b506486300f059aa0bba6d9e
2012-10-11 18:08:03 -07:00
Jeff Sharkey
d3ab7fc537
am 24251648: am 9ad36ded: am 9dfca201: Merge "Print newly generated userId." into jb-mr1-dev
...
* commit '2425164835e9bbf4c501c69c078b2c1a48f3414e':
Print newly generated userId.
2012-10-11 17:55:15 -07:00
Jeff Sharkey
102dc1cb21
am 250a90ca: am 49db71e9: am 810df895: Merge "Return ApplicationInfo with requested userId." into jb-mr1-dev
...
* commit '250a90cacf25fb277a5b778039965a330a0376d0':
Return ApplicationInfo with requested userId.
2012-10-11 17:55:11 -07:00
Jeff Brown
5f104da0a8
am 82c1b13e: am 1984e8c0: am 3da6c219: Merge "Do not launch Somnambulator as a dock app." into jb-mr1-dev
...
* commit '82c1b13e8a2d2544bbab173becf215a6252d5454':
Do not launch Somnambulator as a dock app.
2012-10-11 17:55:07 -07:00
Svetoslav Ganov
7ae3f43f26
am ef5f50a4: am 407ce197: am 3003bada: Merge "Check whether ChromeVox is ready before attempting to call it." into jb-mr1-dev
...
* commit 'ef5f50a4183b285cbde4c2a2cc4e44a25a564032':
Check whether ChromeVox is ready before attempting to call it.
2012-10-11 17:55:01 -07:00
Svetoslav Ganov
241856313f
am 78c12209: am 50cf95fc: am 87c6f9a5: Merge "This is wrong since it fixed the symptom not the problem. Alan is uploading a correct patch." into jb-mr1-dev
...
* commit '78c12209b6212dfc57d7e7d79d16d9efcb03217f':
This is wrong since it fixed the symptom not the problem. Alan is uploading a correct patch.
2012-10-11 17:54:55 -07:00
clchen
f18971bbc3
am fdffe981: am 6f3feefe: am 4574df0c: Merge "Reducing WebView navigation timeout for accessibility." into jb-mr1-dev
...
* commit 'fdffe981fb72b557437898e19279a2aa4a712321':
Reducing WebView navigation timeout for accessibility.
2012-10-11 17:53:42 -07:00
Jeff Brown
e0d018801d
am 7a3314cc: am af4228c1: am e8f4fa1c: Merge "Fix off-by-one." into jb-mr1-dev
...
* commit '7a3314cce7a3b68aac8a9dc90ce9cd8edac65669':
Fix off-by-one.
2012-10-11 17:53:39 -07:00
Romain Guy
5ce5cdb6ac
am 6aa40ac5: am fa6e9cf6: am 86ad8662: Merge "Don\'t scale bitmaps to an empty size when targetDpi=0 Bug #7334217 " into jb-mr1-dev
...
* commit '6aa40ac59516d4286b2013e33b9f37633ec0fe91':
Don't scale bitmaps to an empty size when targetDpi=0 Bug #7334217
2012-10-11 17:53:35 -07:00
Jonathan Dixon
b9c78e89d6
am 73030434: am 207b5e17: am 402099f7: Merge "Unhide setPictureListener" into jb-mr1-dev
...
* commit '73030434e5b44bcb16005fbe591943e76c533be2':
Unhide setPictureListener
2012-10-11 17:53:27 -07:00
Winson Chung
d578b38566
am dffd302f: am a58800d1: am 4cce397c: Merge "Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)" into jb-mr1-dev
...
* commit 'dffd302f7d07a7d31f40acd3edb223476b9b9395':
Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)
2012-10-11 17:53:20 -07:00
Jeff Brown
63ac2d1263
am 15aa543a: am 65d8433f: am 2e21bdbe: Merge "Ensure MediaRouter correctly handles renamed Wifi displays." into jb-mr1-dev
...
* commit '15aa543a58299d41ce7d44abd31f708dd3e64965':
Ensure MediaRouter correctly handles renamed Wifi displays.
2012-10-11 17:53:16 -07:00
Jeff Brown
943d52f6f2
am 44877a16: am 35499475: am 17026864: Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into jb-mr1-dev
...
* commit '44877a16e7313e0523975b5511107631fabc8115':
Ensure Binder in-calls to UiModeManagerService are guarded.
2012-10-11 17:53:12 -07:00
Jim Miller
43c5b55685
Always show emergency button on selector view screen in keyguard.
...
Bug 7276760
Change-Id: I685aadc3535defa5e83fb514a3c333b48526312e
2012-10-11 17:53:10 -07:00
Craig Mautner
e75ded7c0d
am 567f47b8: am a37994b2: am 46fb9e9f: Merge "Check for apps closing and restore mExiting test." into jb-mr1-dev
...
* commit '567f47b8aa0789c1631e9a5a275c787d1eee2311':
Check for apps closing and restore mExiting test.
2012-10-11 17:53:08 -07:00
Chris Wren
44e1c77d24
am b62302dd: am 9b339b74: am 853a1cea: Merge "Copy date format style from keyguard." into jb-mr1-dev
...
* commit 'b62302dd2b315a238a896538adc1de0383280111':
Copy date format style from keyguard.
2012-10-11 17:53:02 -07:00
Joe Fernandez
325176585a
am 3a3014c1: am 95f9b4b9: am 8091c8e9: am 07d2ad88: am dff6f01f: am 45c56ae7: Merge "docs: Release Notes: Android Platform 4.1.2 (16, r3)" into jb-dev-docs
...
* commit '3a3014c152c624c2d04e64619494eb5ebb72226d':
docs: Release Notes: Android Platform 4.1.2 (16, r3)
2012-10-11 17:52:58 -07:00
Adam Powell
90ef752146
am ff99f59f: am 4e5efaef: am 49dbc161: Merge "Revert "Fixed group and child view caching in SimpleExpandableListAdapter."" into jb-mr1-dev
...
* commit 'ff99f59f0bd30f6e475bf5adf358acb4d737cc51':
Revert "Fixed group and child view caching in SimpleExpandableListAdapter."
2012-10-11 17:52:54 -07:00
Fabrice Di Meglio
0c5c23b3a2
am 4c95bfd5: am 39b0c29e: am ec139240: Merge "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" into jb-mr1-dev
...
* commit '4c95bfd5ad4d17b6e0e618cd3244ee2d33bcbda1':
Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)
2012-10-11 17:52:51 -07:00
Winson Chung
5d8080f8b8
am ef36a549: am f0a8045e: am ee0d8deb: Merge "Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)" into jb-mr1-dev
...
* commit 'ef36a5494249c57855a5eabd6a5536d8447c1b68':
Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731)
2012-10-11 17:52:47 -07:00
Svetoslav Ganov
4cc7342daf
am cf19242d: am 756cf7e8: am b3c38156: Merge "Screen magnification does not auto-pan when fragment dialog pops up." into jb-mr1-dev
...
* commit 'cf19242d7b9688220cf821fe598de35d932ca2d2':
Screen magnification does not auto-pan when fragment dialog pops up.
2012-10-11 17:52:43 -07:00
Winson Chung
8cf2271c48
am c68bab01: am 8e981df7: am 1cd614c6: Merge "Ignore dying users when testing for number of users on device. (Bug 7332248)" into jb-mr1-dev
...
* commit 'c68bab01afab58baafa3c0cd357e781c7cb7495f':
Ignore dying users when testing for number of users on device. (Bug 7332248)
2012-10-11 17:52:39 -07:00
Chris Wren
d8a9a77537
am f66bf0e8: am a35f8ce3: am 061a4de8: Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev
...
* commit 'f66bf0e86790e5864bb018b2fa778456ea561e68':
resolve conflicting assumptions from the merge.
2012-10-11 17:52:35 -07:00
Dave Burke
6e9cb82eeb
am d4aa3b68: am 950407d0: am a2f7ca7d: Merge "Add new ringtones/notifications for Occam." into jb-mr1-dev
...
* commit 'd4aa3b68940e5aaf2883f7a63bc50924590d373a':
Add new ringtones/notifications for Occam.
2012-10-11 17:52:31 -07:00
Danielle Millett
8bb1f5abc4
am 855bdf65: am 85a4ac92: am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev
...
* commit '855bdf6500edfc4496002367638c577318b0b912':
Face Unlock is shown correctly during a phone call - fix b/7271718
2012-10-11 17:52:28 -07:00
Daniel Sandler
972e834943
am bfd97573: am 22cc5c76: am ff97e6e8: Merge "New icon for quick settings button." into jb-mr1-dev
...
* commit 'bfd97573053ab549b1815ed75e5f72cc8c965e4c':
New icon for quick settings button.
2012-10-11 17:52:24 -07:00
Svetoslav Ganov
7510e4820b
resolved conflicts for merge of a7f38925 to master
...
Change-Id: If0e3a1046dfeef9260284e84f2a74525ddea00f7
2012-10-11 17:49:28 -07:00
Joe Malin
289eb79106
am 87afd6eb: am 54a1e4d4: am 5832d1ce: am 01154bda: DOC CHANGE: Notifications Guide
...
* commit '87afd6eb4b7e08da0c10bece82ed594c5babc404':
DOC CHANGE: Notifications Guide
2012-10-11 17:45:43 -07:00
Joe Malin
87afd6eb4b
am 54a1e4d4: am 5832d1ce: am 01154bda: DOC CHANGE: Notifications Guide
...
* commit '54a1e4d4c4216af987c7b769723cd2e59ca2c233':
DOC CHANGE: Notifications Guide
2012-10-11 17:42:46 -07:00
Joe Malin
54a1e4d4c4
am 5832d1ce: am 01154bda: DOC CHANGE: Notifications Guide
...
* commit '5832d1ce7240c056a1e85a49549635b60711a5c6':
DOC CHANGE: Notifications Guide
2012-10-11 17:40:46 -07:00
Joe Malin
5832d1ce72
am 01154bda: DOC CHANGE: Notifications Guide
...
* commit '01154bdae9d6f3d1fbed3169ffa194d51045c9cf':
DOC CHANGE: Notifications Guide
2012-10-11 17:38:46 -07:00
Stephen Hines
3e68d87d6b
am f8814489: Merge "Update compatibility library tests" into jb-mr1-dev
...
* commit 'f881448913ec48cd36ab017c25581cc5f92ba10a':
Update compatibility library tests
2012-10-11 17:29:09 -07:00
Jeff Sharkey
2425164835
am 9ad36ded: am 9dfca201: Merge "Print newly generated userId." into jb-mr1-dev
...
* commit '9ad36dedd668c3bfa906397baa3d0aa76cfe1216':
Print newly generated userId.
2012-10-11 17:29:02 -07:00
Jeff Sharkey
250a90cacf
am 49db71e9: am 810df895: Merge "Return ApplicationInfo with requested userId." into jb-mr1-dev
...
* commit '49db71e962b8ae17a3698534c800ea7511060dac':
Return ApplicationInfo with requested userId.
2012-10-11 17:28:57 -07:00
Jeff Brown
82c1b13e8a
am 1984e8c0: am 3da6c219: Merge "Do not launch Somnambulator as a dock app." into jb-mr1-dev
...
* commit '1984e8c0965151750c61825c22a27a39bc402471':
Do not launch Somnambulator as a dock app.
2012-10-11 17:27:18 -07:00
Svetoslav Ganov
ef5f50a418
am 407ce197: am 3003bada: Merge "Check whether ChromeVox is ready before attempting to call it." into jb-mr1-dev
...
* commit '407ce197e82781759e92648c5a72bb4ecefa920b':
Check whether ChromeVox is ready before attempting to call it.
2012-10-11 17:27:14 -07:00
Stephen Hines
f881448913
Merge "Update compatibility library tests" into jb-mr1-dev
2012-10-11 17:26:22 -07:00
Jeff Sharkey
9ad36dedd6
am 9dfca201: Merge "Print newly generated userId." into jb-mr1-dev
...
* commit '9dfca20105aa998f5767b1b330bf9307ec479906':
Print newly generated userId.
2012-10-11 17:25:53 -07:00
Jeff Sharkey
49db71e962
am 810df895: Merge "Return ApplicationInfo with requested userId." into jb-mr1-dev
...
* commit '810df8951eb4bbe77f150483208f04daadac5dd9':
Return ApplicationInfo with requested userId.
2012-10-11 17:25:50 -07:00
Jeff Brown
1984e8c096
am 3da6c219: Merge "Do not launch Somnambulator as a dock app." into jb-mr1-dev
...
* commit '3da6c219a8b1acebbfd8a56ee31b5d91d0425dc4':
Do not launch Somnambulator as a dock app.
2012-10-11 17:23:55 -07:00
Svetoslav Ganov
407ce197e8
am 3003bada: Merge "Check whether ChromeVox is ready before attempting to call it." into jb-mr1-dev
...
* commit '3003bada607b64ecf3a405b48da3528c4331e7c6':
Check whether ChromeVox is ready before attempting to call it.
2012-10-11 17:23:52 -07:00
Svetoslav Ganov
78c12209b6
am 50cf95fc: am 87c6f9a5: Merge "This is wrong since it fixed the symptom not the problem. Alan is uploading a correct patch." into jb-mr1-dev
...
* commit '50cf95fc7d5481d7f1d9a2c6bb7496a77ad9e926':
This is wrong since it fixed the symptom not the problem. Alan is uploading a correct patch.
2012-10-11 17:23:43 -07:00