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

153009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alan Viverette
e786895918 Merge "Pass explicit null theme when preloading drawables" into lmp-dev 2014-09-22 19:18:03 +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
John Spurlock
b753372da6 Zen: Add content description to settings icon. 
Bug:17578039
Change-Id: I6c513200b2ac1d6abd6da0dd7412500a12fded28
 2014-09-22 15:14:48 -04:00
Yohei Yukawa
5c3d18d1f7 am b5d063dc: Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev 
* commit 'b5d063dc8126d9cddf5dd5172f32213469b2c11b':
  Work on issue #17506095: Plumb a new configuration to IMMS
 2014-09-22 18:12:02 +00:00
Adam Lesinski
d498da74de am 81745c51: Merge "AAPT: Continuation of public/private attribute fix" into lmp-dev 
* commit '81745c5164c3931ee3de184d2a0b463e0d5721af':
  AAPT: Continuation of public/private attribute fix
 2014-09-22 18:11:58 +00:00
Yohei Yukawa
ca5e72c5ae Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev 2014-09-22 18:02:12 +00:00
Adam Lesinski
2b7ee9a18e Merge "AAPT: Continuation of public/private attribute fix" into lmp-dev 2014-09-22 18:00:31 +00:00
Przemyslaw Szczepaniak
8977eae6db am 299bb1fb: Fix issues with new TTS API 
* commit '299bb1fbc62ab8d6e1389cb2959e093e217f8c79':
  Fix issues with new TTS API
 2014-09-22 17:55:56 +00:00
Adam Lesinski
e572c011fe AAPT: Continuation of public/private attribute fix 
XML files like layouts are now scanned and checked
for v21 attributes. If those kinds of attributes
are found, then we remove them in the original
version and synthesize a new xml file under the
v21 configuration.

Bug:17520380
Change-Id: Icf984cb96134180a2e35349c1dbf2cef9a8f0bda
 2014-09-22 10:51:20 -07:00
David Friedman
8dcf1c3229 Fixes two typos, one in each file. 
Change-Id: I5f4a9100d20f8ad50052d63dc106a030ac75b1b0
 2014-09-22 10:24:41 -07:00
Przemyslaw Szczepaniak
f9ba548f21 Fix issues with new TTS API 
Bug: 17389935
Change-Id: I59234b3222f59dc89be7e40f7d4706b1f8c610ce
 2014-09-22 17:39:16 +01:00
Jason Monk
1c30334b77 am 5c2ecf24: Merge "Announce title of QS detail views" into lmp-dev 
* commit '5c2ecf242ba7cda0340574e543b581818972e76a':
  Announce title of QS detail views
 2014-09-22 15:46:46 +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
Adrian Roos
38fc7606b1 Ensure that force lock works with accessibility enabled 
Fixes a bug where the force lock gesture was not available
when an accessibility service was active, but touch exploration
wasn't.

Bug: 17514298
Change-Id: Ib42e28f643559040ad5f24d45456b0a41008c647
 2014-09-22 17:34:56 +02:00
Jason Monk
fdb35f0526 Merge "Announce title of QS detail views" into lmp-dev 2014-09-22 15:33:06 +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
Jason Monk
8051316273 Announce title of QS detail views 
When entering a QS detail view announce the title of the view for
accessibility.

Bug: 17578404
Change-Id: I4cfd1bc85604af822b4f5fce852b39687f71cbae
 2014-09-22 10:21:01 -04:00
Alan Viverette
84e001a9f5 Pass explicit null theme when preloading drawables 
Prevents "unresolved theme attributes" warning.

BUG: 17589490
Change-Id: I5217d85b1d5ce8b551315ee8b1ca79eccfac3f10
 2014-09-22 07:05:33 +00:00
Lorenzo Colitti
5026279ce4 Add a throw route to the VPN endpoint. 
Without this, legacy VPN types that don't send all traffic
through a tun or ppp interface, but instead have the kernel
apply IPsec transforms directly to the original packets, will
try to send traffic to the VPN endpoint through the VPN, which
will not work.

Bug: 17462989
Change-Id: I3ebf0cec726dd12b2c57ba5d66775f8c02b25b70
 2014-09-22 13:10:15 +09:00
Lorenzo Colitti
4b0f8e6fb7 Support non-unicast route types: unreachable and throw. 
Bug: 17462989
Change-Id: I8635472ca3e96ec2866af2de48e6260ab2da13fb
 2014-09-22 13:10:15 +09: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
4aed87a9ed camera2: Avoid spurious IDLE transitions. 
Bug: 17594247

- Avoid spurious IDLE transitions when waiting for
  prior requests to complete.
- Clean up error reporting for GL thread and CameraDeviceState.
- Add error handling for Camera1 ErrorCallback calls.

Change-Id: I72850251d8965139b6db2193e91483a3d3409b7c
 2014-09-21 20:09:38 -07: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