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

127117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
ade07fd429 am a780d932: Merge "Fix bug #13727850 Input values are not visible when setting up the lockscreen... ...security(PIN/Passwor/Pattern)." 
* commit 'a780d9323b3ab9d0a06a9b8569164940d23405d4':
  Fix bug #13727850 Input values are not visible when setting up the lockscreen... ...security(PIN/Passwor/Pattern).
 2014-04-01 01:26:01 +00:00
Fabrice Di Meglio
a780d9323b Merge "Fix bug #13727850 Input values are not visible when setting up the lockscreen... ...security(PIN/Passwor/Pattern)." 2014-04-01 01:21:32 +00:00
Zhijun He
70e7b073e0 am 1a9b646c: Camera2: Fix missing capture result callback issue 
* commit '1a9b646c6b83aa091164dc94f9d1348bfca38227':
  Camera2: Fix missing capture result callback issue
 2014-04-01 01:01:58 +00:00
Zhijun He
1a9b646c6b Camera2: Fix missing capture result callback issue 
When configuring output right after submitting some capture request, the
waitUntilIdle clears the capture mCaptureListenerMap and
mRepeatingRequestIdDeletedList. This caused the listener is cleared before
the capture result is delivered to application side. Since the listener is
already removed properly, it is really not needed to clear them right after
idling the device.

It also doesn't make sense to add the repeating request id that has no
listener hooked up to the mRepeatingRequestIdDeletedList, this caused
out of sync between id deleted list and the mCaptureListenerMap for
repeating request.

Bug: 13730119
Change-Id: I94ab7a5515f841ffd97b103c2c1b71d92afd955a
 2014-03-31 17:34:29 -07:00
Jason Sams
9f7042ef29 am afec430a: am c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem" 
* commit 'afec430ada65936a4bb9143ec82c4c0429032fed':
  Fix RenderScriptGL setSurfaceTexture problem
 2014-04-01 00:31:12 +00:00
Scott Main
167b6dc728 am 0ba2de85: am 7471a3b1: am adcb288e: am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs 
* commit '0ba2de8530a5006538154fb5151081c60afef52d':
  update common intents guide to add calendar and alarms.
 2014-04-01 00:31:09 +00:00
Baligh Uddin
38b7096755 am 658e9080: (-s ours) am ce0854cc: (-s ours) am ee800b04: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '658e9080215ca852b15633ce4926a738ed24f9ef':
  Import translations. DO NOT MERGE
 2014-04-01 00:31:06 +00:00
Jason Sams
afec430ada am c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem" 
* commit 'c796ccaafb935592b98d5aaad2594791935f6530':
  Fix RenderScriptGL setSurfaceTexture problem
 2014-04-01 00:24:57 +00:00
Scott Main
0ba2de8530 am 7471a3b1: am adcb288e: am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs 
* commit '7471a3b1ea3b722168ed3e932d4015750c913c0b':
  update common intents guide to add calendar and alarms.
 2014-04-01 00:24:53 +00:00
Baligh Uddin
658e908021 am ce0854cc: (-s ours) am ee800b04: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'ce0854ccba6adae15cd0b1042e3ad5fb777293da':
  Import translations. DO NOT MERGE
 2014-04-01 00:24:50 +00:00
Jason Sams
c796ccaafb am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem" 
* commit '095ece10095ecb8c76e3ed4fb0dd1e23a5ced22b':
  Fix RenderScriptGL setSurfaceTexture problem
 2014-04-01 00:15:26 +00:00
Scott Main
7471a3b1ea am adcb288e: am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs 
* commit 'adcb288e3890381c9961ee32a79df8e9d805a6ad':
  update common intents guide to add calendar and alarms.
 2014-04-01 00:12:56 +00:00
Baligh Uddin
ce0854ccba am ee800b04: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'ee800b04d9ed625db93b1531eec0595838228e2f':
  Import translations. DO NOT MERGE
 2014-04-01 00:12:47 +00:00
Jason Sams
095ece1009 am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem" 
* commit 'b3cafa56205942343930e4fbb0a3d50d6e33a046':
  Fix RenderScriptGL setSurfaceTexture problem
 2014-04-01 00:10:55 +00:00
Alan Viverette
5745dec977 am 28e68c6a: Fix docs even more 
* commit '28e68c6a78c72d1fa419eae578440add369c0d42':
  Fix docs even more
 2014-04-01 00:10:28 +00:00
Alan Viverette
7aa331ba1b am 24369237: Merge "Fix docs" 
* commit '24369237f2a5c067738dcf03747bd37686dace29':
  Fix docs
 2014-04-01 00:10:25 +00:00
Deepanshu Gupta
60583e50b8 am f0cb1598: Merge "Add missing dependency in layoutlib build file" 
* commit 'f0cb159884f4566a72814df3685879a9eb9a173f':
  Add missing dependency in layoutlib build file
 2014-04-01 00:10:22 +00:00
Glenn Kasten
62e73f2415 am b9b07b8c: Merge "AudioTrack and AudioRecord JNI cleanup" 
* commit 'b9b07b8c48dca71c0aa6adf77baabcea0285215e':
  AudioTrack and AudioRecord JNI cleanup
 2014-04-01 00:10:19 +00:00
Alan Viverette
675081a282 am 30cac644: Merge "Switch device default theme over to Quantum" 
* commit '30cac644f161433fca92ca65edcb26b351a04e5a':
  Switch device default theme over to Quantum
 2014-04-01 00:10:16 +00:00
Baligh Uddin
ea0a0364d0 am bf93a28f: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'bf93a28f4cb781cabfb385b29fe6e1bc718bef5e':
  Import translations. DO NOT MERGE
 2014-04-01 00:10:09 +00:00
Baligh Uddin
10bfad1dbe am 9fa67d8e: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '9fa67d8e4dd2f54f779c9090ee88eabc0fbc0cac':
  Import translations. DO NOT MERGE
 2014-04-01 00:10:06 +00:00
Scott Main
adcb288e38 am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs 
* commit 'b1088bfe8d321f299d92736102b573963315dc26':
  update common intents guide to add calendar and alarms.
 2014-04-01 00:03:18 +00:00
Fabrice Di Meglio
1cf3594114 Fix bug #13727850 Input values are not visible when setting up the lockscreen... 
...security(PIN/Passwor/Pattern).

- remove that hardcoded color
- enable passing a color for the Path lines

Change-Id: Ie40b15bf209f41ea2df16842a3e56ffc2020df65
 2014-03-31 16:50:29 -07:00
Alan Viverette
28e68c6a78 Fix docs even more 
Change-Id: I436615302d24f2f098e2224881c65dbef0d20cfa
 2014-03-31 16:41:31 -07:00
Alan Viverette
24369237f2 Merge "Fix docs" 2014-03-31 23:39:11 +00:00
Alan Viverette
dead414a90 Fix docs 
Change-Id: I79ee1cccb723f7471b175e1f2fc7ac94d54a526e
 2014-03-31 16:37:42 -07:00
Jason Sams
b3cafa5620 Merge "Fix RenderScriptGL setSurfaceTexture problem" 2014-03-31 23:21:42 +00:00
Deepanshu Gupta
f0cb159884 Merge "Add missing dependency in layoutlib build file" 2014-03-31 23:14:35 +00:00
Deepanshu Gupta
411b9691e3 Add missing dependency in layoutlib build file 
Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
 2014-03-31 16:11:13 -07:00
Glenn Kasten
b9b07b8c48 Merge "AudioTrack and AudioRecord JNI cleanup" 2014-03-31 23:06:50 +00:00
Alan Viverette
30cac644f1 Merge "Switch device default theme over to Quantum" 2014-03-31 22:38:14 +00:00
Baligh Uddin
f7002f4ef8 Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev 2014-03-31 22:11:38 +00:00
Baligh Uddin
ee800b04d9 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-31 22:11:33 +00:00
Baligh Uddin
bf93a28f4c Merge "Import translations. DO NOT MERGE" 2014-03-31 22:11:26 +00:00
Baligh Uddin
466e28c041 Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev 2014-03-31 22:11:24 +00:00
Baligh Uddin
9fa67d8e4d Merge "Import translations. DO NOT MERGE" 2014-03-31 22:09:54 +00:00
Alan Viverette
3054e2d5b1 Switch device default theme over to Quantum 
Change-Id: I4d8ad0a9d62b898ae34900b4a749e75a975af5af
 2014-03-31 15:01:00 -07:00
Scott Main
b1088bfe8d Merge "update common intents guide to add calendar and alarms." into klp-docs 2014-03-31 21:47:45 +00:00
Zhihai Xu
0db3ae63e4 am 6b96c1b2: am 7d394df2: am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev 
* commit '6b96c1b2ea5d28fc2501226bda14327f1963ba0c':
  LE: Add API to configure MTU for a given connection (3/4)
 2014-03-31 21:40:31 +00:00
Zhihai Xu
6b96c1b2ea am 7d394df2: am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev 
* commit '7d394df2ab8f951215a775df8d2bd9e6518e746a':
  LE: Add API to configure MTU for a given connection (3/4)
 2014-03-31 21:35:38 +00:00
Zhihai Xu
7d394df2ab am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev 
* commit 'ae1b763cded7e2cb3eec3cbec0680c25e55c109c':
  LE: Add API to configure MTU for a given connection (3/4)
 2014-03-31 21:28:47 +00:00
Zhihai Xu
ae1b763cde Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev 2014-03-31 21:21:54 +00:00
Jorim Jaggi
e111c73205 Add missing permission to SystemUI package. 
Bug: 13635952
Change-Id: I09f7533e59d39b1653a44552fcbe05b0dbde828a
 2014-03-31 22:50:13 +02:00
Nick Kralevich
b4b159d255 am 0e290b77: am ce30fca8: am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs." 
* commit '0e290b7708e2ac59e645f499d8348a3a087a9568':
  Change when the SELinux relabel of /data/data occurs.
 2014-03-31 20:32:13 +00:00
Nick Kralevich
0e290b7708 am ce30fca8: am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs." 
* commit 'ce30fca85deec8e268009a2acaefe85541ab1e58':
  Change when the SELinux relabel of /data/data occurs.
 2014-03-31 20:26:27 +00:00
Nick Kralevich
ce30fca85d am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs." 
* commit 'e531e2ec6b311c35b077cc228e832b3f1530dffa':
  Change when the SELinux relabel of /data/data occurs.
 2014-03-31 20:20:41 +00:00
Nick Kralevich
e531e2ec6b am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs." 
* commit '3b2a9d22794cb9f1c2a28884b5c3ba92ecc6ff96':
  Change when the SELinux relabel of /data/data occurs.
 2014-03-31 20:14:37 +00:00
ztenghui
2b2ad8f728 am 2f9ec356: Merge "Make the reveal animation API public" 
* commit '2f9ec3560d21e3db4f91a64e68d6b678714cd749':
  Make the reveal animation API public
 2014-03-31 20:10:46 +00:00
Brian Carlstrom
1ad28fd8fc am ed99dc89: am 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation" 
* commit 'ed99dc89c32830cffe7a3912b2026942910c4c8f':
  Improve detail message for X509TrustManagerExtensions argument validation
 2014-03-31 20:10:43 +00:00
Nick Kralevich
3b2a9d2279 Merge "Change when the SELinux relabel of /data/data occurs." 2014-03-31 20:09:31 +00:00