130431 Commits

Author SHA1 Message Date
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
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
Jeff Brown
01ee6f6cf7 Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)
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:18:19 -07: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
Jorim Jaggi
ef3b18b101 Merge "Never close Keyguard automatically." 2014-05-06 20:01:43 +00:00
Tim Kilbourn
d689db4f0c DO NOT MERGE Hide banner manifest attribute.
Bug: 14116162
Change-Id: I42a73183bee52286ff315fa5b0f58bfdfc020485
2014-05-06 12:02:42 -07:00
Dan Stoza
00101052b5 Enable changing display configuration
This allows querying and switching display device configurations
through the ISurfaceComposer/SurfaceComposerClient interface.

Bug: 14320401
Change-Id: Ie4363bc8353d95428f1114ea48e5b1c8976e1730
2014-05-06 11:34:06 -07:00
Chris Craik
6c1787cfea Fix pivot update rejection logic
bug:14228573
Change-Id: Ia4c88f878ce325ee961117cf255c971d9947d5c6
2014-05-06 11:02:39 -07:00
Tim Kilbourn
a2d106d470 Fix bad merge.
Change-Id: I4d3aa71f5a4ae13c01e57df25ae7f76d25384f5d
2014-05-06 10:54:00 -07:00
Tim Kilbourn
d06b29d0f7 am f7330ac7: am 989dab11: Update current.txt after hiding isGame.
* commit 'f7330ac754d02089dedef5d7191bde9a75b91c2c':
  Update current.txt after hiding isGame.
2014-05-06 17:46:02 +00:00
Tim Kilbourn
23b0d53541 am a7b267b8: (-s ours) am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute.
* commit 'a7b267b81b611058ddf7c268f5d21705f5306047':
  DO NOT MERGE Hide isGame manifest attribute.
2014-05-06 17:45:58 +00:00
Tim Kilbourn
f7330ac754 am 989dab11: Update current.txt after hiding isGame.
* commit '989dab11d1e34d5f49ac19345a3ce440d32d6f64':
  Update current.txt after hiding isGame.
2014-05-06 17:42:36 +00:00
Tim Kilbourn
a7b267b81b am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute.
* commit '0f3a98f5c93581cc511684b92e11e2ed2a17581e':
  DO NOT MERGE Hide isGame manifest attribute.
2014-05-06 17:42:31 +00:00
Tim Kilbourn
989dab11d1 Update current.txt after hiding isGame.
Change-Id: I034126f464fdd759c19ff55000004d36463d9cd6
2014-05-06 10:40:24 -07:00
ztenghui
0b3a706188 Merge "First step on API cleaning on the VectorDrawable to disable animation support" 2014-05-06 17:12:34 +00:00
Tim Kilbourn
0f3a98f5c9 DO NOT MERGE Hide isGame manifest attribute.
Bug: 14116162
Change-Id: I72a0210124f22009914a860097e286c5ea9af345
2014-05-06 09:49:56 -07:00
John Reck
ebb9e69513 Merge "Implement loadSystemProperties" 2014-05-06 16:17:13 +00:00
Glenn Kasten
34a37bdebb Add AudioFormat.getBytesPerSample and use it
Change-Id: I90a40987ea99006af4a6e31136078c04976eb54d
2014-05-06 09:11:52 -07:00
Baligh Uddin
594b9dcc1a am ddaacaa7: (-s ours) am 37c954c0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'ddaacaa7ceb6d41658eeea0079c9882510697dac':
  Import translations. DO NOT MERGE
2014-05-06 14:59:03 +00:00
Baligh Uddin
ddaacaa7ce am 37c954c0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '37c954c044b28b708528c074e7172a1bd91521eb':
  Import translations. DO NOT MERGE
2014-05-06 14:54:27 +00:00
Baligh Uddin
37c954c044 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-06 14:49:57 +00:00
Baligh Uddin
dccbb6706b Merge "Import translations. DO NOT MERGE" 2014-05-06 14:49:53 +00:00
Nicolas Prevot
ae949571f0 Merge "Cleaning code related to the forwarding intent filters." 2014-05-06 13:57:56 +00:00
Nicolas Prevot
834bb1cc37 Merge "Introducing removable and non-removable ForwardingIntentFilters." 2014-05-06 13:55:59 +00:00
Jorim Jaggi
fd4235f268 Merge "Fix overly huge PanelView." 2014-05-06 13:24:20 +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
Jorim Jaggi
3b23999954 Fix overly huge PanelView.
Bug: 14489968
Change-Id: Ibdc820348eb7d045ffb5ad07093ac86e5ff7abb0
2014-05-06 14:53:04 +02:00
Jorim Jaggi
dba6ca00c3 Merge "Implement phone affordance on lockscreen." 2014-05-06 12:10:53 +00:00
Jorim Jaggi
97b63c4112 Implement phone affordance on lockscreen.
Refactor the camera affordance into a reusable view. This change
also swaps the asset for the camera affordance.

Bug: 14488709
Change-Id: I0633614f6a1ea81faa37923f748af3c635e64a52
2014-05-06 13:56:44 +02: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
Jesse Hall
da25a59a19 Merge "VirtualDisplayAdapter: Set the transaction surface even if NULL" 2014-05-06 04:00:39 +00:00
Elliott Hughes
f3e7945c79 am 86768034: am b593ad60: am f1f28d1d: Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice."
* commit '867680342e12af59a26756f30cf817a131724943':
  Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice.
2014-05-06 02:34:40 +00:00
Elliott Hughes
867680342e am b593ad60: am f1f28d1d: Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice."
* commit 'b593ad60682a6f8c945c4c2ffc3d278df3f6e360':
  Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice.
2014-05-06 02:31:03 +00:00
Elliott Hughes
b593ad6068 am f1f28d1d: Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice."
* commit 'f1f28d1d86aea6dd1419e94aadf051e433914680':
  Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice.
2014-05-06 02:27:44 +00:00
Elliott Hughes
f1f28d1d86 Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice." 2014-05-06 02:25:05 +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
Igor Viarheichyk
47843df11f Skip resource files for locales en-XA and ar-XB
during packaging if pseudolocalization was done automatically.
This prevents attemts to add same resource twice.

Change-Id: I51e17f961ac44047bf466ce4aa0d4d17f4ded0d6
2014-05-05 18:13:41 -07: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
ztenghui
498213a265 First step on API cleaning on the VectorDrawable to disable animation support
Cleaning on the API level, and related tests.
The animated icon will be only showing the initial state.

TODO: Deep clean on the functionality part and attributes.

Change-Id: I5723bc5b64f796c3a273d74bde02095751160a88
2014-05-05 17:27:24 -07: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
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
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