Zhijun He
69c30a49cc
am a5761bd1: am 654314ee: Merge "Camera2: return device list with the only supported device" into klp-dev
...
* commit 'a5761bd1f5166f3fd1c1bf07ce92a2ac443ee3e3':
Camera2: return device list with the only supported device
2013-10-02 09:36:37 -07:00
Christopher Tate
3b4e322b47
am e40b3033: am 5088fc85: Merge "Specialized prompting when \'home\' has become ambiguous" into klp-dev
...
* commit 'e40b3033422c326340957989eafd1659565fb132':
Specialized prompting when 'home' has become ambiguous
2013-10-02 09:35:56 -07:00
Alan Viverette
0adaf03488
am 6320305a: am f079a6d0: Merge "Set live region property on AccessibilityNodeInfo" into klp-dev
...
* commit '6320305a609d0c4a3b64088fe826c5cebadec985':
Set live region property on AccessibilityNodeInfo
2013-10-02 09:35:29 -07:00
Alan Viverette
e3ba7f24da
am c379752a: am 3320ef95: Merge "Add findFocus API for AccessibilityNodeProvider" into klp-dev
...
* commit 'c379752a32c7d77fe144e1a6e441ef871001d080':
Add findFocus API for AccessibilityNodeProvider
2013-10-02 09:35:25 -07:00
Jeff Sharkey
7f60e70e81
am 666b998b: am 364fc14f: Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev
...
* commit '666b998b67fe7bb6fc11dd6d683a18b5690afd39':
Detect wedged ContentProviders, treat as ANR.
2013-10-02 09:35:14 -07:00
Igor Murashkin
606926eddf
am 1b1cb30d: Merge "camera2: Fix CameraMetadata#getKeys" into klp-dev
...
* commit '1b1cb30d8e7aefb5466ca20e593f8d8062d36b81':
camera2: Fix CameraMetadata#getKeys
2013-10-02 09:34:22 -07:00
Svetoslav
8fd521c744
am 95b1bbfe: Merge "Fix the build" into klp-dev
...
* commit '95b1bbfe6c8fe5072d80e027d4b25319ed6f0411':
Fix the build
2013-10-01 22:22:00 -07:00
Jeff Brown
1047821375
am 5e65adaf: Merge "Reset insets when inset computer is removed." into klp-dev
...
* commit '5e65adaf4131bb08862fd5eae249a1f713b8ed51':
Reset insets when inset computer is removed.
2013-10-01 22:21:55 -07:00
Zhijun He
654314eedf
Merge "Camera2: return device list with the only supported device" into klp-dev
2013-10-01 22:40:11 +00:00
Zhijun He
18fe0ae08d
Camera2: return device list with the only supported device
...
Bug: 10360518
Change-Id: I823f0b6965728ddefc9b70f3df0f50259919cce5
2013-10-01 14:26:40 -07:00
Christopher Tate
5088fc858c
Merge "Specialized prompting when 'home' has become ambiguous" into klp-dev
2013-10-01 20:39:05 +00:00
Christopher Tate
b72b363c97
Specialized prompting when 'home' has become ambiguous
...
Bug 9958444
Change-Id: I050ae425e570cfc8ffd473587fb2a6127c36eeec
2013-10-01 13:32:13 -07:00
Alan Viverette
f079a6d07f
Merge "Set live region property on AccessibilityNodeInfo" into klp-dev
2013-10-01 18:33:12 +00:00
Alan Viverette
3320ef95de
Merge "Add findFocus API for AccessibilityNodeProvider" into klp-dev
2013-10-01 18:32:48 +00:00
Jeff Sharkey
7aa7601c09
Detect wedged ContentProviders, treat as ANR.
...
All ContentProvider calls are currently blocking, making it hard for
an app to recover when a remote provider is wedged. This change adds
hidden support to ContentProviderClient to timeout remote calls,
treating them as ANRs. This behavior is disabled by default.
Update DocumentsUI to use a 20 second timeout whenever interacting
with a storage provider.
Bug: 10993301, 10819461, 10852518
Change-Id: I10fa3c425c6a7225fff9cb7a0a07659028230cd3
2013-10-01 09:50:41 -07:00
Alan Viverette
ed2cfdbf42
am 6f07cc84: Merge "Rebind transient state views when available" into klp-dev
...
* commit '6f07cc8424caccda695918f83e1b57f7a67d9f0c':
Rebind transient state views when available
2013-10-01 05:26:40 -07:00
Robert Greenwalt
2b6b3d9c49
am bad5d694: Merge "Use a build-specific wifi country code" into klp-dev
...
* commit 'bad5d694c7d7ae27ca966d6da059f81c5d964748':
Use a build-specific wifi country code
2013-10-01 05:26:34 -07:00
Igor Murashkin
1b1cb30d8e
Merge "camera2: Fix CameraMetadata#getKeys" into klp-dev
2013-10-01 02:10:17 +00:00
Igor Murashkin
03fdb14ba8
camera2: Fix CameraMetadata#getKeys
...
Bug: 11007040
Change-Id: I08755bf45ae60ff00736af3672a9f6091f460496
2013-09-30 17:38:54 -07:00
Svetoslav
95b1bbfe6c
Merge "Fix the build" into klp-dev
2013-10-01 00:36:56 +00:00
Svetoslav
f43e851f96
Fix the build
...
Change-Id: I2d701199808b1a0d482b9593c8b0730a408c3e8e
2013-09-30 17:33:05 -07:00
Matthew Xie
9eb9ebb2fb
am 0e772b22: Merge "Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields" into klp-dev
...
* commit '0e772b226801ca03292abad04677b1f7f29fade4':
Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields
2013-09-30 17:32:22 -07:00
Jeff Brown
5e65adaf41
Merge "Reset insets when inset computer is removed." into klp-dev
2013-10-01 00:15:25 +00:00
Alan Viverette
f877ed96b7
Set live region property on AccessibilityNodeInfo
...
BUG: 11012854
Change-Id: I2c88468be597eb3694fe3d0eb2f2d86981ea9829
2013-09-30 17:11:46 -07:00
Dianne Hackborn
e2a67ac27b
am 57d96f0e: Merge "Fix issue #10948509 : Crash in procstats when there is no data" into klp-dev
...
* commit '57d96f0e92e8af842878660a8271e65cec2426d3':
Fix issue #10948509 : Crash in procstats when there is no data
2013-09-30 17:10:55 -07:00
Svetoslav Ganov
8a7d8f9722
am 0ed01ab5: Merge "Printers in the list of printers change position." into klp-dev
...
* commit '0ed01ab57f1277a3889da10daa87733c1af6e0d0':
Printers in the list of printers change position.
2013-09-30 17:10:46 -07:00
Svetoslav
82d2d7e4b0
am c6568719: Merge "Ignore historical printer records for installed services" into klp-dev
...
* commit 'c6568719671206e726f260fad390680f7fb0ee9e':
Ignore historical printer records for installed services
2013-09-30 17:10:21 -07:00
Jim Miller
a192253bf2
am fb2e3c8d: Merge "Fix permissions on WindowManagerService.showAssistant()" into klp-dev
...
* commit 'fb2e3c8d47c162166a029a97d68ad3bedff89cce':
Fix permissions on WindowManagerService.showAssistant()
2013-09-30 17:10:11 -07:00
Svetoslav Ganov
b84aa9fee3
am b415525a: Merge "Print job files and print job records not always cleaned up." into klp-dev
...
* commit 'b415525a16074b6dc8e295655648b7c7c1074bbb':
Print job files and print job records not always cleaned up.
2013-09-30 17:10:08 -07:00
Jeff Sharkey
a2c42861a1
am cc637d9a: Merge "New roots UX, async, performance, docs." into klp-dev
...
* commit 'cc637d9ae5920ac2f685090f595dc1e1643d71cc':
New roots UX, async, performance, docs.
2013-09-30 17:09:48 -07:00
Michael Wright
426700c39f
am edb444b4: Merge "Add missing constructor parameter to KeyEvent" into klp-dev
...
* commit 'edb444b44419def54292cf8325c22697213153fa':
Add missing constructor parameter to KeyEvent
2013-09-30 17:09:46 -07:00
Zhijun He
aa98c43d68
am 9552f9b8: Merge "Camera2: remove CameraDevice#getProperties" into klp-dev
...
* commit '9552f9b8c2bc6d671809514cb402cbc48ee2e323':
Camera2: remove CameraDevice#getProperties
2013-09-30 17:09:41 -07:00
Lajos Molnar
a5c95f6fe3
am 974a6e12: Merge "Make SubtitleController thread safe" into klp-dev
...
* commit '974a6e1231f80644e382567c5f0a5fb9b6962d27':
Make SubtitleController thread safe
2013-09-30 17:09:03 -07:00
Raph Levien
e5207a41c3
am e048f84a: Fix for jank when fast-scrolling DeskClock\'s world cities list in RTL
...
* commit 'e048f84a762d5f85829ceb2b45de52b73727de74':
Fix for jank when fast-scrolling DeskClock's world cities list in RTL
2013-09-30 17:08:48 -07:00
Alan Viverette
c4ff1f3ad4
am 015bcd4d: Merge "Add warning about using MergeCursor in CursorAdapter" into klp-dev
...
* commit '015bcd4dd43b850ef209c64dae9c08ccaef9ea80':
Add warning about using MergeCursor in CursorAdapter
2013-09-30 17:08:22 -07:00
Daniel Sandler
5e833d6f57
am 723ad75e: Merge "API cleanups for Notification." into klp-dev
...
* commit '723ad75e107f57dc541dfca600745895e1251974':
API cleanups for Notification.
2013-09-30 17:08:06 -07:00
Jean Chalard
db90713899
am 5638d29a: Merge "Fix conflicting/unclear documentation in InputConnection." into klp-dev
...
* commit '5638d29a648ee5722bb88355351c56fde7d6bc93':
Fix conflicting/unclear documentation in InputConnection.
2013-09-30 17:07:23 -07:00
Svetoslav
049e69070a
am 25b0151a: Merge "Printers in the list of printers change position." into klp-dev
...
* commit '25b0151a570ff6fb7a6acd9c788b9c3cc9f76be9':
Printers in the list of printers change position.
2013-09-30 17:07:13 -07:00
Adam Powell
e7dee824cf
am 8fb6d97a: Merge "Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu" into klp-dev
...
* commit '8fb6d97ad5671b4abc1940d8bc56cf7448e45c35':
Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu
2013-09-30 17:07:03 -07:00
Chet Haase
be68329500
am 033837dd: Merge "Make fading transitions work better" into klp-dev
...
* commit '033837dd6bf32b33d9a67d340efd167f94bf80cf':
Make fading transitions work better
2013-09-30 17:06:55 -07:00
Raph Levien
306bda7927
am adf14902: Merge "Fix for Text fading on RTL app names is done at the beginning..." into klp-dev
...
* commit 'adf149029f701464c66cc5cacbbbc649c1319bcd':
Fix for Text fading on RTL app names is done at the beginning...
2013-09-30 17:06:29 -07:00
Romain Guy
c8532ce4ae
am 33ed738d: Expose View.executeHardwareAction() Bug #10911502
...
* commit '33ed738d49dce3af5851d0566739e9ed593057a5':
Expose View.executeHardwareAction() Bug #10911502
2013-09-30 16:42:19 -07:00
Romain Guy
bb1d4d3896
am d6c1870d: am 5fceada3: Merge "Fragement, or Fragment: that is the question"
...
* commit 'd6c1870d434562a10e015915dd9da9f8a956661c':
Fragement, or Fragment: that is the question
2013-09-30 16:23:05 -07:00
Romain Guy
d6c1870d43
am 5fceada3: Merge "Fragement, or Fragment: that is the question"
...
* commit '5fceada31f0dc8f8e003e9c1d0a0ed0363711343':
Fragement, or Fragment: that is the question
2013-09-30 16:19:22 -07:00
Jeff Brown
2e05ec3235
Reset insets when inset computer is removed.
...
When an inset computer is registered with the view tree observer,
we report content insets to the window manager. When an inset computer
is subsequently unregistered, we must take care to clear these insets.
This patch remembers whether the previously computed insets were
non-empty so that it can force insets to be reset when needed.
Bug: 10840662
Change-Id: I4cce5ba64cc5234b98363b025ac4bb42e64349f1
2013-09-30 15:57:43 -07:00
Alan Viverette
6f07cc8424
Merge "Rebind transient state views when available" into klp-dev
2013-09-30 21:33:22 +00:00
Robert Greenwalt
bad5d694c7
Merge "Use a build-specific wifi country code" into klp-dev
2013-09-30 21:13:24 +00:00
Alan Viverette
2e1e081146
Add findFocus API for AccessibilityNodeProvider
...
BUG: 9372171
Change-Id: Iea46ce5a4bf25baaabe5c07cd7d0c58bb31f23d9
2013-09-30 13:45:55 -07:00
Cyril Mottier
2de5082f43
Fragement, or Fragment: that is the question
...
Change-Id: Iac3a14b9d2d7b4bd1e452db987b3c5c95dbefd3b
2013-09-30 22:43:59 +02:00
Alan Viverette
f9736d3b9a
Rebind transient state views when available
...
If a view is obtained, it is guaranteed to represent the same data.
BUG: 10901462
Change-Id: Ice2b3508ae8cf444f006c084e6b7a3e79373723b
2013-09-30 12:44:54 -07:00