Jeff Davidson
5aaf5bed41
am 9f920587: Merge "Don\'t request network scores before boot completes." into lmp-dev
...
* commit '9f9205879c82face0bc8e7e25f55717521541c3d':
Don't request network scores before boot completes.
2014-07-29 23:40:28 +00:00
Amith Yamasani
3f988ad445
am 711c40a2: Merge "Potential fix for apps disappearing in launcher on system server crash" into lmp-dev
...
* commit '711c40a2fe892e1db564de40ec42d0e5e44e013d':
Potential fix for apps disappearing in launcher on system server crash
2014-07-29 23:40:24 +00:00
Eino-Ville Talvala
627f0e7987
am c02b64b6: Camera2: API review updates
...
* commit 'c02b64b6200292f42e13745c69f492016a5ef7ca':
Camera2: API review updates
2014-07-29 23:35:44 +00:00
Ying Wang
31b83bce7a
am d9789353: Merge "Fix docs build." into lmp-dev
...
* commit 'd978935396b79bc76b4dbbfab07d73f938ca42b1':
Fix docs build.
2014-07-29 23:30:49 +00:00
Eino-Ville Talvala
abd9d3c5c7
Camera2: API review updates
...
- Rename CameraCharacteristics#SENSOR_INFO_TIMESTAMP_CALIBRATION
to TIMESTAMP_SOURCE
- Remove StreamConfigurationMap#NO_MIN_FRAME_DURATION
Bug: 16402755
Change-Id: I6c30a1e931c9f064c22092d362bcc61bd88e2f8a
2014-07-29 23:30:34 +00:00
Craig Mautner
d3060f13fd
am 6b3bade6: Eliminate memory leak in TaskPersister
...
* commit '6b3bade62a1bd39253bba923a50768954a301ccb':
Eliminate memory leak in TaskPersister
2014-07-29 23:26:13 +00:00
Jeff Sharkey
b026abb10c
am c3214d18: More DocumentsUI material iteration.
...
* commit 'c3214d183b7bc3e2addc6c08b138ce364a8b86b7':
More DocumentsUI material iteration.
2014-07-29 23:26:08 +00:00
Craig Mautner
f4f8bb793f
Eliminate memory leak in TaskPersister
...
Bitmaps added to TaskPersister were piling up in the queue.
- The mRecentsChanged flag was being modified without holding the
lock. There is no mRecentsChanged flag now. Everything to be
written goes into a queue.
- TaskPersister now runs until the queue is empty.
- Bitmaps being written to the same file were being added to the
end of the queue without replacing the earlier bitmap. Now we
search the queue for matching tasks and replace the bitmaps
if needed.
- Method notify() was renamed to wakeup() so IDE could find usages
quicker.
- Bitmaps that were being requested but were still in the queue
are now being fetched from the queue.
Fixes bug 16512870.
Change-Id: Idca1c712e5d2df8196e93faaf563a54405ee96bf
2014-07-29 23:23:01 +00:00
Jeff Sharkey
f52773fd62
More DocumentsUI material iteration.
...
Move to using Toolbar for all actions. Drawer contains its own
Toolbar with separate title, and hamburger is always visible. Change
drawer items to match spec. Switching to Toolbar allows us to remove
nasty dialog-on-tablet hacks, yay! This also means we can finally
get real IME resizing support.
Move to using elevation for all shadows; this removes more nasty
hacks around drawing directory shadows.
Bug: 15836082
Change-Id: Iba70b898f385a7debd8aabfc98ff39d20bca860d
2014-07-29 23:19:45 +00:00
Jeff Davidson
4aa7a0d8f6
am ebc1f37f: Merge "Add NetworkScoreManager.disableScoring()." into lmp-dev
...
* commit 'ebc1f37ff05014a63187133fa280a850ce5ccada':
Add NetworkScoreManager.disableScoring().
2014-07-29 23:17:46 +00:00
Jinsuk Kim
1279f47baa
am 8b964025: Invoke input change listener at path change
...
* commit '8b96402512d163c042248ccf19f9a79274eabf84':
Invoke input change listener at path change
2014-07-29 23:17:42 +00:00
Yuncheol Heo
9a6807468d
am 6fa5476a: Make it pass CECT 11.1.3 System standby
...
* commit '6fa5476a6b0462824ff7c3af48db8787c10bb5a9':
Make it pass CECT 11.1.3 System standby
2014-07-29 23:17:33 +00:00
Jinsuk Kim
43c23e273e
Invoke input change listener at path change
...
Previously input change listener is not invoked if the routing change
does not cause the TV port change, but this failed to trigger the change
from an active source connected to port 1 to a non-cec device also
connected to port 1. Do this by comparing paths not ports.
Also did some cleanup:
- Avoid allocating empty lists too often for getActions
- ActiveSource.invalidate()
Change-Id: Id79531e2552ef7fa38bd604796108b8650db69a1
2014-07-29 22:57:52 +00:00
Yuncheol Heo
26ba7fddca
Make it pass CECT 11.1.3 System standby
...
- Accept the broadcast <Standby> message.
- Fix the bug that onStandyCompleted() is called mutliple times.
- Fix the issue that <Standby> message is not sent when going to
the standby state, since the local device was cleared already.
Bug: 16497304
Change-Id: Ib04ad2386621929814a801edd6b6c0e1a3902a7c
2014-07-30 07:55:39 +09:00
Narayan Kamath
bd855367c4
Merge "Don't assume languages are 2 letter codes."
2014-07-29 22:52:28 +00:00
Narayan Kamath
fd138cd81a
Don't assume languages are 2 letter codes.
...
Also, note that this method never worked. Locale
settings were stored with underscores (like Locale.toString)
but matched against AssetManager.getLocales() which
returned language-tag like output.
bug: 10090157
Change-Id: I36ffea6e39ff7d1907b2787f8fd4545c24d326a8
2014-07-31 13:10:20 +01:00
Narayan Kamath
bb97753bc5
Merge "Switch TextUtils over to new ICU API."
2014-07-29 22:52:28 +00:00
Narayan Kamath
08b3516984
Switch TextUtils over to new ICU API.
...
.. and use Locale.getScript() instead of ICU.getScript.
bug: 15876704
Change-Id: Idf9462d8ef568dbc88c95e65a971184952e97872
2014-07-31 11:29:44 +00:00
Jinsuk Kim
39affc9de3
am 78aaab20: Merge "Send TV app the intent for the new active source" into lmp-dev
...
* commit '78aaab2009fc1ca9eb28c929575e2ad25fd14dfb':
Send TV app the intent for the new active source
2014-07-29 22:49:39 +00:00
Ihab Awad
6e550acc31
am 4290e4eb: Merge "Connection creation and service wiring for WiFi call managers (1/3)" into lmp-dev
...
* commit '4290e4eb288360b8dae8e06bcb9054533c6eaee8':
Connection creation and service wiring for WiFi call managers (1/3)
2014-07-29 22:49:35 +00:00
Ricardo Cervera
a7898781d6
Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs
2014-07-29 22:44:51 +00:00
Igor Murashkin
32fb9f06ef
am 3387fffa: Merge "camera2: legacy: Don\'t set the @hide frame number metadata" into lmp-dev
...
* commit '3387fffa3cf94106f9887f6accc06bc52dc5739f':
camera2: legacy: Don't set the @hide frame number metadata
2014-07-29 22:25:54 +00:00
Igor Murashkin
bf9cea2b09
am 92f2d610: Merge "camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)" into lmp-dev
...
* commit '92f2d610329acb17ed6f94a6361a7ad5e12ecf21':
camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)
2014-07-29 22:16:55 +00:00
Jorim Jaggi
748c1283f2
am 5c2d0ab8: Optimize alpha handling for stack scroller
...
* commit '5c2d0ab85ab3e64718cc50c17346bdeab4486f4a':
Optimize alpha handling for stack scroller
2014-07-29 22:12:51 +00:00
Jorim Jaggi
5ad92c5278
Optimize alpha handling for stack scroller
...
Use a layer when an alpha is set. Currently, this breaks shadows
when alpha != 1f, however, b/15860114 will fix this.
Change-Id: I094d5896a5433ba9a0ecc17549ef2944f6b7881e
2014-07-29 22:07:21 +00:00
Igor Murashkin
5283599323
am 6dc35134: Merge changes I104c8243,I82811142 into lmp-dev
...
* commit '6dc351346931bece1eb0c620ca8e7406ee748a81':
camera2: legacy: fix cached results bug and fix focus modes
camera2: legacy: Add focus support
2014-07-29 21:59:50 +00:00
Alan Viverette
46359204a8
Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev
2014-07-29 21:36:00 +00:00
Alan Viverette
0c0dde7171
Update switch assets, fix SearchView asset 9-patch areas
...
BUG: 16606037
BUG: 16467249
Change-Id: I9a5888e37317d1f8a6481f9733f784bbd37268f3
2014-07-30 13:37:35 -07:00
keunyoung
fa75e3d465
Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev
2014-07-29 21:36:00 +00:00
keunyoung
1d0a7ccd00
add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode
...
- When this flag is set, system no longer keeps the display on while in car mode.
bug: 15472822
Change-Id: I277368be5227eaf96213684598f278c39e4c34db
2014-07-30 14:12:34 -07:00
Martijn Coenen
0bc94550b4
Merge "Make some NFC APIs @systemAPI." into lmp-dev
2014-07-29 21:36:00 +00:00
Martijn Coenen
29c2e3797a
Make some NFC APIs @systemAPI.
...
Change-Id: I12e292563a517211e4fae7a1f64021758f396d1a
2014-07-30 21:03:07 +00:00
Alan Lau
b12318be13
Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev
2014-07-29 21:36:00 +00:00
Alan Lau
1fa3c9bef2
Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
...
This reverts commit cbeef01cce314e3a3977b042d8ec0744816c0df4.
Change-Id: I170ccb2264941e8a8b090b3bb553970414f0c4eb
2014-07-30 17:35:20 +00:00
Andrew Solovay
8136421589
Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs
2014-07-29 21:36:00 +00:00
Alan Viverette
48b3fe6f12
Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev
2014-07-29 21:36:00 +00:00
Alan Viverette
8bb399069d
Update switch assets, fix SearchView asset 9-patch areas
...
BUG: 16606037
BUG: 16467249
Change-Id: Iabdf1634f4d8f87031ab3e5579140cdd428173de
2014-07-30 00:28:08 +00:00
Alan Viverette
f709a5ba8c
Merge "Enable hardware rendering for system process" into lmp-dev
2014-07-29 21:36:00 +00:00
Alan Viverette
5e1565ead6
Enable hardware rendering for system process
...
Also enables hardware rendering by default on windows created
without a parent activity (e.g. by services).
BUG: 16240470
Change-Id: I906d48cb07af50fa02dae4f4ecdb5e65211fc6ef
2014-07-29 23:56:52 +00:00
Igor Murashkin
3676164462
Merge "camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)" into lmp-dev
2014-07-29 21:36:00 +00:00
Igor Murashkin
bdf366cc70
camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)
...
Change-Id: I164011c97a57fb9fb9c504ae4c5f394dcb36a4bc
2014-07-29 15:09:45 -07:00
Igor Murashkin
3a3eb15741
camera2: legacy: fix cached results bug and fix focus modes
...
- Also add request.frameCounter and request.pipelineDepth results
Change-Id: I104c8243fa525622cb4ab7b5535cbca8588862f3
2014-07-29 14:23:27 -07:00
Igor Murashkin
83d8639e90
camera2: legacy: Add focus support
...
* Characteristics will list control.availableAfModes
* Request/result for control.afMode and control.afState
(Does not yet support control.afRegions)
Change-Id: I828111425fa587114d5159f7fb2b1e53a2c74e61
2014-07-29 14:20:41 -07:00
Robert Shih
e155d1b3fc
am d72d8eea: am 6550f08a: Merge "MediaPlayer: scanInternalSubtitleTracks in synchronous prepare" into lmp-dev
...
* commit 'd72d8eea6fa7189aff07c8a2f875c72936a3bc9a':
MediaPlayer: scanInternalSubtitleTracks in synchronous prepare
2014-07-29 21:16:28 +00:00
Robert Shih
e681779cd1
am 91429ebc: am 39c21c83: Merge "MediaPlayer: support external timed text in java" into lmp-dev
...
* commit '91429ebc9910cdeee47db5bec8c9233b0c9bedc5':
MediaPlayer: support external timed text in java
2014-07-29 21:16:24 +00:00
Christopher Tate
f2dfeef3aa
am f23c98bb: am f7d8c491: Merge "Make archive metadata idempotent" into lmp-dev
...
* commit 'f23c98bb2c7c7560a86789e35d46c38a11705e37':
Make archive metadata idempotent
2014-07-29 21:16:20 +00:00
Prerepa Viswanadham
1270430d63
am 57f30880: am d5359a8e: Fix crash in Stopping/Starting BLE advertising after BluetoothAdapter cycling
...
* commit '57f308804fa56c0df4c5b0585af6f0a43b34172c':
Fix crash in Stopping/Starting BLE advertising after BluetoothAdapter cycling
2014-07-29 21:16:16 +00:00
Robert Shih
8dae90ccd2
am 6550f08a: Merge "MediaPlayer: scanInternalSubtitleTracks in synchronous prepare" into lmp-dev
...
* commit '6550f08a0bf0c0c3e8317b285e844d928e9ae7e2':
MediaPlayer: scanInternalSubtitleTracks in synchronous prepare
2014-07-29 21:10:55 +00:00
Robert Shih
0d80c63982
am 39c21c83: Merge "MediaPlayer: support external timed text in java" into lmp-dev
...
* commit '39c21c83089961aa603272decdf3b179a5cdd063':
MediaPlayer: support external timed text in java
2014-07-29 21:10:50 +00:00
Christopher Tate
7ec0b01267
am f7d8c491: Merge "Make archive metadata idempotent" into lmp-dev
...
* commit 'f7d8c4917f5df8d583c988042c1c9770556ae757':
Make archive metadata idempotent
2014-07-29 21:10:45 +00:00