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

143805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Adam Powell
8002d7b914 am 69ebf2cf: Merge "Measure Toolbar titles last" into lmp-dev 
* commit '69ebf2cf81d700c70316ce5cf8a16ad9ace25e87':
  Measure Toolbar titles last
 2014-07-19 20:30:11 +00:00
John Spurlock
3a79becf2e am 59eee7e6: Merge "getMasterStreamType from MUSIC -> NOTIFICATION" into lmp-dev 
* commit '59eee7e6bc1b2e11063ccde25b6cabe592b257eb':
  getMasterStreamType from MUSIC -> NOTIFICATION
 2014-07-19 20:26:16 +00:00
Adam Powell
fc4ec6496c am 0505a3fe: Fix Toolbar title layout in RTL mode 
* commit '0505a3fed9136e29a4ea068b043e379cdac1d05d':
  Fix Toolbar title layout in RTL mode
 2014-07-19 20:11:05 +00:00
Adam Powell
c80f952285 Fix Toolbar title layout in RTL mode 
Welp, that one was embarrassing.

Bug 16192193

Change-Id: I4e94e71ef34b4b08b5dd4c7b7f0dfb22e834ca19
 2014-07-19 13:05:26 -07:00
Adam Powell
04f9efeaed am 7a5bca44: Merge "Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand" into lmp-dev 
* commit '7a5bca446da01a0f83087c00fad211ee2d5f1e1d':
  Adapt ActionBar.LayoutParams to Toolbar.LayoutParams on demand
 2014-07-19 19:26:34 +00:00
John Spurlock
9efd2448bf am da9fd706: Merge "Non-voice-capable device default stream is now NOTIFICATION." into lmp-dev 
* commit 'da9fd706595ab4271951d13543e0dcf719d1aa4b':
  Non-voice-capable device default stream is now NOTIFICATION.
 2014-07-19 19:00:49 +00:00
Adam Powell
796a3d8c18 am b08dc693: Merge "Remove obsolete (and large) overscroll drawables" into lmp-dev 
* commit 'b08dc69396f68240442a5a3cb6ebcb5209d56ad1':
  Remove obsolete (and large) overscroll drawables
 2014-07-19 18:27:34 +00:00
John Spurlock
aec3f72aca am c297b9b3: Zen mode filtering should use new usage constants. 
* commit 'c297b9b32f2cd7e10b9a22d61ab6db63afa21ac2':
  Zen mode filtering should use new usage constants.
 2014-07-19 16:33:15 +00:00
John Spurlock
7b41467704 Zen mode filtering should use new usage constants. 
Refactor stream-based calls to usage-based calls.

Bug:15279516
Change-Id: I3f7757d8123c14670e2ad5f8e6aa4e9803efe7ec
 2014-07-19 11:57:51 -04:00
Yohei Yukawa
302ad73a88 am f5827ba0: Merge "Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView" into lmp-dev 
* commit 'f5827ba050b93d1080eec336c560e22aa4713678':
  Add FLAG_CURSOR_ANCHOR_INFO_IMMEDIATE support in TextView
 2014-07-19 13:45:24 +00:00
Wonsik Kim
9504c1a440 am 71e398b4: Merge "TIF: Reorder TvInputInfo types from old to new." into lmp-dev 
* commit '71e398b4c514af1364b01be2e839badde83f5be4':
  TIF: Reorder TvInputInfo types from old to new.
 2014-07-19 11:45:32 +00:00
Wonsik Kim
6a9bf8201a am b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev 
* commit 'b872b220bb1ef88a62c7765b1156d1a1615e533f':
  TIF: misc fix for TvInputHal
 2014-07-19 11:39:28 +00:00
Lajos Molnar
25ec02be2f am 1717dea8: Extend MediaCodecInfo to describe usable codec limits and features 
* commit '1717dea892e10b9a5c4797c8fdd4e8d64838e556':
  Extend MediaCodecInfo to describe usable codec limits and features
 2014-07-19 11:39:24 +00:00
Jeff Brown
425fd5fb2d am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev 
* commit '25892fe6ac568638b0420ca0e8cb388c133bc14e':
  Allow dreams to wake up gently.
 2014-07-19 11:39:14 +00:00
Dongwon Kang
5975edf0d7 am c292f54f: Merge "TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case." into lmp-dev 
* commit 'c292f54f26b6be7e6652f44ac96e7ef59756abb2':
  TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case.
 2014-07-19 11:39:10 +00:00
Jeff Brown
c669a94615 am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state. 
* commit '03fb52700991064432971f79c71cef336e2762df':
  Add new Display.STATE_DOZE_SUSPEND power state.
 2014-07-19 11:39:06 +00:00