drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,843 Commits 1 Branch 0 Tags
Commit Graph

152843 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
a02aea152d am f09fda20: am f9d996c1: Fix status bar cast icon not updating 
* commit 'f09fda20edae6a126513c658a89eec15361382fa':
  Fix status bar cast icon not updating
 2014-09-22 19:19:55 +00:00
Ruben Brunk
909cfbe062 am ee38cd33: am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev 
* commit 'ee38cd33a91f9c153ef2b12d383766a314dfd95a':
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.
 2014-09-22 19:19:39 +00:00
John Spurlock
453b35e2c4 am 797fd661: am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev 
* commit '797fd661e8bbe504dfb4378ac10de1181dc62f6b':
  Doze: Ensure a doze reset happens after leaving keyguard.
 2014-09-22 19:19:35 +00:00
Yigit Boyar
ccf5d24b7a am a9faefb3: am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev 
* commit 'a9faefb370e9eb63ffd956507f7f854a89122759':
  Allow fallback to Toolbar's default Navigation Icon
 2014-09-22 19:19:15 +00:00
Sailesh Nepal
4014ff4daf am 55c58d01: am 5fb8a942: Merge "Pass disconnect reason for failed remote connections" into lmp-dev 
* commit '55c58d019c744c52e7b8e4451007371b55eb1127':
  Pass disconnect reason for failed remote connections
 2014-09-22 19:19:02 +00:00
Ruben Brunk
ee99c63f75 am 252bfab5: am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev 
* commit '252bfab5897109603cd009e9cb8a73e0622c2a10':
  camera2: refactor LEGACY mode error handling.
 2014-09-22 19:18:56 +00:00
Baligh Uddin
295a352bac am b360a75b: (-s ours) am 6564aa05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'b360a75b81f26a67bfc77ad6c92a23fac400de96':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:35 +00:00
Baligh Uddin
c6dbf0751a am df22ae1a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'df22ae1ac964344cb7f24ecfad0fb7b370138da3':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:26 +00:00
Svetoslav
8d109485ab am 562f38ee: am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev 
* commit '562f38ee11c9bc5dc20e5fe8740dfea9ab54db42':
  Fix memory leak in accessibility cache.
 2014-09-22 19:18:22 +00:00
Baligh Uddin
0fdff82ac4 am 6dce2b37: (-s ours) am c9d9fbf9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6dce2b37c2c49163529b912ba792e520a722f813':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:19 +00:00
Baligh Uddin
5918a38cc8 am c125603b: (-s ours) am 569d3d30: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c125603bcf674f22b41220f18d68fd42af13b610':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:15 +00:00
Baligh Uddin
345e878a79 am b2ad2913: (-s ours) am 5ed716c1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'b2ad291364fdeea44b1d95269b4274c7808de53c':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:11 +00:00
Baligh Uddin
12842040ed am ff1198e5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'ff1198e57df6a9827c3dac5405ba19f568d7cf32':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:07 +00:00
Baligh Uddin
b5acf9bfc1 am 5adb5a18: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '5adb5a18ccb1b79adfce925da1012ec580baf636':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:04 +00:00
Baligh Uddin
4413889dbc am 906ba6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '906ba6b951c241c254f3257a2ed81663ff11f39b':
  Import translations. DO NOT MERGE
 2014-09-22 19:18:00 +00:00
John Spurlock
50d0144996 am 7e5776e1: am bfaadc6b: Merge "Mark sysui config resource as untranslatable." into lmp-dev 
* commit '7e5776e12c9706f511c22993dfed3bb30d22ed8d':
  Mark sysui config resource as untranslatable.
 2014-09-22 19:17:38 +00:00
Jason Monk
443c4e6504 am f9d996c1: Fix status bar cast icon not updating 
* commit 'f9d996c179e319e54769230e293b8712a3f0631b':
  Fix status bar cast icon not updating
 2014-09-22 15:46:42 +00:00
Jason Monk
7eb6202fee Fix status bar cast icon not updating 
Change the listening in CastControllerImpl so that it will always
at least passive discovery when callbacks are added.  When discovering
is set this will switch to request discovery.  This allows the
status bar to catch disconnect callbacks when QS is not discovering.

Bug: 17555869
Change-Id: Id2a80b98f6c7ca7e6a4d0ff00315d10a109e8259
 2014-09-22 10:53:50 -04:00
Ruben Brunk
8aa88195fe am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev 
* commit '3b57d98a1a84ce063cb3681cae10795216300035':
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.
 2014-09-22 03:43:23 +00:00
John Spurlock
76e9454189 am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev 
* commit '61ffcacad7be97c8f102b23298d2c9c80f69e550':
  Doze: Ensure a doze reset happens after leaving keyguard.
 2014-09-22 03:17:40 +00:00
Yigit Boyar
27dd47f81a am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev 
* commit 'a07169280401c84ac914b98028d7e991cee5a85d':
  Allow fallback to Toolbar's default Navigation Icon
 2014-09-22 03:17:19 +00:00
Ruben Brunk
ee3ef2b8af Merge changes Iccd4d53d,Id449bc7a into lmp-dev 
* changes:
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.
 2014-09-22 02:54:22 +00:00
John Spurlock
87038509f3 Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev 2014-09-22 02:00:38 +00:00
Yigit Boyar
5507b223dd Merge "Allow fallback to Toolbar's default Navigation Icon" into lmp-dev 2014-09-22 01:14:40 +00:00
Ruben Brunk
97b5301b09 camera2: Avoid setting null metering regions in LEGACY. 
Bug: 17587491

- If a single region with zero weight is set, revert to default
  metering region rather than attempting to set a null to
  avoid setParameters failure.

Change-Id: Iccd4d53d5a2134a9d744eafb731f464b653a154d
 2014-09-21 16:09:34 -07:00
Ruben Brunk
09a6bed6c6 camera2: Fix JPEG orientation set by LEGACY request. 
Bug: 17589231
Change-Id: Id449bc7a39a6550413e6c441b6dc204e11eacda9
 2014-09-21 16:09:34 -07:00
John Spurlock
cf5d3c98d1 Doze: Ensure a doze reset happens after leaving keyguard. 
Bug:17536133
Change-Id: Ibc88a7f2c1a51656676fe62d4de8ab3ec4dd4081
 2014-09-21 18:00:01 -04:00
Sailesh Nepal
67d65dd84e am 5fb8a942: Merge "Pass disconnect reason for failed remote connections" into lmp-dev 
* commit '5fb8a9425dfa31b3a50a54ff361e339dc0f777d7':
  Pass disconnect reason for failed remote connections
 2014-09-21 21:41:19 +00:00
Sailesh Nepal
c0f337ca7a Merge "Pass disconnect reason for failed remote connections" into lmp-dev 2014-09-21 21:35:23 +00:00
Ruben Brunk
5426bc2351 am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev 
* commit '6a80927aef62f74a4801180adf68fe8781181060':
  camera2: refactor LEGACY mode error handling.
 2014-09-21 19:25:56 +00:00
Ruben Brunk
2610a1ba5d Merge "camera2: refactor LEGACY mode error handling." into lmp-dev 2014-09-21 19:16:57 +00:00
Ruben Brunk
e663cb7728 camera2: refactor LEGACY mode error handling. 
Bug: 17431462
Bug: 17407537

- Add Surface format/size validation during configure.
- Update exception error codes used in binder calls.
- Report dropped requests, frames, captures, and device
  errors in binder callback properly.
- Fixes CameraDeviceTest errors for incorrect metering
  rectangle weight in template tests.
- Fixes CameraDeviceTest errors for missing
  noiseReductionMode field in template tests.
- Implement flush call.

Change-Id: I0da803bccf2bfb9b4c0cf61208e160a86c577497
 2014-09-21 12:09:23 -07:00
Baligh Uddin
7782b8abb6 am 6564aa05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6564aa053e240e8a4eb75191ecf03ab135eedad8':
  Import translations. DO NOT MERGE
 2014-09-21 18:15:31 +00:00
Baligh Uddin
33d34b89d1 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-21 18:07:51 +00:00
Baligh Uddin
64387a366d Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-09-21 18:07:46 +00:00
Baligh Uddin
961bc1fb6a Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-21 18:07:42 +00:00
Svetoslav
e5b726efca am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev 
* commit '23e6a2440435d417791e99b95402721b535f73e4':
  Fix memory leak in accessibility cache.
 2014-09-21 18:02:20 +00:00
Baligh Uddin
01328341a3 am c9d9fbf9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c9d9fbf9acd32de0ae90109d95b09e90191f7930':
  Import translations. DO NOT MERGE
 2014-09-21 18:02:16 +00:00
Baligh Uddin
8befb14626 am 569d3d30: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '569d3d30043f07d15abc6cfcafc1d27056c1c096':
  Import translations. DO NOT MERGE
 2014-09-21 18:02:13 +00:00
Baligh Uddin
a7c206856c am 5ed716c1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '5ed716c1f4a4ae0ec9c8ec787b56cf6596b1020d':
  Import translations. DO NOT MERGE
 2014-09-21 18:02:10 +00:00
Svetoslav
650d7d9dd2 Merge "Fix memory leak in accessibility cache." into lmp-dev 2014-09-21 17:53:45 +00:00
Baligh Uddin
e5a94bbdaa Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-21 17:52:21 +00:00
Baligh Uddin
a9e651b6ba Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-21 17:52:19 +00:00
Baligh Uddin
6a307e8ba1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-09-21 17:52:16 +00:00
Baligh Uddin
44767762ca Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-21 17:51:58 +00:00
Baligh Uddin
e2334661d7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-09-21 17:51:55 +00:00
Baligh Uddin
c9759d761e Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-21 17:51:47 +00:00
Baligh Uddin
43c9e64b9a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-21 17:51:34 +00:00
Baligh Uddin
817bb46306 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-21 17:51:04 +00:00
John Spurlock
91e022b426 am bfaadc6b: Merge "Mark sysui config resource as untranslatable." into lmp-dev 
* commit 'bfaadc6b4098c23f5dc1a15522a011ba3cd72bf5':
  Mark sysui config resource as untranslatable.
 2014-09-21 17:06:49 +00:00