summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 0dbaba6c: am 5e47c802: am 56867804: Merge "Respect the record audio app ↵Svet Ganov2015-04-2914-29/+117
|\ | | | | | | | | | | | | op - framework" into mnc-dev * commit '0dbaba6c3a7ae0a45e2305a21b0ef5decbde59a4': Respect the record audio app op - framework
| * am 5e47c802: am 56867804: Merge "Respect the record audio app op - ↵Svet Ganov2015-04-2914-29/+117
| |\ | | | | | | | | | | | | | | | | | | framework" into mnc-dev * commit '5e47c802ef1ac9437b012bc70701ffaf048cb399': Respect the record audio app op - framework
| | * am 56867804: Merge "Respect the record audio app op - framework" into mnc-devSvet Ganov2015-04-2914-29/+117
| | |\ | | | | | | | | | | | | | | | | * commit '5686780404a41901d226cc7ba506c1c0ba284713': Respect the record audio app op - framework
| | | * Merge "Respect the record audio app op - framework" into mnc-devSvet Ganov2015-04-2914-29/+117
| | | |\
| | | | * Respect the record audio app op - frameworkSvet Ganov2015-04-2814-29/+117
| | | | | | | | | | | | | | | | | | | | Change-Id: I5696d2ef22738ccffaf8bd7a0ee68cbc3dea3bf1
* | | | | am e58e0e50: am 737f0b22: am 7201bf2b: Merge "Unify View alpha implies ↵Chris Craik2015-04-291-5/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | clipping behavior" into mnc-dev * commit 'e58e0e50efa429b47985acedf3ec7d8d5745ea95': Unify View alpha implies clipping behavior
| * | | | am 737f0b22: am 7201bf2b: Merge "Unify View alpha implies clipping behavior" ↵Chris Craik2015-04-291-5/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '737f0b22bec07297eea782ea2cb29b056e849efc': Unify View alpha implies clipping behavior
| | * | | am 7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-devChris Craik2015-04-291-5/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '7201bf2b7ebac4ed0be6efd6b046f93a8de5b2d0': Unify View alpha implies clipping behavior
| | | * | Merge "Unify View alpha implies clipping behavior" into mnc-devChris Craik2015-04-291-5/+1
| | | |\ \
| | | | * | Unify View alpha implies clipping behaviorChris Craik2015-04-281-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:20254728 Change-Id: If472adf7c75ca9ccfeb0d22e005c1215aacfb80f
* | | | | | am 2c160c1a: am bdf9ffdd: am c0667853: Merge "Add SystemApis in ↵destradaa2015-04-293-14/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206" into mnc-dev * commit '2c160c1a64a696dcb6261311ca0a406a07231d33': Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206
| * | | | | am bdf9ffdd: am c0667853: Merge "Add SystemApis in GpsMeasurements APIs to ↵destradaa2015-04-293-14/+7
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reflect changes in GPS HAL. b/19938206" into mnc-dev * commit 'bdf9ffdd834f5cd021f79c33ce82a16b461f454f': Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206
| | * | | | am c0667853: Merge "Add SystemApis in GpsMeasurements APIs to reflect ↵destradaa2015-04-293-14/+7
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes in GPS HAL. b/19938206" into mnc-dev * commit 'c0667853ffad211a5dd40202ff1a4601449b745e': Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206
| | | * | | Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. ↵destradaa2015-04-293-14/+7
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | b/19938206" into mnc-dev
| | | | * | | Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL.destradaa2015-04-283-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/19938206 Change-Id: I91fd65b29e091b600ee4982a16321308e4d55aef
* | | | | | | am 8020631f: (-s ours) am 45b04c1a: am 47ea8b3d: Merge "DO NOT MERGE: Update ↵Abodunrinwa Toki2015-04-290-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | floatingtoolbar position when cursor moves." into mnc-dev * commit '8020631fa4a5d2d30cdf227cd2563404a3f7d726': DO NOT MERGE: Update floatingtoolbar position when cursor moves.
| * | | | | | am 45b04c1a: am 47ea8b3d: Merge "DO NOT MERGE: Update floatingtoolbar ↵Abodunrinwa Toki2015-04-291-0/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position when cursor moves." into mnc-dev * commit '45b04c1a5ef4f21b14b40dd0c1035933188da322': DO NOT MERGE: Update floatingtoolbar position when cursor moves.
| | * | | | | am 47ea8b3d: Merge "DO NOT MERGE: Update floatingtoolbar position when ↵Abodunrinwa Toki2015-04-291-0/+4
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cursor moves." into mnc-dev * commit '47ea8b3d6bcef193a2d0ec9f0141525c83a0bcda': DO NOT MERGE: Update floatingtoolbar position when cursor moves.
| | | * | | | Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." ↵Abodunrinwa Toki2015-04-291-0/+4
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| | | | * | | | DO NOT MERGE: Update floatingtoolbar position when cursor moves.Abodunrinwa Toki2015-04-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: This is only done on ACTION_UP event since the toolbar is going to be hidden while one is dragging the handles. Change-Id: Id09fc076edb0117ebceb26395ac91ee4d2283c2d
* | | | | | | | am 94ae5f3c: am fbad902a: am 80fa2cc8: Merge "Add ↵Cedric Ho2015-04-293-0/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev * commit '94ae5f3c089e9bdd39011dacc09411058ddc4a6e': Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine.
| * | | | | | | am fbad902a: am 80fa2cc8: Merge "Add android.speech.RecognizerIntent ↵Cedric Ho2015-04-293-0/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev * commit 'fbad902aad433f4eaa82192019fef1dcaba26d47': Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine.
| | * | | | | | am 80fa2cc8: Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE ↵Cedric Ho2015-04-293-0/+10
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to indicate whether to only use an offline speech recognition engine." into mnc-dev * commit '80fa2cc8a96e05cec574bd06c9038ad4255ecafb': Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine.
| | | * | | | | Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate ↵Cedric Ho2015-04-293-0/+10
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | whether to only use an offline speech recognition engine." into mnc-dev
| | | | * | | | | Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicateCedric Ho2015-04-273-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whether to only use an offline speech recognition engine. Change-Id: I15fe9b31f74af1438a018a76a9c7755b43bdc835
* | | | | | | | | am 658b6868: am fb5caad6: am 721474bb: Merge "Add OP_AUTH_NEEDED KeyStore ↵Chad Brubaker2015-04-290-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | result code" into mnc-dev * commit '658b686838f3b4ffdc7f371f9f89d7e022b1b02a': Add OP_AUTH_NEEDED KeyStore result code
| * | | | | | | | am fb5caad6: am 721474bb: Merge "Add OP_AUTH_NEEDED KeyStore result code" ↵Chad Brubaker2015-04-290-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit 'fb5caad6d71c1ed0c2ea7065f5bc650822d70e16': Add OP_AUTH_NEEDED KeyStore result code
| | * | | | | | | am 721474bb: Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-devChad Brubaker2015-04-291-0/+8
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '721474bb9cfb76e29e0fe6e98c6b582c6fa78fe4': Add OP_AUTH_NEEDED KeyStore result code
| | | * | | | | | Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-devChad Brubaker2015-04-291-0/+8
| | | |\ \ \ \ \ \
| | | | * | | | | | Add OP_AUTH_NEEDED KeyStore result codeChad Brubaker2015-04-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OP_AUTH_NEEDED will be returned from begin when an operation needs a per operation authentication before calling update. Note that the begin call succeeds when this error is returned, the token and handle are valid. (cherry picked from commit dabe520a3e6b0d0c40adfd748483fa336c43c366) Change-Id: I0ba4e997360843b5eb6c1db9c5fcd1c4d5a2c717
* | | | | | | | | | am 4f0287f9: am d2d8f27a: am 2333912c: Restore checkbox checked color to ↵Alan Viverette2015-04-292-6/+15
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | colorControlActivated * commit '4f0287f9f8b4383a330f660b4e277c431f38b4d4': Restore checkbox checked color to colorControlActivated
| * | | | | | | | | am d2d8f27a: am 2333912c: Restore checkbox checked color to ↵Alan Viverette2015-04-292-6/+15
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | colorControlActivated * commit 'd2d8f27ab9e0bb13f7aab4929e2ff4a8b547fdde': Restore checkbox checked color to colorControlActivated
| | * | | | | | | | am 2333912c: Restore checkbox checked color to colorControlActivatedAlan Viverette2015-04-292-6/+15
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2333912c6e4d51995a3fd01286c21c4d0328eb1a': Restore checkbox checked color to colorControlActivated
| | | * | | | | | | Restore checkbox checked color to colorControlActivatedAlan Viverette2015-04-292-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20683633 Change-Id: I8997ad5829eda7afa03b7c56d4f44e4abfe34bee
* | | | | | | | | | am e1f670b0: (-s ours) am 91b5e328: (-s ours) am 0e0c9d93: (-s ours) Merge ↵Geoff Mendal2015-04-290-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into mnc-dev * commit 'e1f670b0da193342ea658dd80f9e436139e6c47c': Import translations. DO NOT MERGE
| * | | | | | | | | am 91b5e328: (-s ours) am 0e0c9d93: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-04-290-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dev * commit '91b5e32824ae93666a129ca43f9a434328d82f5b': Import translations. DO NOT MERGE
| | * | | | | | | | am 0e0c9d93: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-04-290-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e0c9d9392e4b4580939632ca4e74f2073e59290': Import translations. DO NOT MERGE
| | | * | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-04-2973-32/+1186
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-04-2973-32/+1186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie2516ab34be72c0de86e3d546b349118be9c093c Auto-generated-cl: translation import
* | | | | | | | | | | am 794baeb1: am 71ce6e9f: am 7a6caae6: Merge "Adjust display inversion ↵Alan Viverette2015-04-291-5/+11
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix to account for luminance" into mnc-dev * commit '794baeb196813f68f2fb2e952b334fcc33c5751d': Adjust display inversion matrix to account for luminance
| * | | | | | | | | | am 71ce6e9f: am 7a6caae6: Merge "Adjust display inversion matrix to account ↵Alan Viverette2015-04-291-5/+11
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for luminance" into mnc-dev * commit '71ce6e9f6c39ac951d4bdd65b256816e8924cc6b': Adjust display inversion matrix to account for luminance
| | * | | | | | | | | am 7a6caae6: Merge "Adjust display inversion matrix to account for ↵Alan Viverette2015-04-291-5/+11
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | luminance" into mnc-dev * commit '7a6caae616fedab08aa3bcb1e37edf5f1e756dda': Adjust display inversion matrix to account for luminance
| | | * | | | | | | | Merge "Adjust display inversion matrix to account for luminance" into mnc-devAlan Viverette2015-04-291-5/+11
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Adjust display inversion matrix to account for luminanceAlan Viverette2015-04-281-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20346301 Change-Id: I10633705f2bfddbdeec063f9489a4f8679b9e8ee
* | | | | | | | | | | | am da8d35cd: (-s ours) am 78a4348a: am eea5a9e0: Merge "DO NOT MERGE - Minor ↵Andrei Stingaceanu2015-04-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clean up: redundant functionality in Editor and TextView." into mnc-dev * commit 'da8d35cd3139e962f482979b4c6fee8f9d806431': DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.
| * | | | | | | | | | | am 78a4348a: am eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant ↵Andrei Stingaceanu2015-04-292-35/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality in Editor and TextView." into mnc-dev * commit '78a4348a535e530ae77c0e7777247d495596be7c': DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.
| | * | | | | | | | | | am eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant functionality ↵Andrei Stingaceanu2015-04-292-35/+10
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in Editor and TextView." into mnc-dev * commit 'eea5a9e0de5825bf3629ad52a51a0dcf5f064fe5': DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.
| | | * | | | | | | | | Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and ↵Andrei Stingaceanu2015-04-292-35/+10
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TextView." into mnc-dev
| | | | * | | | | | | | | DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.Andrei Stingaceanu2015-04-282-35/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a no-op. Change-Id: I28ec363a256d3d1a94e378d428897cc67c77d578
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-04-2976-68/+1252
|\ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-02-13 22:07:37 +0000