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

190271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
6228ea26ef am 108f0a34: am b2cec86a: Merge "Skip frames with no damage" into mnc-dev 
* commit '108f0a341ad2176b25df7757f1dc793289b48cc0':
  Skip frames with no damage
 2015-04-29 20:33:48 +00:00
Abodunrinwa Toki
ef586c12d1 am eaa44818: am 05a56db3: Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev 
* commit 'eaa44818adbe8c6ee850c530fc70809502340469':
  DO NOT MERGE: Minor fixes to FloatingToolbar.
 2015-04-29 20:21:57 +00:00
John Reck
108f0a341a am b2cec86a: Merge "Skip frames with no damage" into mnc-dev 
* commit 'b2cec86a44f3fe937079b26827bdc031f5aec731':
  Skip frames with no damage
 2015-04-29 20:21:39 +00:00
John Reck
b2cec86a44 Merge "Skip frames with no damage" into mnc-dev 2015-04-29 20:10:26 +00:00
Abodunrinwa Toki
eaa44818ad am 05a56db3: Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev 
* commit '05a56db39d26e1e6ee160e82b79df39c15d1804c':
  DO NOT MERGE: Minor fixes to FloatingToolbar.
 2015-04-29 20:09:20 +00:00
Abodunrinwa Toki
05a56db39d Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev 2015-04-29 19:57:48 +00:00
Svet Ganov
0dbaba6c3a am 5e47c802: am 56867804: Merge "Respect the record audio app op - framework" into mnc-dev 
* commit '5e47c802ef1ac9437b012bc70701ffaf048cb399':
  Respect the record audio app op - framework
 2015-04-29 19:55:31 +00:00
Svet Ganov
5e47c802ef am 56867804: Merge "Respect the record audio app op - framework" into mnc-dev 
* commit '5686780404a41901d226cc7ba506c1c0ba284713':
  Respect the record audio app op - framework
 2015-04-29 19:44:33 +00:00
Chris Craik
e58e0e50ef am 737f0b22: am 7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-dev 
* commit '737f0b22bec07297eea782ea2cb29b056e849efc':
  Unify View alpha implies clipping behavior
 2015-04-29 19:42:49 +00:00
Svet Ganov
5686780404 Merge "Respect the record audio app op - framework" into mnc-dev 2015-04-29 19:34:06 +00:00
Chris Craik
737f0b22be am 7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-dev 
* commit '7201bf2b7ebac4ed0be6efd6b046f93a8de5b2d0':
  Unify View alpha implies clipping behavior
 2015-04-29 19:32:42 +00:00
Chris Craik
7201bf2b7e Merge "Unify View alpha implies clipping behavior" into mnc-dev 2015-04-29 19:23:41 +00:00
destradaa
2c160c1a64 am bdf9ffdd: am c0667853: Merge "Add SystemApis in GpsMeasurements APIs to 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
 2015-04-29 18:25:52 +00:00
destradaa
bdf9ffdd83 am c0667853: Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206" into mnc-dev 
* commit 'c0667853ffad211a5dd40202ff1a4601449b745e':
  Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206
 2015-04-29 18:14:17 +00:00
destradaa
c0667853ff Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206" into mnc-dev 2015-04-29 18:01:05 +00:00
Abodunrinwa Toki
c23ac32601 DO NOT MERGE: Minor fixes to FloatingToolbar. 
* Changes to isShowing() method.
* Changes to initial content visibility on show().

Change-Id: I1b20cd5a3fc86ae7427b55c44efd3cc1118148ae
 2015-04-29 17:57:06 +00:00
Abodunrinwa Toki
8020631fa4 am 45b04c1a: am 47ea8b3d: Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev 
* commit '45b04c1a5ef4f21b14b40dd0c1035933188da322':
  DO NOT MERGE: Update floatingtoolbar position when cursor moves.
 2015-04-29 17:43:40 +00:00
Cedric Ho
94ae5f3c08 am fbad902a: am 80fa2cc8: Merge "Add android.speech.RecognizerIntent 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.
 2015-04-29 17:43:34 +00:00
Chad Brubaker
658b686838 am fb5caad6: am 721474bb: Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev 
* commit 'fb5caad6d71c1ed0c2ea7065f5bc650822d70e16':
  Add OP_AUTH_NEEDED KeyStore result code
 2015-04-29 17:43:30 +00:00
Abodunrinwa Toki
45b04c1a5e am 47ea8b3d: Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev 
* commit '47ea8b3d6bcef193a2d0ec9f0141525c83a0bcda':
  DO NOT MERGE: Update floatingtoolbar position when cursor moves.
 2015-04-29 17:32:36 +00:00
Cedric Ho
fbad902aad am 80fa2cc8: Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE 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.
 2015-04-29 17:32:32 +00:00
Chad Brubaker
fb5caad6d7 am 721474bb: Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev 
* commit '721474bb9cfb76e29e0fe6e98c6b582c6fa78fe4':
  Add OP_AUTH_NEEDED KeyStore result code
 2015-04-29 17:32:27 +00:00
Abodunrinwa Toki
47ea8b3d6b Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev 2015-04-29 17:26:29 +00:00
Cedric Ho
80fa2cc8a9 Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev 2015-04-29 17:19:40 +00:00
Chad Brubaker
721474bb9c Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev 2015-04-29 17:17:33 +00:00
Alan Viverette
4f0287f9f8 am d2d8f27a: am 2333912c: Restore checkbox checked color to colorControlActivated 
* commit 'd2d8f27ab9e0bb13f7aab4929e2ff4a8b547fdde':
  Restore checkbox checked color to colorControlActivated
 2015-04-29 17:12:33 +00:00
Geoff Mendal
e1f670b0da am 91b5e328: (-s ours) am 0e0c9d93: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '91b5e32824ae93666a129ca43f9a434328d82f5b':
  Import translations. DO NOT MERGE
 2015-04-29 17:12:28 +00:00
Alan Viverette
794baeb196 am 71ce6e9f: am 7a6caae6: Merge "Adjust display inversion matrix to account for luminance" into mnc-dev 
* commit '71ce6e9f6c39ac951d4bdd65b256816e8924cc6b':
  Adjust display inversion matrix to account for luminance
 2015-04-29 17:01:26 +00:00
Alan Viverette
d2d8f27ab9 am 2333912c: Restore checkbox checked color to colorControlActivated 
* commit '2333912c6e4d51995a3fd01286c21c4d0328eb1a':
  Restore checkbox checked color to colorControlActivated
 2015-04-29 16:58:00 +00:00
Geoff Mendal
91b5e32824 am 0e0c9d93: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '0e0c9d9392e4b4580939632ca4e74f2073e59290':
  Import translations. DO NOT MERGE
 2015-04-29 16:57:54 +00:00
Alan Viverette
2333912c6e Restore checkbox checked color to colorControlActivated 
Bug: 20683633
Change-Id: I8997ad5829eda7afa03b7c56d4f44e4abfe34bee
 2015-04-29 09:51:35 -07:00
Andrei Stingaceanu
da8d35cd31 am 78a4348a: am eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev 
* commit '78a4348a535e530ae77c0e7777247d495596be7c':
  DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.
 2015-04-29 16:47:25 +00:00
Geoff Mendal
0e0c9d9392 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-04-29 16:46:33 +00:00
Alan Viverette
71ce6e9f6c am 7a6caae6: Merge "Adjust display inversion matrix to account for luminance" into mnc-dev 
* commit '7a6caae616fedab08aa3bcb1e37edf5f1e756dda':
  Adjust display inversion matrix to account for luminance
 2015-04-29 16:46:08 +00:00
Alan Viverette
7a6caae616 Merge "Adjust display inversion matrix to account for luminance" into mnc-dev 2015-04-29 16:38:43 +00:00
Andrei Stingaceanu
78a4348a53 am eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev 
* commit 'eea5a9e0de5825bf3629ad52a51a0dcf5f064fe5':
  DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.
 2015-04-29 16:35:23 +00:00
Geoff Mendal
ac5d723035 Import translations. DO NOT MERGE 
Change-Id: Ie2516ab34be72c0de86e3d546b349118be9c093c
Auto-generated-cl: translation import
 2015-04-29 09:27:09 -07:00
Andrei Stingaceanu
eea5a9e0de Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev 2015-04-29 16:21:16 +00:00
Narayan Kamath
75a219c523 Add a libbase static depedency for aapt2. 
Required by libziparchive.

(cherry picked from commit 231e054dfd9dfc2e51ecd41dca5e8d93ae648954)
Change-Id: Ifa33c9e44ebd583cf58b8a1239061c613fde92bc
 2015-04-29 16:20:07 +00:00
Xiyuan Xia
be850ed7e5 am ad3fcc02: am 19be9d31: Merge "Update bottom area alpha when stack height changes" into mnc-dev 
* commit 'ad3fcc02719ee0edcf413a54271beb237ec17d13':
  Update bottom area alpha when stack height changes
 2015-04-29 16:13:28 +00:00
Xiyuan Xia
ad3fcc0271 am 19be9d31: Merge "Update bottom area alpha when stack height changes" into mnc-dev 
* commit '19be9d31c834f7703a4584eba84bbf4d22027a93':
  Update bottom area alpha when stack height changes
 2015-04-29 15:59:59 +00:00
Xiyuan Xia
19be9d31c8 Merge "Update bottom area alpha when stack height changes" into mnc-dev 2015-04-29 15:46:24 +00:00
John Reck
6e51f4bd71 am 6c921033: am b77a7551: Merge "Remove View:hasStaticLayer()" into mnc-dev 
* commit '6c9210332c259570259cd1a92c4ae95f9c298f32':
  Remove View:hasStaticLayer()
 2015-04-29 15:11:33 +00:00
John Reck
6c9210332c am b77a7551: Merge "Remove View:hasStaticLayer()" into mnc-dev 
* commit 'b77a7551121561f4ea7d5ce0c4030aeb7ce709e8':
  Remove View:hasStaticLayer()
 2015-04-29 14:59:23 +00:00
John Reck
b77a755112 Merge "Remove View:hasStaticLayer()" into mnc-dev 2015-04-29 14:48:28 +00:00
Geoff Mendal
62c2a7337b am 6b960a9e: (-s ours) am e1b43ee9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '6b960a9e04f25a5827fcc0e675b2de582f8aff84':
  Import translations. DO NOT MERGE
 2015-04-29 14:46:24 +00:00
Narayan Kamath
bb4ed9aa3a am 815d9bb1: Merge "Add a static dependency on libbase." 
* commit '815d9bb178a0488ed1579cd230d447630ad0891b':
  Add a static dependency on libbase.
 2015-04-29 14:38:15 +00:00
Geoff Mendal
6b960a9e04 am e1b43ee9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'e1b43ee91898b4c24a45cbdaa62b572068f998cf':
  Import translations. DO NOT MERGE
 2015-04-29 14:29:19 +00:00
Geoff Mendal
2d954c7b46 am eb3d1a1b: (-s ours) am 62cb506f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'eb3d1a1bd7c6c51c8b2701768f27121a17a20b36':
  Import translations. DO NOT MERGE
 2015-04-29 14:27:24 +00:00
John Spurlock
23e46a4e8d am 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev 
* commit '2d67b2887c0a279aa182646f0e23b176783a1aca':
  Volume: Simple dialog footer, DND in quick settings.
 2015-04-29 14:27:19 +00:00