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

144025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
4f558f7301 Volume: Design followup. 
Fix button height so header matches QS, use same elevation between
layers.

Bug:16419191
Change-Id: I56d9c69fe72e926261a32579a0b142d2fac18871
 2014-07-20 11:50:35 -04:00
Baligh Uddin
ded9fdc608 am 4aa0295b: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev 
* commit '4aa0295b355ce17e2da195907ea5dc0322837351':
  Remove deprecated locales - DO NOT MERGE
 2014-07-20 02:31:48 +00:00
Winson Chung
d9e90a624b am c655f3a4: am 51b044a2: Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev 
* commit 'c655f3a4487d5f810b392460227f0bad91c2768c':
  Add setting to guard the lock-to-app recents icon
 2014-07-20 02:19:27 +00:00
Winson Chung
5f57e95926 am 10b49835: am d778b6f5: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug 16322100) 
* commit '10b49835cf7496f76e521b14b837326e80ac93e1':
  Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100)
 2014-07-20 02:19:22 +00:00
Ihab Awad
8e0b4078c1 am b8c46e3a: am 98abc9d1: Merge "Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata" into lmp-dev 
* commit 'b8c46e3a932f5666c0921b84416d8dfd7a40d727':
  Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata
 2014-07-20 02:19:15 +00:00
Ricardo Cervera
967dac596c am 7d808d32: am 3b74e378: am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '7d808d3201675401cb42cc036792f46ccb96cd4a':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-20 02:19:04 +00:00
Robert Ly
22b94656f1 am c58fee40: am ec571ec0: am ee65b63d: am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit 'c58fee40bc72569ff36f186d8f97e708393a0c24':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-20 02:19:00 +00:00
Prashant Malani
dd3bf97063 am 80c212a1: am 269ac24f: am 162d9433: (-s ours) am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev 
* commit '80c212a1c54f1fa9c6477f3c36b90e5a38a9d83d':
  Make the booting flag update unconditional
 2014-07-20 02:18:56 +00:00
Amith Yamasani
2577701434 am 3d160098: am 65d3279b: Merge "Add a hidden API to expose cross profile caller id check" into lmp-dev 
* commit '3d1600980675bdd5ba40c9b9633e772031c70108':
  Add a hidden API to expose cross profile caller id check
 2014-07-20 02:18:46 +00:00
Prashant Malani
f47665c1be am af5f3b92: am c61f26fa: Make the booting flag update unconditional 
* commit 'af5f3b92a7acec0301067ed1cdad857056326e3b':
  Make the booting flag update unconditional
 2014-07-20 02:18:41 +00:00
Yin-Chia Yeh
bacae5e014 am 372461a1: am 861dd642: Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev 
* commit '372461a12e3787d829ae2f300e0592ab11972c80':
  Camera2: add highSpeedVideoConfig wrapper and APIs
 2014-07-20 02:18:36 +00:00
Dake Gu
7c7ca375e7 am f31b6a29: am bd497879: ActivityTransition: fix wrong width/height applied to sharedelement. 
* commit 'f31b6a29ce3fe6cb37668463aaf63e27fa2741de':
  ActivityTransition: fix wrong width/height applied to sharedelement.
 2014-07-20 02:18:26 +00:00
Andre Eisenbach
1a0ce0bef0 am 1f961f2c: am decb3109: Merge "Reduce GATT logging output" into lmp-dev 
* commit '1f961f2c95140780e8f63b081a7493508c76a240':
  Reduce GATT logging output
 2014-07-20 02:18:13 +00:00
Niels Egberts
27845a1fc7 am 860e2f9f: am 40268fc5: Merge "Add money as a new TtsSpan type." into lmp-dev 
* commit '860e2f9f485ebc81dfad269cca183fee3d03e583':
  Add money as a new TtsSpan type.
 2014-07-20 02:17:59 +00:00
Adam Lesinski
c2332a4d00 am b11e7d48: am e0b92a6b: First iteration of a public UsageStats API 
* commit 'b11e7d48398c8e6e57578dabcf71eeef6a4e8bfd':
  First iteration of a public UsageStats API
 2014-07-20 02:17:49 +00:00
John Reck
aed135f2cd am 0572b33d: am 3406fe19: Add RT-enabled reveal animator 
* commit '0572b33d35d4c6f88d6a720f9b71e0b963c95f1e':
  Add RT-enabled reveal animator
 2014-07-20 02:17:41 +00:00
Zhijun He
84e7b64844 am b6236012: am 3ea4b9d0: Camera2: send the partial result with onCaptureProgressed 
* commit 'b62360123f2d4dbf191319ba671bc3781c1a3bf5':
  Camera2: send the partial result with onCaptureProgressed
 2014-07-20 02:17:31 +00:00
Sailesh Nepal
65346ba580 am d0e9c227: am 92119b9f: Merge "Add Connection.startActivityFromInCall" into lmp-dev 
* commit 'd0e9c2273cdaf9919956c5b36298ab1ba62004cf':
  Add Connection.startActivityFromInCall
 2014-07-20 02:17:27 +00:00
Jean-Michel Trivi
8d873ab99f am 4298999e: am 115bf42b: Unhide Virtualizer.getVirtualizationMode() 
* commit '4298999e7500356b84bf30ef9b86a83358c2347b':
  Unhide Virtualizer.getVirtualizationMode()
 2014-07-20 02:17:22 +00:00
Sailesh Nepal
6577734bf1 am f611c799: am 0587043f: Merge "Use main thread for RemoteConnection callbacks" into lmp-dev 
* commit 'f611c799340afa4f306b9286183b0f4d3eec3ddd':
  Use main thread for RemoteConnection callbacks
 2014-07-20 02:17:18 +00:00
Jim Miller
abd5eabeca am 656d09ed: am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev 
* commit '656d09edfddcc748fa56acd455f579cc08057848':
  Add DevicePolicyManager flag for fingerprint.
 2014-07-20 02:17:13 +00:00
Ye Wen
046e135bde am 1100f339: am 2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev 
* commit '1100f339df1e089d69690aae5a39ee39f1cc694f':
  Unhide MMS APIs for MSIM (1/2)
 2014-07-20 02:17:09 +00:00
Dan Sandler
d18a748c86 am cd307ff0: am 5239e4d2: Don\'t crash if user profile bitmap is null. 
* commit 'cd307ff07f3d915f23bb8a2782bf9b08b39aafaf':
  Don't crash if user profile bitmap is null.
 2014-07-20 02:17:05 +00:00
Robert Greenwalt
3052ccee23 am 8a717ee8: am 721252c0: Quit NetworkMonitors at end of life. 
* commit '8a717ee8b26cdd6d916818451add978c1776bd6e':
  Quit NetworkMonitors at end of life.
 2014-07-20 02:17:01 +00:00
Adam Powell
fa0460a671 am bf5ecd02: Merge "Don\'t apply the ActionBar style to a Toolbar as a result of setActionBar" into lmp-dev 
* commit 'bf5ecd02937988beb93ee8c68032d7df4d27da20':
  Don't apply the ActionBar style to a Toolbar as a result of setActionBar
 2014-07-19 23:35:39 +00:00
Chelsea Derrick
a3c09275a6 am 53fd859f: Merge "Unhide WifiConfiguration.creatorUid. [DO NOT MERGE]" into lmp-dev 
* commit '53fd859ffabd8f2b843b907c66eb7e758b2808b3':
  Unhide WifiConfiguration.creatorUid. [DO NOT MERGE]
 2014-07-19 23:12:28 +00:00
Adam Powell
7ee6b63f00 am d073a935: Don\'t overlay the Material.Light theme\'s homeAsUpIndicator attribute 
* commit 'd073a9358bb1b48d361b1f5127cedb8f6b800f07':
  Don't overlay the Material.Light theme's homeAsUpIndicator attribute
 2014-07-19 23:00:22 +00:00
Adam Powell
5abc26e00a Don't overlay the Material.Light theme's homeAsUpIndicator attribute 
Current API expects the default ActionBar styles not to have the
homeAsUpIndicator defined, thereby inheriting it from the theme itself
when changed there. Remove the stray definition in the light material
action bar style that was blocking this from happening.

Bug 15458606

Change-Id: Ia7fdbde814582a1d3eb8743bf76bc019f6ac7488
 2014-07-19 15:56:32 -07:00
John Spurlock
653103d2cf am d2494fcc: Merge "Volume: No sound effects on the ringer toggle." into lmp-dev 
* commit 'd2494fccefc4d9477f2e5fea3462dd08e297cd7c':
  Volume: No sound effects on the ringer toggle.
 2014-07-19 22:56:12 +00:00
Evan Charlton
4d44af4bad am 07e3fccb: Migrate TelecommConstants to TelecommManager 
* commit '07e3fccbcc02a9882b1db1e4713caf500cde9643':
  Migrate TelecommConstants to TelecommManager
 2014-07-19 22:44:09 +00:00
Jean-Michel Trivi
122f599bb4 Merge "AudioAttributes for SoundPool" into lmp-dev 2014-07-19 22:40:06 +00:00
Jean-Michel Trivi
55a30c41b6 AudioAttributes for SoundPool 
Add support for building a SoundPool instance and specify
 the AudioAttributes.
Remove SRC quality which was never implemented, while leaving
 room for supporting it later through the Builder pattern.
Remove stream types.
Update AudioService's use of SoundPool to the new scheme.

Change-Id: Ie51e4008684e5ba25f9b7368098e4f20266a15c7
 2014-07-20 18:12:00 -07:00
Santos Cordon
6aac0f52e1 Merge "Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)" into lmp-dev 2014-07-19 22:40:06 +00:00
Santos Cordon
5c6fa95e37 Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3) 
Bug: 16416927
Change-Id: If2d1c19134d2245677f7e0b3d94b118d9b50e751
 2014-07-21 01:43:30 +00:00
Santos Cordon
40075c7cdd Merge "Change incoming call intent to a TelecommManager method. (1/3)" into lmp-dev 2014-07-19 22:40:06 +00:00
Santos Cordon
96efb488af Change incoming call intent to a TelecommManager method. (1/3) 
Also moves a few constants from TelecommConstants to TelecommManager.
Bug:16416927

Change-Id: I8e74feb228523ed1c186b2f06784d04cb9141f86
 2014-07-20 17:41:08 -07:00
Jean-Michel Trivi
e9111d3067 Merge "API for audio session ID generation" into lmp-dev 2014-07-19 22:40:06 +00:00
Jean-Michel Trivi
289cc8e887 API for audio session ID generation 
Expose the value used by the framework to generate an audio
 session ID when a value isn't known.
Rename allocateAudioSessionId() to generateAudioSessionId()
 as this operation doesn't "allocate" anything, and there is
 no allocated resource to free after this operation.

Bug 16401631

Change-Id: I7a7bc05b39ea0b024ff225254eb755a9c85a2ad9
 2014-07-20 11:25:48 -07:00
Evan Charlton
1019719e46 Migrate TelecommConstants to TelecommManager 
Change-Id: Icdd7637ba1ae27ce7d1f13714257b4a946961037
 2014-07-19 15:33:59 -07:00
John Spurlock
c9bbb1cd5e am 16f6e259: Merge "Add audioAttributes to Notification." into lmp-dev 
* commit '16f6e2598536e15ed29b28732c03251a15834d25':
  Add audioAttributes to Notification.
 2014-07-19 22:01:06 +00:00
John Spurlock
eb140b6512 am 2f474cd3: Merge "Volume: restore vibration entering vibrate-mode from rocker." into lmp-dev 
* commit '2f474cd32a4e06aaa034e8c54531393c278c2e11':
  Volume: restore vibration entering vibrate-mode from rocker.
 2014-07-19 21:57:11 +00:00
Baligh Uddin
be7dfa1a28 am c5a06854: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c5a06854bbb91e22c49bc6b2c88dab1677973abf':
  Import translations. DO NOT MERGE
 2014-07-19 21:51:19 +00:00
Baligh Uddin
2b0e844198 am 7d51820d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7d51820d6ce5d087476bd868c8d3a3ba32d15051':
  Import translations. DO NOT MERGE
 2014-07-19 21:51:16 +00:00
Baligh Uddin
8090145233 am e03c9fe9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e03c9fe9ad06f7d4b023d5fb6d6f623adf71403b':
  Import translations. DO NOT MERGE
 2014-07-19 21:51:12 +00:00
Baligh Uddin
5c0bfe09c0 am e73dab52: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e73dab524b692919f9e36ea8c779c1053548e2ef':
  Import translations. DO NOT MERGE
 2014-07-19 21:51:09 +00:00
Baligh Uddin
735da2e9cf am af51f737: (-s ours) Import translations. DO NOT MERGE 
* commit 'af51f737a41783433db39309b54dffd283827f4e':
  Import translations. DO NOT MERGE
 2014-07-19 21:51:05 +00:00
Baligh Uddin
c6675a4dcb Import translations. DO NOT MERGE 
Change-Id: Iccd6de29591b724ac87fbd83638f5eb256daceb1
Auto-generated-cl: translation import
 2014-07-19 21:42:22 +00:00
Evan Charlton
9158f95f87 am 6eb05788: Add a notion of the subscription number 
* commit '6eb057881ea08d7b12050d8aa155f21e71ea9ae4':
  Add a notion of the subscription number
 2014-07-19 21:26:13 +00:00
Evan Charlton
222db525ed Add a notion of the subscription number 
Expose the actual subscription number so that it can be exposed when
necessary (such as during emergency calls, when it doesn't match the
line 1 number).

Bug: 13333595
Change-Id: I0d3b2cfcea08aeba760c392c116303f21beb70d3
 2014-07-19 21:22:31 +00:00
Santos Cordon
1c0e7a0e57 am 040acd45: Merge "InCallService to inherit directly from Service. (1/2)" into lmp-dev 
* commit '040acd45ab30bfa1be535940b62f9beee7c1b9ad':
  InCallService to inherit directly from Service. (1/2)
 2014-07-19 21:18:18 +00:00