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

144483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
51e2786b7c am 583b6898: am fe48ca3e: am 4ff3c7f0: (-s ours) am 08840806: am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '583b68980fd0e1ffac3afe2caf62d7b62dbc3890':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-20 18:01:21 +00:00
Deepanshu Gupta
76fbe3863e am 13ebecfe: am d0eed243: am 276ae4ee: (-s ours) am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '13ebecfe89e35724736303e677256a7eeee4b3b4':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-20 18:01:16 +00:00
Deepanshu Gupta
c06345918c am d2966fce: am 2e11bba3: am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit 'd2966fce19e04ffc23eb7ecfb65a305c6a22c044':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-20 18:01:12 +00:00
Deepanshu Gupta
37455c624c am 03b8f56a: am 1ab77f96: am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '03b8f56a781a231ec11906ea479d8d5490108f24':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-20 18:01:08 +00:00
Guang Zhu
06953e2bc8 am 1931c1c3: am 5a0f7e41: am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev 
* commit '1931c1c324908620dc1a875934afea68db0b6d1d':
  add command to enable bt snoop log
 2014-07-20 18:00:51 +00:00
Jean-Michel Trivi
2c3386c8a5 am abc7f117: am 981fcf46: Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev 
* commit 'abc7f117bf1f8717bc9c62c4762f9c38e15b0fc6':
  Hide AudioManager.startBluetoothScoVirtualCall()
 2014-07-20 18:00:37 +00:00
Santos Cordon
472969a6a5 am 52cfd31e: am db2f81b0: Fixing ADD_CALL (1/3) 
* commit '52cfd31ed48fdacc0ed11d1f2db7eea7f3a17fef':
  Fixing ADD_CALL (1/3)
 2014-07-20 18:00:22 +00:00
Chris Craik
4ba7901626 am 7339d993: am e25d7792: Merge "Tweaks to outline API" into lmp-dev 
* commit '7339d99353deaabfe67b421d3b1d7591c3c74d98':
  Tweaks to outline API
 2014-07-20 18:00:13 +00:00
Adam Powell
1ac577b9f9 am 186802ac: am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev 
* commit '186802acd1c36b4194804857d9e52e24b74b31cc':
  Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
 2014-07-20 18:00:09 +00:00
Yorke Lee
c375a4aa58 am c5989521: am c5a8e2f1: Rename voicemail permissions 
* commit 'c59895217922428d3a34ae9635aba7fc4b4f7fc4':
  Rename voicemail permissions
 2014-07-20 18:00:00 +00:00
Shishir Agrawal
6256dfc9bc am b8addfa0: am 47bbd460: Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev 
* commit 'b8addfa04c98c7c49862150ab6702728fb98a953':
  Adding the ability for carrier app to override SPN and carrier name.
 2014-07-20 17:59:51 +00:00
Christopher Tate
a1fd6bc661 am 32523262: am 12e9b896: Fix which index goes where 
* commit '32523262b62c4598ffd50873d290c1c601b9f842':
  Fix which index goes where
 2014-07-20 17:59:46 +00:00
Sreeram Ramachandran
d9c973c8c1 am 5e23de19: am 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev 
* commit '5e23de196c3ac98e5a0da88515bad5d985d348d9':
  Allow VPN interfaces to be put into blocking mode.
 2014-07-20 17:59:41 +00:00
Evan Charlton
0eb04823bf am 1bb914ea: Rename PhoneAccount to PhoneAccountHandle 
* commit '1bb914eab351bf5d119639d270991b45406134c7':
  Rename PhoneAccount to PhoneAccountHandle
 2014-07-20 17:46:50 +00:00
Evan Charlton
6eb262c351 Rename PhoneAccount to PhoneAccountHandle 
Change-Id: I2e97b348e6316a8b3ccc39fd81013e7f514a2889
 2014-07-20 10:34:59 -07:00
John Spurlock
8439d335b2 am 8179618c: Merge "Volume: haptic feedback entering vibrate using touch." into lmp-dev 
* commit '8179618c79189c5f7abecbd07298805b2275f754':
  Volume: haptic feedback entering vibrate using touch.
 2014-07-20 17:16:11 +00:00
John Spurlock
ba80961a31 am 5f6ea4bf: Merge "Volume: Design followup." into lmp-dev 
* commit '5f6ea4bf5f9ad72442ddfa05f0c40c581370692d':
  Volume: Design followup.
 2014-07-20 16:10:23 +00:00
David Friedman
f6f34214b1 am 380677d6: am 119716f4: am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 
* commit '380677d6af0ca7782bc74902ef27eac3d064b88d':
  Minor typos, consistency things, one grammatical error.
 2014-07-20 12:57:20 +00:00
David Friedman
00510833be am 119716f4: am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 
* commit '119716f40466018e789d86b3005b6c839de85b8c':
  Minor typos, consistency things, one grammatical error.
 2014-07-20 12:49:57 +00:00
David Friedman
119716f404 am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 
* commit '0d5af3f67bdd3734304a19dad45d995e93b6e957':
  Minor typos, consistency things, one grammatical error.
 2014-07-20 12:43:19 +00:00
Wonsik Kim
4928bb6066 am 9b44c8b6: Merge "TIF: revise API names" into lmp-dev 
* commit '9b44c8b61d7e0df34e333e3a1f46e7963d75317f':
  TIF: revise API names
 2014-07-20 11:56:04 +00:00
John Spurlock
196af1887b am e4b360e7: Volume: new coat of paint. 
* commit 'e4b360e78b856694ea0d10f05a5564f275dd3b47':
  Volume: new coat of paint.
 2014-07-20 11:55:58 +00:00
David Friedman
0d5af3f67b am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 
* commit '5d59d371f27008214f29febb0595b602edddcc67':
  Minor typos, consistency things, one grammatical error.
 2014-07-20 07:59:05 +00:00
John Spurlock
eb2727bb2f Volume: new coat of paint. 
- Two sections (lighter header, darker detail) like QS.
- Fewer text variants.
- Remove backgrounds for segmented buttons.
- Remove alarm warning background.
- Fix slider-only style.
- Ensure all touch-targets are 48dp.

Bug:16419191

Change-Id: I220f3a736eba3dd7a1b9ff58a8fe4bf3d21db61a
 2014-07-20 02:50:34 -04:00
John Spurlock
8d9c5ad809 Merge "Volume: Design followup." into lmp-dev 2014-07-20 04:41:30 +00:00
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