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

176530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Harrison
3300d81d5b am b1ab736f: am fdb33a08: am 21af21ca: Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev 
* commit 'b1ab736f48c68de8c92afb1fb6da22232badfbb8':
  Revert "Improve fling physics for recents"
 2014-12-05 16:26:02 +00:00
Justin Harrison
b1ab736f48 am fdb33a08: am 21af21ca: Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev 
* commit 'fdb33a08266d95c338c141446c1da09108194281':
  Revert "Improve fling physics for recents"
 2014-12-05 15:51:33 +00:00
Scott Main
00c6944e85 Merge "docs: studio basics v2" 2014-12-05 03:47:13 +00:00
Rich Slogar
d70070e3ec docs: studio basics v2 
Change-Id: Ice8e4338f5193f9850da8264a2c56018a8b561ab
 2014-12-04 16:50:59 -08:00
Scott Main
49a58af16f Merge "docs: debugging studio" 2014-12-05 00:22:13 +00:00
Scott Main
a1d95dfb95 Merge "docs:setting up hardware devices" 2014-12-05 00:21:17 +00:00
Amith Yamasani
2f80972d02 am 2faf91fb: am 66cbec51: am d234dc1f: Merge "Correct check of is user running" 
* commit '2faf91fbb300882afd1092b788aa16295eb3dde8':
  Correct check of is user running
 2014-12-05 00:15:57 +00:00
Mike Lockwood
6d37adf83d am a6e14c82: am 75b25577: am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize" 
* commit 'a6e14c8293ef470e29541500506de15d61ab6bf0':
  Dont call close in in BluetoothA2dp finalize
 2014-12-05 00:15:42 +00:00
Jorim Jaggi
6944a1621d am 638e8068: am 9f44ea8f: am 54daab10: Merge "Improve fling physics for recents" into lmp-mr1-dev 
* commit '638e8068d212ff72b16d11891af0d9ed110bafde':
  Improve fling physics for recents
 2014-12-05 00:13:20 +00:00
Jorim Jaggi
83aeedc895 am b6d16dc5: am d3cf181d: am 47faf69c: Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev 
* commit 'b6d16dc53fab12099af7d6da406f88bf585b0532':
  Fix rounded corners in bottom QS panel.
 2014-12-05 00:13:15 +00:00
John Reck
1022888d33 resolved conflicts for merge of 203c8171 to master 
Change-Id: I256397410c261fae049bae4572f132235be1c5c9
 2014-12-04 16:06:34 -08:00
Yin-Chia Yeh
18be00f77a Camera2: add toString implementation of LensShadingMap 
Change-Id: Icecde57e92c2962ed6b1585c0e3fd889b2587736
 2014-12-04 15:53:17 -08:00
Amith Yamasani
2faf91fbb3 am 66cbec51: am d234dc1f: Merge "Correct check of is user running" 
* commit '66cbec512cf31228f8d86171f57cf4e3bcbbd63e':
  Correct check of is user running
 2014-12-04 23:24:31 +00:00
Amith Yamasani
66cbec512c am d234dc1f: Merge "Correct check of is user running" 
* commit 'd234dc1f20d3a68e0dd9f2c3a5f14282fba79b13':
  Correct check of is user running
 2014-12-04 23:15:47 +00:00
Amith Yamasani
d234dc1f20 Merge "Correct check of is user running" 2014-12-04 23:09:48 +00:00
Mike Lockwood
a6e14c8293 am 75b25577: am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize" 
* commit '75b2557725430e768cc3b21bb9c2aef92b887538':
  Dont call close in in BluetoothA2dp finalize
 2014-12-04 22:45:07 +00:00
Christoph Studer
f0dd044b2b am 51347595: am a6ecb61e: am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev 
* commit '51347595a3ea7749b2c771ac1e8f8f729a55e1a9':
  RankingHelper: Remove STOPSHIP
 2014-12-04 21:56:22 +00:00
Deepanshu Gupta
9eb695f0a3 am 9c403d85: am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev 
* commit '9c403d8513db5790364e9f5fafca5c6cf896d369':
  Ensure that RandomAccessFile is not leaked.
 2014-12-04 21:56:16 +00:00
Deepanshu Gupta
1f4bafef12 am 940a1e56: am 52a60ff6: am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev 
* commit '940a1e563fd94f912a7322cea8f0a5662b79050f':
  Fix AnalogClock rendering
 2014-12-04 21:56:12 +00:00
Deepanshu Gupta
6c8175fcc4 am 028df22f: am c16d1448: am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev 
* commit '028df22fd774c8a545dedb03124587b7a19e047b':
  Fix typos in previous bugfixes.
 2014-12-04 21:56:07 +00:00
Jinsuk Kim
0998e0dc4a am 49216763: am 92a46272: am f1647395: Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev 
* commit '4921676345a8b15eadb3ca3e72f103e09027cd1e':
  CEC: Generate hotplug events upon adding listener
 2014-12-04 21:56:02 +00:00
Vinit Deshpande
047efda149 am f04e214a: am aefb79b2: am 31bd4220: Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev 
* commit 'f04e214a6b949593b9ea83486223a21cc15e1fd0':
  Remove notification for SoftAP turned on
 2014-12-04 21:55:58 +00:00
Geoff Mendal
98a47546fa am 72142eb1: (-s ours) am c7d8a48b: (-s ours) am cc7c68b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '72142eb12a6c5362126d0d8a4060c4c90dc30766':
  Import translations. DO NOT MERGE
 2014-12-04 21:55:52 +00:00
Geoff Mendal
ee46061b1c am 9088853d: (-s ours) am c7b52575: (-s ours) am a821e77d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '9088853d708b3cbca3e5dab69fea603be8eb0d83':
  Import translations. DO NOT MERGE
 2014-12-04 21:55:48 +00:00
Geoff Mendal
d12f00411e am 91b95c96: (-s ours) am 5d1f6880: (-s ours) am 72a20419: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '91b95c96127a85913854f2ad0a0ed0fad807c9a1':
  Import translations. DO NOT MERGE
 2014-12-04 21:55:43 +00:00
Erik Kline
0f3c0704c5 am 180a30aa: am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev 
* commit '180a30aa57e0790453944533dc442704f7596f65':
  Remove CONNECTIVITY_CHANGE_DELAY and friends.
 2014-12-04 21:55:38 +00:00
John Spurlock
e578d2aaf8 am c82144fd: am 95931270: am 32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev 
* commit 'c82144fd8fd2d6f240b17e7b47b41fe7e198b841':
  Doze: Don't block pickup pulses on a proximity check.
 2014-12-04 21:55:34 +00:00
Pavel Zhamaitsiak
bf41d13ce1 am 10f47f92: am 38916819: am 1fb69936: Merge "IMS Call End Cause Additions" into lmp-mr1-dev 
* commit '10f47f9233484763a8a0e0c8e36f68dd28056485':
  IMS Call End Cause Additions
 2014-12-04 21:55:29 +00:00
duho.ro
2aa105d81e am 7c614473: am 36ccf75b: am fb754252: UICC : discard language setting of SIM 
* commit '7c6144730b347fa93ce124cbf5244f5eaa2ca255':
  UICC : discard language setting of SIM
 2014-12-04 21:55:24 +00:00
Cheuksan Wang
412766a7d6 am 29ac679f: am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev 
* commit '29ac679f9f85a68eca03c262e740d62f8af66797':
  new SMS/MMS carrier app API
 2014-12-04 21:55:19 +00:00
John Reck
9fb42f0778 resolved conflicts for merge of a75b0ad3 to master 
Change-Id: I32a2d129c556407727ada909daa6470309d42499
 2014-12-04 13:51:41 -08:00
Mike Lockwood
75b2557725 am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize" 
* commit '448403b7a4b2126e79121482d1fb2894133dfa25':
  Dont call close in in BluetoothA2dp finalize
 2014-12-04 21:49:56 +00:00
Jorim Jaggi
638e8068d2 am 9f44ea8f: am 54daab10: Merge "Improve fling physics for recents" into lmp-mr1-dev 
* commit '9f44ea8fbcee80816f4ce6eeca2568ccd06d5a15':
  Improve fling physics for recents
 2014-12-04 21:47:35 +00:00
Jorim Jaggi
b6d16dc53f am d3cf181d: am 47faf69c: Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev 
* commit 'd3cf181d57bb7d63ea8dc6834daf8e3c84f1c769':
  Fix rounded corners in bottom QS panel.
 2014-12-04 21:47:28 +00:00
Derek Sollenberger
203c817180 am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev 
* commit 'c1a2f38ce0447b005d0cde6836857f451af84dc6':
  Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
 2014-12-04 21:46:39 +00:00
Christoph Studer
51347595a3 am a6ecb61e: am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev 
* commit 'a6ecb61ee7a87af7153f11289d7df1eb6f1beb67':
  RankingHelper: Remove STOPSHIP
 2014-12-04 21:46:32 +00:00
Deepanshu Gupta
9c403d8513 am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev 
* commit '43d0e67573e8122d9e75accb00eaa453e2755713':
  Ensure that RandomAccessFile is not leaked.
 2014-12-04 21:46:26 +00:00
Deepanshu Gupta
940a1e563f am 52a60ff6: am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev 
* commit '52a60ff6366a4f5cf1ed9697b7cebd6f9300de2b':
  Fix AnalogClock rendering
 2014-12-04 21:46:20 +00:00
Deepanshu Gupta
028df22fd7 am c16d1448: am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev 
* commit 'c16d1448bb139384cc86d14d9412ffe1a62817c8':
  Fix typos in previous bugfixes.
 2014-12-04 21:46:14 +00:00
Jinsuk Kim
4921676345 am 92a46272: am f1647395: Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev 
* commit '92a4627250d74264719eff3ade798a9f4480ed5a':
  CEC: Generate hotplug events upon adding listener
 2014-12-04 21:46:08 +00:00
Vinit Deshpande
f04e214a6b am aefb79b2: am 31bd4220: Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev 
* commit 'aefb79b2dd13047630ba455d5a3aec8084c1d954':
  Remove notification for SoftAP turned on
 2014-12-04 21:46:01 +00:00
Geoff Mendal
72142eb12a am c7d8a48b: (-s ours) am cc7c68b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c7d8a48bb01f3d6ffbf6a3f8f81e23dd0b806562':
  Import translations. DO NOT MERGE
 2014-12-04 21:45:55 +00:00
Geoff Mendal
9088853d70 am c7b52575: (-s ours) am a821e77d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c7b52575212ca00f7c52222f1129a0f64e061095':
  Import translations. DO NOT MERGE
 2014-12-04 21:45:48 +00:00
Geoff Mendal
91b95c9612 am 5d1f6880: (-s ours) am 72a20419: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '5d1f68803488677637b1f383d0f1162a896a9684':
  Import translations. DO NOT MERGE
 2014-12-04 21:45:42 +00:00
Erik Kline
180a30aa57 am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev 
* commit '95b5ca9019720c4c012ca13791d32aa6d0bb5ba8':
  Remove CONNECTIVITY_CHANGE_DELAY and friends.
 2014-12-04 21:45:33 +00:00
John Spurlock
c82144fd8f am 95931270: am 32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev 
* commit '959312701f55c9d098403c332b88b5777daf4e4c':
  Doze: Don't block pickup pulses on a proximity check.
 2014-12-04 21:45:26 +00:00
Pavel Zhamaitsiak
10f47f9233 am 38916819: am 1fb69936: Merge "IMS Call End Cause Additions" into lmp-mr1-dev 
* commit '38916819693a69fbc882ac509e60ef0b6419c5dc':
  IMS Call End Cause Additions
 2014-12-04 21:45:21 +00:00
duho.ro
7c6144730b am 36ccf75b: am fb754252: UICC : discard language setting of SIM 
* commit '36ccf75bb26604786f1d99ab1703ba01f8c3290c':
  UICC : discard language setting of SIM
 2014-12-04 21:45:14 +00:00
Cheuksan Wang
29ac679f9f am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev 
* commit 'dba26aa2e793b037839c608319534b100d2c3dbe':
  new SMS/MMS carrier app API
 2014-12-04 21:45:08 +00:00
Mike Lockwood
448403b7a4 Merge "Dont call close in in BluetoothA2dp finalize" 2014-12-04 21:41:13 +00:00