Igor Murashkin
eec862451e
am 5cd32e87: am 58046d50: am 81d6f3e5: camera2: (legacy) Fix the comparison for fixed-focus cameras
...
* commit '5cd32e870dff7d6a4c899f7446eefdd03f6a08b0':
camera2: (legacy) Fix the comparison for fixed-focus cameras
2014-08-11 20:43:41 +00:00
Igor Murashkin
b36bea1e69
am a4df9ea9: am fb534824: am 66a77b72: camera: (LEGACY) - Add captureIntent and physicalSize metadata
...
* commit 'a4df9ea9b596fc5a3c599e280795e2378c1c5d6e':
camera: (LEGACY) - Add captureIntent and physicalSize metadata
2014-08-11 20:43:36 +00:00
Igor Murashkin
3b38efae37
am 8181b912: am 1a3064dc: am b23dea98: camera: (Legacy) Add support for SCENE_MODE == FACE_PRIORITY
...
* commit '8181b9126023e41425b3352aba3f0830d8777453':
camera: (Legacy) Add support for SCENE_MODE == FACE_PRIORITY
2014-08-11 20:43:31 +00:00
Igor Murashkin
36a0807a8c
am 58046d50: am 81d6f3e5: camera2: (legacy) Fix the comparison for fixed-focus cameras
...
* commit '58046d50b68f58bb2d98cdcec68068af68837913':
camera2: (legacy) Fix the comparison for fixed-focus cameras
2014-08-11 20:37:14 +00:00
Igor Murashkin
29188adb72
am fb534824: am 66a77b72: camera: (LEGACY) - Add captureIntent and physicalSize metadata
...
* commit 'fb5348247bb48f29c0d4eb1d26344edda778e6dc':
camera: (LEGACY) - Add captureIntent and physicalSize metadata
2014-08-11 20:37:09 +00:00
Igor Murashkin
58c13f6430
am 1a3064dc: am b23dea98: camera: (Legacy) Add support for SCENE_MODE == FACE_PRIORITY
...
* commit '1a3064dce009482d3b14d949be87c6d38ab7c5ba':
camera: (Legacy) Add support for SCENE_MODE == FACE_PRIORITY
2014-08-11 20:37:05 +00:00
Igor Murashkin
d42a5fd3e7
camera2: (legacy) Fix the comparison for fixed-focus cameras
...
* Use #equals instead of == for string comparison
* Also make sure lens.info.minimumFocusDistance shows up in
CameraCharacteristics#getKeys() for fixed-focus cameras
Bug: 16900875
Change-Id: I3b9248c5cb62ddcfb13587c6349525e145e353ac
2014-08-11 13:25:01 -07:00
Igor Murashkin
7336f470e3
camera: (LEGACY) - Add captureIntent and physicalSize metadata
...
Bug: 16900182
Change-Id: I159f2416da71c2d7ea803d61b63476da90e03b1c
2014-08-11 13:25:01 -07:00
Igor Murashkin
8c4486c141
camera: (Legacy) Add support for SCENE_MODE == FACE_PRIORITY
...
Bug: 16898478
Change-Id: I4306f6380ea06e8bd95af8738e5dde1a42a8098c
2014-08-11 13:25:01 -07:00
Adam Powell
c07d6914ff
am 881d912c: resolved conflicts for merge of 8432e77b to lmp-dev-plus-aosp
...
* commit '881d912c842e8029add88a71f0d070c20ba0a500':
Don't unnecessarily set LayoutParams on children
2014-08-11 18:20:53 +00:00
Adam Powell
dbed9e5fef
resolved conflicts for merge of 8432e77b to lmp-dev-plus-aosp
...
Change-Id: I622670a390550e45cc9411f5071d50245d8e9ebd
2014-08-11 11:12:58 -07:00
Adam Powell
8432e77baa
am dafcc610: Merge "Don\'t unnecessarily set LayoutParams on children"
...
* commit 'dafcc61078cca409abd77516ce7ccee1eb60db2a':
Don't unnecessarily set LayoutParams on children
2014-08-11 17:52:03 +00:00
Sandeep Siddhartha
ccc11c26a0
am 2a792dcc: am 650c3649: am 361c8fbd: Merge "Remove direct field access from event payload" into lmp-dev
...
* commit '2a792dcc45c80a44a4527fae02665f4695d626e1':
Remove direct field access from event payload
2014-08-11 17:31:28 +00:00
Sandeep Siddhartha
e9c73f54fc
am c0d0d5f3: am 935bb342: am 69ae4519: Merge "Add debugging info to VIS via dump()" into lmp-dev
...
* commit 'c0d0d5f39f467b6ef8098cca0ba2e651a3fb3525':
Add debugging info to VIS via dump()
2014-08-11 17:31:24 +00:00
Sandeep Siddhartha
97887cf255
Merge "Remove direct field access from event payload" into lmp-dev
2014-08-11 17:09:03 +00:00
Sandeep Siddhartha
a3a5af04a0
Merge "Add debugging info to VIS via dump()" into lmp-dev
2014-08-11 17:09:01 +00:00
Yorke Lee
ea53840143
am d992271d: am b0c60f1b: am b789a8ee: Block access to call logs from the corp profile
...
* commit 'd992271dcd2f97b07e097594b03dc555779391a9':
Block access to call logs from the corp profile
2014-08-11 16:57:07 +00:00
Sandeep Siddhartha
d5730bc88c
Remove direct field access from event payload
...
Change-Id: I0b4462e56a977bfbaaebd2dd31d9246051af1b99
2014-08-11 09:53:44 -07:00
Yorke Lee
a79e2bedba
Block access to call logs from the corp profile
...
Bug: 16812842
Change-Id: Ie4342b5efb2419097c35c0ddebd486a098cea523
2014-08-11 09:43:18 -07:00
Sandeep Siddhartha
6df952ec22
Add debugging info to VIS via dump()
...
Change-Id: I9e8f4536de309256db835b30d94765bfc27d4e80
2014-08-11 09:38:38 -07:00
Craig Stout
3741372294
am 397eead0: am 1a11124f: am a0fb1aa2: Merge "Fix NPEs when inflating a ValueAnimator." into lmp-dev
...
* commit '397eead03b4823ce38b94421c36cc7e4b5e794a5':
Fix NPEs when inflating a ValueAnimator.
2014-08-11 15:25:19 +00:00
Yohei Yukawa
f9c72769fc
am 86f86d8d: am f78bd39c: am 548449f8: Merge "Fix handling of line-end and RTL characters in CursorAnchorInfo" into lmp-dev
...
* commit '86f86d8d0ee8c5d851055ed3c1e5cbcd72d72b8f':
Fix handling of line-end and RTL characters in CursorAnchorInfo
2014-08-11 12:08:04 +00:00
Jungshik Jang
e22a4f667f
am 7af5d630: am a0c9c8de: am 05df974a: Hook up device power status change to TIF
...
* commit '7af5d630a93cd92945bd0d8eb85ac3e08b075070':
Hook up device power status change to TIF
2014-08-11 05:09:44 +00:00
Jungshik Jang
61daf6b38e
Hook up device power status change to TIF
...
Instead of introducing new api update existing
IDeviceEventListener
Bug: 16445063
Change-Id: I93bfc736a06a78e83c95877a53f4f241b51ed9c0
2014-08-11 10:40:29 +09:00
Christopher Tate
e745e9bd3a
am cd31db3f: am 8cc1ce7f: am 932cd04a: Merge "Start using cancelFullBackup() when appropriate" into lmp-dev
...
* commit 'cd31db3ffb28e977e32d73c4b86437af1110f587':
Start using cancelFullBackup() when appropriate
2014-08-10 19:48:02 +00:00
Craig Stout
362dac08e4
Merge "Fix NPEs when inflating a ValueAnimator." into lmp-dev
2014-08-10 19:43:29 +00:00
Dianne Hackborn
192800ce71
am f12d76d7: am 01e26f94: am 47df503b: Fix issues 16739817 and 16709247 in voice interaction service.
...
* commit 'f12d76d71f1ad0c4384010fc66abf409058b2a0c':
Fix issues 16739817 and 16709247 in voice interaction service.
2014-08-09 20:44:15 +00:00
Dianne Hackborn
a351ab9698
Fix issues 16739817 and 16709247 in voice interaction service.
...
Issue #16739817 VIS doesn't start for non-primary user(s)
Issue #16709247 GSA is not the default voice interaction agent
These are both fixed by getting rid of the existing code for applying
the default voice recognizer, moving it in to the voice interaction
manager service, and extending it to also set up the default voice
interaction service.
Change-Id: If8d5936c28aebfa7eff77c8d99241c3a2ffdb0a4
2014-08-09 13:31:59 -07:00
Barnaby James
cdd33cff42
am 814723ea: am f6a549d1: am 180152af: Merge "Remove constants for VOICE_CONTROL_ZEN_MODE." into lmp-dev
...
* commit '814723ea7f151b28058a62d228d2a47452d40db7':
Remove constants for VOICE_CONTROL_ZEN_MODE.
2014-08-09 20:08:55 +00:00
Barnaby James
b8850040c4
Remove constants for VOICE_CONTROL_ZEN_MODE.
...
Change-Id: I197d68e66d9a1b197e7c35fd140101458cf5bfc7
2014-08-08 22:48:35 -07:00
Christopher Tate
83b2fb8f73
Merge "Start using cancelFullBackup() when appropriate" into lmp-dev
2014-08-09 00:40:15 +00:00
Christopher Tate
bf1a4a81eb
Start using cancelFullBackup() when appropriate
...
The API was in place but the framework wasn't yet calling it.
Bug 16524520
Change-Id: Ie368758c830a7d0ad11e7dd3142a0ed896069944
2014-08-09 00:48:47 +00:00
Amith Yamasani
4c64af4f63
am 9961cc34: am 70a36a49: am 3cb15637: Allow singleton providers to accept connections from other users
...
* commit '9961cc3450b2dc023f5c045ae37d747a89e12f3c':
Allow singleton providers to accept connections from other users
2014-08-09 00:08:07 +00:00
George Mount
98d8c3e61f
am 390b066b: am 2c61d2f5: am 8011744b: Merge "Move shared elements to overlay when in a transition group." into lmp-dev
...
* commit '390b066b894dd5a855c8028ce3b485374b4d1a55':
Move shared elements to overlay when in a transition group.
2014-08-08 23:56:33 +00:00
Amith Yamasani
a6f4d58b90
Allow singleton providers to accept connections from other users
...
This is required for singleton providers like sms log.
Change-Id: Icb18a764c27dc1b43f8b8bcc24c21c91274995fd
2014-08-08 16:50:42 -07:00
George Mount
9985aaf268
Merge "Move shared elements to overlay when in a transition group." into lmp-dev
2014-08-08 23:02:20 +00:00
Igor Murashkin
f5d813750d
am 05ed8150: am f9dc65f9: am b4131ac5: camera2: Fix TotalCaptureResult#getKeys not to return empty list
...
* commit '05ed8150ccb458fbe5064049f712829a6e25a83e':
camera2: Fix TotalCaptureResult#getKeys not to return empty list
2014-08-08 22:58:02 +00:00
Adam Lesinski
2586c89656
am 0bb27d84: am ed9be6fb: am 38daa3c5: Merge "Second iteration of the UsageStats API" into lmp-dev
...
* commit '0bb27d848264459c08f3d81406edb591c54aad87':
Second iteration of the UsageStats API
2014-08-08 22:49:43 +00:00
Igor Murashkin
696bbee963
camera2: Fix TotalCaptureResult#getKeys not to return empty list
...
Bug: 16680352
Change-Id: Ie6b8a8bff6f9b87d058a21b07eb3447371a62b6b
2014-08-08 22:45:00 +00:00
Sandeep Siddhartha
eaaaab8165
am 7a1f38c6: am eb2af5c2: am 0edd1360: Merge "Add the capture session (and its availability) in the EventPayload" into lmp-dev
...
* commit '7a1f38c6ab92d0600d533996ed976fd9fb7ba0b8':
Add the capture session (and its availability) in the EventPayload
2014-08-08 22:37:53 +00:00
Jinsuk Kim
499e0b61fc
am de953c2b: am fe9d9306: am ca4fb8cd: Merge "CEC: Content observer to handle TV Setting update" into lmp-dev
...
* commit 'de953c2b1b080ed698383c41145a119f4cae4d01':
CEC: Content observer to handle TV Setting update
2014-08-08 22:37:49 +00:00
Dongwon Kang
ec592558da
am d63ae8b9: am bc90cf2b: am e2ba5b0b: Merge "TIF: introducing TvInputSettings for put/getting user preferences from Settings." into lmp-dev
...
* commit 'd63ae8b9d28a1ac4c80665d688abfe665970d025':
TIF: introducing TvInputSettings for put/getting user preferences from Settings.
2014-08-08 22:37:44 +00:00
Svetoslav
4412771589
am 01c2a68a: am 32c7fd28: am 3b94d0d8: Merge "Polish the new cross-profile app widget APIs" into lmp-dev
...
* commit '01c2a68a4ebdc01ff8bc4c6789f3d99ce997d82a':
Polish the new cross-profile app widget APIs
2014-08-08 21:24:52 +00:00
Winson Chung
265b6fc548
am 8aa64bdf: am 0ecbe9d6: am 14176afa: Merge "Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)" into lmp-dev
...
* commit '8aa64bdf9fb4d37fda6590b709f63204693bde17':
Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)
2014-08-08 21:06:14 +00:00
Adam Powell
dafcc61078
Merge "Don't unnecessarily set LayoutParams on children"
2014-08-08 20:41:34 +00:00
Dongwon Kang
4d933a0ef0
TIF: introducing TvInputSettings for put/getting user preferences from Settings.
...
Reference:
- Settings.Secure.ENABLED_INPUT_METHODS
- InputMethodSettings
Bug: 16876078
Change-Id: I72c1770517052188694f21c10da383338edc8ee2
2014-08-08 21:36:50 +00:00
John Spurlock
df6a28475b
am ba5c934c: am fa8faa9b: am 508dc373: Merge "New api to sync zen mode state from listeners." into lmp-dev
...
* commit 'ba5c934c7e3562df7492b77ecb7904847011eedf':
New api to sync zen mode state from listeners.
2014-08-08 20:25:07 +00:00
Dake Gu
cc11a1106f
am dc0781b5: am ffbf66b6: am afb539e6: Merge "Transition: remap if views in calling activity became invalid" into lmp-dev
...
* commit 'dc0781b5518be0bcfce6a5e8f63a819b59ef1b0e':
Transition: remap if views in calling activity became invalid
2014-08-08 19:56:51 +00:00
Alan Viverette
1ed8e75a72
am 1bdf2c19: am 68bb1bfc: am 4f048817: Merge "Don\'t make ripples respond to selection state" into lmp-dev
...
* commit '1bdf2c192c55fc9bb195417df53327e08c61d726':
Don't make ripples respond to selection state
2014-08-08 19:56:47 +00:00
John Reck
e758fa1d0e
am 53eb8f73: am d78521f7: am 30f8cc8d: Merge "Don\'t use ViewPropertyAnimatorRT yet" into lmp-dev
...
* commit '53eb8f738fcf31f827b826af170ce653d4a7e1c4':
Don't use ViewPropertyAnimatorRT yet
2014-08-08 19:20:52 +00:00