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

133824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Koh
f9604f6747 am 2e834efa: am 9241a8d6: am 8031fa01: Fix build due to @deprecated tag not having content 
* commit '2e834efa5636bdd681faab10b188acc17a92f7db':
  Fix build due to @deprecated tag not having content
 2014-05-06 00:11:37 +00:00
Justin Koh
0b8745c0af am f99fc540: (-s ours) am 34f930f3: Fix build due to docs bug. DO NOT MERGE 
* commit 'f99fc5405ea909e8fdea3446646afd8b26229c18':
  Fix build due to docs bug. DO NOT MERGE
 2014-05-06 00:11:20 +00:00
Yohei Yukawa
5095ed699d Merge "Take supportsSwitchingToNextInputMethod into considertaion" 2014-05-06 00:10:11 +00:00
Zhijun He
4fbd5c1c70 am e711e8da: Merge "Camera2: make videostabilization type consistent" 
* commit 'e711e8dae1b2c3cbe790d0e8d627232f6418df43':
  Camera2: make videostabilization type consistent
 2014-05-06 00:07:30 +00:00
Justin Koh
d6fe30600c am 9241a8d6: am 8031fa01: Fix build due to @deprecated tag not having content 
* commit '9241a8d681397d5bacbae19cb081854ebed14d03':
  Fix build due to @deprecated tag not having content
 2014-05-06 00:07:16 +00:00
Justin Koh
f99fc5405e am 34f930f3: Fix build due to docs bug. DO NOT MERGE 
* commit '34f930f3b591f08ee4be8c2f54ee602cabdacc33':
  Fix build due to docs bug. DO NOT MERGE
 2014-05-06 00:06:58 +00:00
Zhijun He
e126be2c5b Merge "Camera2: make videostabilization type consistent" 2014-05-06 00:03:28 +00:00
Winson Chung
258ea87d45 am 0a730c24: Merge "Exposing the API to support widgets in Recents." 
* commit '0a730c24b0af03bea4afa5b6da5ae576b0ef2f99':
  Exposing the API to support widgets in Recents.
 2014-05-06 00:03:21 +00:00
Justin Koh
9241a8d681 am 8031fa01: Fix build due to @deprecated tag not having content 
* commit '8031fa014cd9f8bb9eb7de47b76a732cdfade687':
  Fix build due to @deprecated tag not having content
 2014-05-06 00:03:04 +00:00
Justin Koh
34f930f3b5 Fix build due to docs bug. DO NOT MERGE 
Fix build due to docs bug: needed to remove reference to stopMethodTracingSampling.

Change-Id: I878357b638b3862aecb4bc9d32ee166840b6c796
 2014-05-06 00:01:18 +00:00
Winson Chung
98596c92a3 Merge "Exposing the API to support widgets in Recents." 2014-05-05 23:59:29 +00:00
Justin Koh
13a62a45e7 am 17df6a4c: am 8b98c213: (-s ours) am bebfcb93: Merge "Hide startMethodTracingSampling DO NOT MERGE" into klp-modular-dev 
* commit '17df6a4c5f143d69e9a3dc3e979202b2a8e2c213':
  Hide startMethodTracingSampling DO NOT MERGE
 2014-05-05 23:41:21 +00:00
Justin Koh
c91613b95c am d942cbfd: am 7b529fcd: (-s ours) am 268f858b: Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev 
* commit 'd942cbfded87520f8c7e1d5f36a063ef08975fa9':
  Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE
 2014-05-05 23:41:17 +00:00
Justin Koh
87699015ed am 4e399632: am e0cc71fa: (-s ours) am 1440cc6b: Merge "Hide InputDevice#supportsSource DO NOT MERGE" into klp-modular-dev 
* commit '4e3996322a9b37aeec8966015b4c57afabed5149':
  Hide InputDevice#supportsSource DO NOT MERGE
 2014-05-05 23:41:14 +00:00
John Reck
e4280baaa7 Implement loadSystemProperties 
Bug: 14087580

Change-Id: I7153f38c70b554a78c56a0e794da929fc401ee7a
 2014-05-05 16:39:37 -07:00
Jesse Hall
a767d762d8 VirtualDisplayAdapter: Set the transaction surface even if NULL 
Bug: 14299872
Change-Id: I55e4a2e575cfd3788fbdb90b050dac486976c1b6
 2014-05-05 16:39:21 -07:00
Justin Koh
5e07af31d6 am 8b98c213: (-s ours) am bebfcb93: Merge "Hide startMethodTracingSampling DO NOT MERGE" into klp-modular-dev 
* commit '8b98c2130730b64917da0e0dbfb7e9202272f4f1':
  Hide startMethodTracingSampling DO NOT MERGE
 2014-05-05 23:37:20 +00:00
Justin Koh
e1f93c5281 am 7b529fcd: (-s ours) am 268f858b: Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev 
* commit '7b529fcd6dc9064f5cbc2db95f9ac08bd59b0953':
  Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE
 2014-05-05 23:37:16 +00:00
Justin Koh
b5de656c7f am e0cc71fa: (-s ours) am 1440cc6b: Merge "Hide InputDevice#supportsSource DO NOT MERGE" into klp-modular-dev 
* commit 'e0cc71fa19706dee06b1ef17dec720e420753162':
  Hide InputDevice#supportsSource DO NOT MERGE
 2014-05-05 23:37:11 +00:00
Justin Koh
8031fa014c Fix build due to @deprecated tag not having content 
Bug: 14441321
Change-Id: Ia42040db7030e4318ed2c34bbe90808a49f002db
 2014-05-05 16:29:52 -07:00
Justin Koh
8b98c21307 am bebfcb93: Merge "Hide startMethodTracingSampling DO NOT MERGE" into klp-modular-dev 
* commit 'bebfcb93ef97095a7caa1f80a0b1b05a04e9fd8c':
  Hide startMethodTracingSampling DO NOT MERGE
 2014-05-05 23:18:26 +00:00
Justin Koh
7b529fcd6d am 268f858b: Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev 
* commit '268f858be57089e568bc55aa9089af54a53dcc94':
  Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE
 2014-05-05 23:18:22 +00:00
Justin Koh
bebfcb93ef Merge "Hide startMethodTracingSampling DO NOT MERGE" into klp-modular-dev 2014-05-05 23:15:36 +00:00
Justin Koh
268f858be5 Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev 2014-05-05 23:14:06 +00:00
Justin Koh
e0cc71fa19 am 1440cc6b: Merge "Hide InputDevice#supportsSource DO NOT MERGE" into klp-modular-dev 
* commit '1440cc6bf37a268b439dfe86a9078b93bf1baf39':
  Hide InputDevice#supportsSource DO NOT MERGE
 2014-05-05 23:11:03 +00:00
Justin Koh
6f5dcc3546 Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE 
Bug: 14116162
Change-Id: I6b947c9b46bb5ea094b39428bb432e8f6fc6b57a
 2014-05-05 16:08:38 -07:00
Justin Koh
1440cc6bf3 Merge "Hide InputDevice#supportsSource DO NOT MERGE" into klp-modular-dev 2014-05-05 23:08:15 +00:00
Griff Hazen
cc7fccd806 am 420f4a98: am 36ef0792: (-s ours) am ed0c87e7: DO NOT MERGE Hide Notification categories from API 20 (KKWT) 
* commit '420f4a98fd3ebd1efa5a4c66c64509a36ba8bc62':
  DO NOT MERGE Hide Notification categories from API 20 (KKWT)
 2014-05-05 22:59:47 +00:00
Griff Hazen
23fccdd0b5 am 36ef0792: (-s ours) am ed0c87e7: DO NOT MERGE Hide Notification categories from API 20 (KKWT) 
* commit '36ef0792d28d2beb8eecb4547fab81d520c66ed0':
  DO NOT MERGE Hide Notification categories from API 20 (KKWT)
 2014-05-05 22:53:59 +00:00
Justin Koh
e5c06272a1 am 4cf13ef2: am fcd2aff4: (-s ours) am 1e822a8f: Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-dev 
* commit '4cf13ef2ab081e74a531052ceda16b74f07cb0bd':
  Hide HDMI CEC from KKWT DO NOT MERGE
 2014-05-05 22:50:54 +00:00
Justin Koh
c8eb34a8d6 am c5e1bf37: am 8e4cbcce: (-s ours) am f8a10d77: Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev 
* commit 'c5e1bf37fc984001e4d4779d67e22a807e920c96':
  Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE
 2014-05-05 22:50:51 +00:00
Justin Koh
c40077edd6 am c363c6ee: am 5aa34455: (-s ours) am 9cb3b162: Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev 
* commit 'c363c6eee9d29c13e415cc3d26897602690db9eb':
  Hide UsbDevice changes in KKWT DO NOT MERGE
 2014-05-05 22:50:48 +00:00
Justin Koh
ae42a6ee4c am c315202e: am fd04632a: am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 
* commit 'c315202e247c83a0d646e33675255d9778f6ba87':
  Hide getDeviceGlobalActionKeyTimeout
 2014-05-05 22:50:45 +00:00
Griff Hazen
36ef0792d2 am ed0c87e7: DO NOT MERGE Hide Notification categories from API 20 (KKWT) 
* commit 'ed0c87e7cdd2f641b6ed78df62b20a9f08ac16bb':
  DO NOT MERGE Hide Notification categories from API 20 (KKWT)
 2014-05-05 22:49:51 +00:00
Justin Koh
8bed554e4f Hide InputDevice#supportsSource DO NOT MERGE 
Bug: 14116162
Change-Id: I7c0ae516596f965083622aa77281abf6d47dc0b7
 2014-05-05 15:47:39 -07:00
Justin Koh
d56eff3812 am fcd2aff4: (-s ours) am 1e822a8f: Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-dev 
* commit 'fcd2aff48d06ff695a14359621c6dba4ae5366de':
  Hide HDMI CEC from KKWT DO NOT MERGE
 2014-05-05 22:45:36 +00:00
Justin Koh
64bca23370 am 8e4cbcce: (-s ours) am f8a10d77: Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev 
* commit '8e4cbcce6616aee96754393aaddb23df91bfc02c':
  Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE
 2014-05-05 22:45:32 +00:00
Justin Koh
dcde19deba am 5aa34455: (-s ours) am 9cb3b162: Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev 
* commit '5aa34455d7d921f33b67463cd58b879d5cfcf1ca':
  Hide UsbDevice changes in KKWT DO NOT MERGE
 2014-05-05 22:45:29 +00:00
Justin Koh
a13a17ee0c am fd04632a: am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 
* commit 'fd04632ab5fe9272b0f1d2ff94367a574e026a5b':
  Hide getDeviceGlobalActionKeyTimeout
 2014-05-05 22:45:23 +00:00
Griff Hazen
ed0c87e7cd DO NOT MERGE Hide Notification categories from API 20 (KKWT) 
Bug: 14116162

Change-Id: I59e499dde9a06a4bf455eecb3665afaa1b574dae
 2014-05-05 15:45:08 -07:00
Justin Koh
fcd2aff48d am 1e822a8f: Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-dev 
* commit '1e822a8fe1f3063aa0d3eb47a7afdda9702c1734':
  Hide HDMI CEC from KKWT DO NOT MERGE
 2014-05-05 22:42:22 +00:00
Justin Koh
8e4cbcce66 am f8a10d77: Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev 
* commit 'f8a10d775efcc1c7255c1e504bf59f7cd38967ef':
  Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE
 2014-05-05 22:42:19 +00:00
Justin Koh
5aa34455d7 am 9cb3b162: Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev 
* commit '9cb3b162ebf2c85b2b34d399623ff68427b2cdca':
  Hide UsbDevice changes in KKWT DO NOT MERGE
 2014-05-05 22:42:15 +00:00
Justin Koh
8fee5c857b Hide startMethodTracingSampling DO NOT MERGE 
Bug: 14116162
Change-Id: I68470f02a2b6c2f0d9a1cb52bb4b7eeea10b43cf
 2014-05-05 15:40:00 -07:00
Justin Koh
1e822a8fe1 Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-dev 2014-05-05 22:38:26 +00:00
Justin Koh
f8a10d775e Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev 2014-05-05 22:38:17 +00:00
Justin Koh
fd04632ab5 am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 
* commit '3caf92582498bad8fe79f6e3235be218e82b7f68':
  Hide getDeviceGlobalActionKeyTimeout
 2014-05-05 22:38:13 +00:00
Justin Koh
9cb3b162eb Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev 2014-05-05 22:38:06 +00:00
Justin Koh
3caf925824 Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 2014-05-05 22:33:29 +00:00
Justin Koh
048adf4853 am 1d39177b: am 68ca1464: (-s ours) am ed23c5bc: Hide NsdServiceInfo additions for KKWT DO NOT MERGE 
* commit '1d39177b6a85bed9edfba2fad15d9d5738983c54':
  Hide NsdServiceInfo additions for KKWT DO NOT MERGE
 2014-05-05 22:31:09 +00:00