Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133,835 Commits 3 Branches 0 Tags
f2e1ac7d595d8327a1e2795ea1bd58bdd4c41b24
Commit Graph

36251 Commits

Author SHA1 Message Date
Jeff Brown
f2e1ac7d59 am 830d29b0: Merge "Plumb display state and interactive information to BatteryStats." 
* commit '830d29b0c248b62a590866573a7d17e880c3c608':
  Plumb display state and interactive information to BatteryStats.
 2014-05-06 20:31:18 +00:00
Jeff Brown
996e269d93 Merge "Plumb display state and interactive information to BatteryStats." 2014-05-06 20:28:36 +00:00
Adam Powell
f14f0a6cf4 am 7f85f16c: am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev 
* commit '7f85f16c7d131699bef67aff6a107ce622e65b8d':
  onWindowDismissed API cleanup
 2014-05-06 20:27:23 +00:00
Adam Powell
5f97930fc5 am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev 
* commit 'c41fa708271e204a7983aba291389ea1554227b2':
  onWindowDismissed API cleanup
 2014-05-06 20:24:23 +00:00
Jeff Brown
e95c3cd895 Plumb display state and interactive information to BatteryStats. 
Fixes an issue where dozing was treated the same as the screen
being fully on.  Now dozing is treated the same as the screen
being fully off which is slightly better.  The decision of how
to represent this state is now internal to the battery stats
so it can be improved later.

Removed noteInputEvent() since it is unused.

Bug: 14480844
Change-Id: Iee8cf8dce1a1f91c62678bb6d3d9fe567ad6db42
 2014-05-06 13:23:53 -07:00
Chris Craik
928a0632e5 am 60fbef43: Merge "Fix pivot update rejection logic" 
* commit '60fbef4368a706954eed64f9acada3f26072a429':
  Fix pivot update rejection logic
 2014-05-06 20:23:26 +00:00
Adam Powell
c41fa70827 am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev 
* commit 'a0516e7ad12a647cc40fb5651e8d14cd39571c7a':
  onWindowDismissed API cleanup
 2014-05-06 20:20:40 +00:00
Adam Powell
a0516e7ad1 Merge "onWindowDismissed API cleanup" into klp-modular-dev 2014-05-06 20:17:31 +00:00
Chris Craik
55d47f6be8 Merge "Fix pivot update rejection logic" 2014-05-06 20:17:29 +00:00
Chris Craik
6c1787cfea Fix pivot update rejection logic 
bug:14228573
Change-Id: Ia4c88f878ce325ee961117cf255c971d9947d5c6
 2014-05-06 11:02:39 -07:00
John Reck
d0bee5381f am f59e3f36: Merge "Implement loadSystemProperties" 
* commit 'f59e3f36dabcf395ea891d17d793f7088a3529e9':
  Implement loadSystemProperties
 2014-05-06 16:19:32 +00:00
John Reck
ebb9e69513 Merge "Implement loadSystemProperties" 2014-05-06 16:17:13 +00:00
Nicolas Prevot
a9d1ed8a14 am 168ed3dc: Merge "Cleaning code related to the forwarding intent filters." 
* commit '168ed3dc2e36346d227008748fc4c69a0f03d8a5':
  Cleaning code related to the forwarding intent filters.
 2014-05-06 14:03:01 +00:00
Nicolas Prevot
45c149ae4e am 1ba4477c: Merge "Introducing removable and non-removable ForwardingIntentFilters." 
* commit '1ba4477c1f029cb9803b33476fee25b162b5a579':
  Introducing removable and non-removable ForwardingIntentFilters.
 2014-05-06 13:58:53 +00:00
Nicolas Prevot
c79586ede6 Cleaning code related to the forwarding intent filters. 
Checking for INTERACT_ACROSS_USERS_FULL
Adding equivalent methods in the PackageManager

Change-Id: Iaa1328fa666613a78e67ca669ea045144275e895
 2014-05-06 13:54:48 +01:00
Nicolas Prevot
6fee7d4cf9 Introducing removable and non-removable ForwardingIntentFilters. 
clearForwardingIntentFilters removes only non-removable IntentFilters.
The ForwardingIntentFilters set by the profile owner are always removable.

Change-Id: If950ccd7e69261b86360ea647fdb501c92f5440b
 2014-05-06 12:37:20 +01:00
Yorke Lee
35a543da8d am ea98695e: Merge "Fix nested prescrolling bug in ScrollView" 
* commit 'ea98695e42705c4dc814dc58240e4d14e6a8c245':
  Fix nested prescrolling bug in ScrollView
 2014-05-06 02:22:58 +00:00
Yorke Lee
ccd3a6a519 Merge "Fix nested prescrolling bug in ScrollView" 2014-05-06 02:19:35 +00:00
Adam Powell
117b695222 onWindowDismissed API cleanup 
Move the window swipe to dismiss plumbing off of Window.Callback into
its own internal interface implemented by Activity and Dialog. Make it
internal API instead of public. Apps should control this via the
window feature setting.

Change-Id: I64cd237fa7eab08719b2c34e31dac7d34f02563a
 2014-05-05 18:20:47 -07:00
Selim Gurun
4e4cacd684 am 234558e8: Merge "Add frameworks/base changes for enabling reduction proxy" 
* commit '234558e89565d7310e3c12fe72a51b884876abf6':
  Add frameworks/base changes for enabling reduction proxy
 2014-05-06 00:33:55 +00:00
Selim Gurun
c3d8b0f2b0 Merge "Add frameworks/base changes for enabling reduction proxy" 2014-05-06 00:30:50 +00:00
Selim Gurun
a83f1e3d23 Add frameworks/base changes for enabling reduction proxy 
Bug:12492817

Add an experimental webview setting to developer options to enable
data reduction proxy.

Change-Id: Id73d7f5d655a7de18afff766c5c78209c92964ea
 2014-05-05 17:28:04 -07:00
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
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
John Reck
e4280baaa7 Implement loadSystemProperties 
Bug: 14087580

Change-Id: I7153f38c70b554a78c56a0e794da929fc401ee7a
 2014-05-05 16:39:37 -07: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
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
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