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

190452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
ec317987e0 am 94582c5f: am 973a70d7: am f105f61d: Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev 
* commit '94582c5fb632b17b751729a929ff94ef8aa216a1':
  UsbDevice: Add support for retrieving version string for a USB device
 2015-04-29 21:02:30 +00:00
Junda Liu
a7a6708510 am 01da3124: am df3a6f3e: am bd0ffb8e: Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev 
* commit '01da31247b8b2999bcfefe1f55ca396ee177ad69':
  Moving all Telephony overlays to CarrierConfigManager.
 2015-04-29 21:02:25 +00:00
Mike Lockwood
94582c5fb6 am 973a70d7: am f105f61d: Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev 
* commit '973a70d7c9dd2cda38500880bbc3873f238f1fe3':
  UsbDevice: Add support for retrieving version string for a USB device
 2015-04-29 20:50:58 +00:00
Junda Liu
01da31247b am df3a6f3e: am bd0ffb8e: Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev 
* commit 'df3a6f3e8d416956763ddaa74f65104d28dcbdfb':
  Moving all Telephony overlays to CarrierConfigManager.
 2015-04-29 20:50:53 +00:00
Chris Craik
d5811f3d60 am 7a6208e2: am 4549108c: am 81bd735a: Merge "Require minimum 4 bit stencil for layers." into mnc-dev 
* commit '7a6208e24ac27f0cc607f6cd99c67e74e356d437':
  Require minimum 4 bit stencil for layers.
 2015-04-29 20:44:54 +00:00
John Reck
e3b60691ed am 6228ea26: am 108f0a34: am b2cec86a: Merge "Skip frames with no damage" into mnc-dev 
* commit '6228ea26effa52e29f8a1b30fd4043767fd44fc7':
  Skip frames with no damage
 2015-04-29 20:44:49 +00:00
Mike Lockwood
973a70d7c9 am f105f61d: Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev 
* commit 'f105f61dd9ff790c6ace406e73c3bddac87a8925':
  UsbDevice: Add support for retrieving version string for a USB device
 2015-04-29 20:40:07 +00:00
Junda Liu
df3a6f3e8d am bd0ffb8e: Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev 
* commit 'bd0ffb8e34a91735e73fbc680539382dd5691191':
  Moving all Telephony overlays to CarrierConfigManager.
 2015-04-29 20:40:01 +00:00
Chris Craik
7a6208e24a am 4549108c: am 81bd735a: Merge "Require minimum 4 bit stencil for layers." into mnc-dev 
* commit '4549108c46ef1103996ae2f98123d033da54bce6':
  Require minimum 4 bit stencil for layers.
 2015-04-29 20:33:53 +00:00
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
0fd52d6ae8 am ef586c12: (-s ours) am eaa44818: am 05a56db3: Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev 
* commit 'ef586c12d1bd1ac69dc7a9dcbddb1ee9d596d361':
  DO NOT MERGE: Minor fixes to FloatingToolbar.
 2015-04-29 20:33:15 +00:00
Mike Lockwood
f105f61dd9 Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev 2015-04-29 20:27:50 +00:00
Junda Liu
bd0ffb8e34 Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev 2015-04-29 20:25:25 +00:00
Jonathan Basseri
9b56ad8f1a Moving all Telephony overlays to CarrierConfigManager. 
This adds every variable and its default value from
packages/services/Telephony/res/values/config.xml to the new
CarrierConfigManager API. Variable docstrings are also taken from
config.xml, with minimal edits.

These variables were not included because either they are not carrier
specific, or they are device specific:

OtaPlaySuccessFailureTone
OtaShowActivateFailTimes
OtaShowActivationScreen
OtaShowListeningScreen
carrier_settings
carrier_settings_menu
config_allow_hfa_outside_of_setup_wizard
config_enabled_lte
csp_enabled
dialer_default_class
dtmf_type_enabled
hac_enabled
send_mic_mute_to_AudioManager
ui_default_package

This also adds BOOL_HIDE_CARRIER_NETWORK_SETTINGS which is a replacement
for android.provider.Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS.

Bug: 20270007
Change-Id: I985a55cf88d3bd1863e28af7790b59eef01d6504
 2015-04-29 13:23:21 -07: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
Chris Craik
4549108c46 am 81bd735a: Merge "Require minimum 4 bit stencil for layers." into mnc-dev 
* commit '81bd735a010771ab502dabe7ef4d20ea520cf6ac':
  Require minimum 4 bit stencil for layers.
 2015-04-29 20:21:44 +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
Chris Craik
81bd735a01 Merge "Require minimum 4 bit stencil for layers." into mnc-dev 2015-04-29 20:17:43 +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
Svet Ganov
8baf2b6663 am 0dbaba6c: am 5e47c802: am 56867804: Merge "Respect the record audio app op - framework" into mnc-dev 
* commit '0dbaba6c3a7ae0a45e2305a21b0ef5decbde59a4':
  Respect the record audio app op - framework
 2015-04-29 20:09:09 +00:00
Mike Lockwood
c9bb40ea95 UsbDevice: Add support for retrieving version string for a USB device 
Change-Id: Ia8630f5ffd05f90347b971110a81f4927060cc4b
 2015-04-29 13:05:55 -07:00
Chris Craik
e145013153 Require minimum 4 bit stencil for layers. 
bug:19270131
Change-Id: I81367179d268e7c1642259c456c1f3d0018f6c0d
 2015-04-29 13:04:02 -07:00
Abodunrinwa Toki
05a56db39d Merge "DO NOT MERGE: Minor fixes to FloatingToolbar." into mnc-dev 2015-04-29 19:57:48 +00:00
Chris Craik
80a2f50315 am e58e0e50: am 737f0b22: am 7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-dev 
* commit 'e58e0e50efa429b47985acedf3ec7d8d5745ea95':
  Unify View alpha implies clipping behavior
 2015-04-29 19:56:07 +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
cbba357159 am 2c160c1a: am bdf9ffdd: am c0667853: Merge "Add SystemApis in 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
 2015-04-29 18:34:18 +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
402bcf77d2 am 8020631f: (-s ours) am 45b04c1a: am 47ea8b3d: Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev 
* commit '8020631fa4a5d2d30cdf227cd2563404a3f7d726':
  DO NOT MERGE: Update floatingtoolbar position when cursor moves.
 2015-04-29 17:59:43 +00:00
Cedric Ho
a02ac06b90 am 94ae5f3c: 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 '94ae5f3c089e9bdd39011dacc09411058ddc4a6e':
  Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine.
 2015-04-29 17:59:37 +00:00
Chad Brubaker
31229a39ce am 658b6868: am fb5caad6: am 721474bb: Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev 
* commit '658b686838f3b4ffdc7f371f9f89d7e022b1b02a':
  Add OP_AUTH_NEEDED KeyStore result code
 2015-04-29 17:59:31 +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
Alan Viverette
666fd1caf9 am 4f0287f9: am d2d8f27a: am 2333912c: Restore checkbox checked color to colorControlActivated 
* commit '4f0287f9f8b4383a330f660b4e277c431f38b4d4':
  Restore checkbox checked color to colorControlActivated
 2015-04-29 17:23:41 +00:00
Geoff Mendal
35bcf99806 am e1f670b0: (-s ours) am 91b5e328: (-s ours) am 0e0c9d93: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'e1f670b0da193342ea658dd80f9e436139e6c47c':
  Import translations. DO NOT MERGE
 2015-04-29 17:23:36 +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