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

127518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
4e5c089ef3 resolved conflicts for merge of 337e764d to master 
Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26
 2014-04-11 01:33:20 -07:00
Colin Cross
90b39abaf9 Merge "fix build" 2014-04-11 05:16:12 +00:00
Colin Cross
0b65c56eb0 fix build 
Fix make checkbuild.

Change-Id: Ie9335a9e8afe4dc13ec47b2e84ab433b19ff315f
 2014-04-10 22:05:57 -07:00
Jeff Brown
337e764deb am f24687e2: Merge "Plumb display power state through display manager." into klp-modular-dev 
* commit 'f24687e2731811fd0e3803b691fd47a659f89329':
  Plumb display power state through display manager.
 2014-04-11 03:49:37 +00:00
Jeff Brown
f24687e273 Merge "Plumb display power state through display manager." into klp-modular-dev 2014-04-11 03:47:08 +00:00
Jeff Brown
037c33eae7 Plumb display power state through display manager. 
Declare a new method, Display.getState() to retrieve the actual
power state of a display.

Improved documentation for Intent.ACTION_SCREEN_ON and
Intent.ACTION_SCREEN_OFF to clarify what they really mean in
terms of the interactive state of the device.

Deprecated PowerManager.isScreenOn() and replaced it with
PowerManager.isInteractive() with a more suggestive name and
better documentation.

Redirect display power state changes to go through the display
manager first and only then head over to the power manager for
legacy compatibility.

Eliminated the bright here and woke here policy flags since they
were unused.  Simplified the input dispatch policy somewhat.

Ensure that screen wake locks are respected up until the point
when dozing really begins.

Fixed a regression in DreamService where onDreamingStarted
might be called before onWindowAttached.

Bug: 13133142
Bug: 13472578
Bug: 13929355
Bug: 13760290
Change-Id: Iabef96921dd554ce3768fb18619cefc3230b5fb0
 2014-04-10 20:46:14 -07:00
Alan Viverette
eed2be4eab Merge "Fix support for TouchFeedbackDrawable tint mode" 2014-04-11 02:55:31 +00:00
Alan Viverette
d30688f0a0 Fix support for TouchFeedbackDrawable tint mode 
Change-Id: I86bff1c5e69d9a193deb52559948b20ddca99751
 2014-04-10 19:27:58 -07:00
Sungsoo Lim
f0e74f08a1 Merge "Add equals, hashCode, and toString methods in TvInputInfo." 2014-04-11 02:27:21 +00:00
Sungsoo Lim
89978abd98 Add equals, hashCode, and toString methods in TvInputInfo. 
Change-Id: I770e0eeac334d2c0b98ef0941bc9840296360e4f
 2014-04-11 11:24:26 +09:00
Alan Viverette
494fb7b58a Update volume panel 
Change-Id: I6f0887069598f8addc5c5af5aef9c07a69532424
 2014-04-10 18:13:08 -07:00
Amith Yamasani
c095ca1cb8 Merge "Corp badging for Recents" 2014-04-11 00:30:35 +00:00
Amith Yamasani
4f0a49e6b9 Corp badging for Recents 
Badge apps that belong to the corp profile when shown in the recents list.

Add a userId to TaskKey to help with caching.

Bug: 11676348

Change-Id: I92c8262dce763de89497977fcc6a53899afda136
 2014-04-10 17:27:12 -07:00
Zhijun He
438d77e042 MediaFrameworkTest: Fix Camera2 API unit test build breakage 
Change-Id: I49329e2c3bbf1290f1f6e7c64dbb56eb831e5a96
 2014-04-10 17:09:22 -07:00
Alan Viverette
316e533ab0 Merge "Update brightness icons to use color attribute" 2014-04-10 23:15:45 +00:00
Alan Viverette
515a48a018 Update brightness icons to use color attribute 
BUG: 13961573
Change-Id: I6c7f85c8cda739cb1e5e14c39c7e4a9fe20a8650
 2014-04-10 16:14:40 -07:00
Jean-Michel Trivi
cf3f3c2736 Merge "MediaFocusControl: fix comment" 2014-04-10 23:11:28 +00:00
ztenghui
8a5c99c9e9 Merge "Fix path interpretation on curves" 2014-04-10 22:40:35 +00:00
Raph Levien
6d954bbdf5 Merge "Fix build breakage" 2014-04-10 22:24:55 +00:00
John Reck
822bbb382f Merge "Make attachFunctor blocking" 2014-04-10 22:23:22 +00:00
Raph Levien
3931949bc4 Fix build breakage 
A recent change to remove VectorDrawable methods from the public api
didn't run update-api. This should fix that build.

Change-Id: I4d86221f5ada96113f673def4b32985c6d60110a
 2014-04-10 15:15:29 -07:00
Jean-Michel Trivi
f51e113469 MediaFocusControl: fix comment 
Comment about role of audio focus isn't valid anymore.

Change-Id: I608d8cf9d5d9c4449384e2788e5eb5ea42c97eca
 2014-04-10 15:05:44 -07:00
John Reck
d3d8dafc2f Make attachFunctor blocking 
Bug: 13930200

Change-Id: I9b0cf92fd16bb30baa09b6f8d7ae22a8b2a7fd80
 2014-04-10 15:00:13 -07:00
Alan Viverette
4b1a7c203d Fix build breakage 
Change-Id: I73d9ff5f38986b7acf83b85c1989203f472bc5fd
 2014-04-10 14:28:30 -07:00
John Reck
a47c3cc537 Merge "Remove sync flush" 2014-04-10 21:13:08 +00:00
Selim Cinek
ff0978fd16 Merge "Further improved NotificationStackScroller" 2014-04-10 21:01:28 +00:00
Jianing Wei
dcb495ff86 Merge "Camera2 API: enable burst capture and repeating burst." 2014-04-10 19:51:57 +00:00
Jianing Wei
d2c3a825cd Camera2 API: enable burst capture and repeating burst. 
*  Enable sending out burst requests, canceling, and flushing.
*  Enable onCaptureStarted, onResultReceived for bursts.
*  Enable onCaptureSequenceCompleted by tracking frame number.

Change-Id: Ica2b031cac7ad90f9c4b74a78e6185e627195340
Bug-ID: 10749500
 2014-04-10 19:50:04 +00:00
Alan Viverette
de5a29deae Merge "Cleaning up VectorDrawable" 2014-04-10 19:38:24 +00:00
Selim Cinek
1685e634fb Further improved NotificationStackScroller 
The top card is now collapsed during the pulldown of
the notification shade and expanded during the transition.
The scrollstate is also reset once the shade is closed.

Change-Id: Ibf17eef1f338d674c545e5bf55261e60db62b2ce
 2014-04-10 21:37:46 +02:00
Svetoslav
6be2f95202 Merge "Adding render stats APIs to UiAutomation (framework)." 2014-04-10 19:32:59 +00:00
Chris Wren
2bb8dde44b Merge "support the people extra on the notification object" 2014-04-10 19:18:31 +00:00
Chris Wren
dde753079f support the people extra on the notification object 
currently supported URIs:
  content://com.android.contacts/contacts/lookup/*
  tel:*

Change-Id: I833eee3f2ee40aa8cb2cfad135bdd6cb2c0eb792
 2014-04-10 15:18:25 -04:00
Alan Viverette
4b3988d159 Cleaning up VectorDrawable 
Use argb evaluation method from animation package, lazily create paint,
set default for stroke line cap and join. Fix scaling to bounds. Fix
drawable in test app.

Change-Id: I245d5d6acc6ba9806743ab2bf9bf99aff3649c39
 2014-04-10 11:21:15 -07:00
John Reck
8ca3eecc2b Remove sync flush 
Bug: 13952590
 It was attempting to flush state changes after the canvas was
 destroyed, which caused layer updates to crash.

 Due to the removal of SetDisplayListData, the sync mode isn't able
 to do anything ever, so remove it.

Change-Id: I1e18ce288d81fd47cc6e612afda9476f75ecef2e
 2014-04-10 10:46:55 -07:00
Baligh Uddin
2271a91c32 am cd5e3f85: (-s ours) am da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'cd5e3f85fc9228b943ee8dfda0951e068953596c':
  Import translations. DO NOT MERGE
 2014-04-10 15:58:38 +00:00
Baligh Uddin
cd5e3f85fc am da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'da6b9599c77230c689d63e32ca80b62f60f18c27':
  Import translations. DO NOT MERGE
 2014-04-10 15:55:25 +00:00
Baligh Uddin
da6b9599c7 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-10 15:51:37 +00:00
Baligh Uddin
8c22e36742 Merge "Import translations. DO NOT MERGE" 2014-04-10 15:51:35 +00:00
Paul Lawrence
9502f99089 Merge "Allow encryption when keyguard is set to pattern or no protection" 2014-04-10 14:30:53 +00:00
Narayan Kamath
edd6d9e3a8 am 3603970d: am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes" 
* commit '3603970d3a8a2215027e96c4861e1ab9eec86f79':
  Removed android.debug.JNITest from preloaded-classes
 2014-04-10 11:28:34 +00:00
Narayan Kamath
3603970d3a am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes" 
* commit '940e76fd378cebcd0d83099a5c31bc1e2bbeb2ba':
  Removed android.debug.JNITest from preloaded-classes
 2014-04-10 11:25:56 +00:00
Narayan Kamath
940e76fd37 am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes" 
* commit 'b827f78e7acee3a604c315615268edf7098dc184':
  Removed android.debug.JNITest from preloaded-classes
 2014-04-10 11:21:33 +00:00
Narayan Kamath
b827f78e7a Merge "Removed android.debug.JNITest from preloaded-classes" 2014-04-10 11:18:28 +00:00
Narayan Kamath
f148f36d14 am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit '9e289d70a8baaed0030413b5991653792e2a816d':
  System services detect and register app CPU ABIs
 2014-04-10 09:45:18 +00:00
Narayan Kamath
d11f223c53 resolved conflicts for merge of 286a247e to master 
Change-Id: I63df9d482da3ce2ac851959223b9180020ffad0c
 2014-04-10 10:38:31 +01:00
Narayan Kamath
9e289d70a8 am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit '1d26a3f1efd0d965e8751e8515608c31789bdbe2':
  System services detect and register app CPU ABIs
 2014-04-10 09:26:59 +00:00
Narayan Kamath
286a247e4c am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies." 
* commit '0fd40cb100bccbd5d9ad6109ca39c818a857f889':
  Re-implement native library search and copies.
 2014-04-10 09:26:44 +00:00
Narayan Kamath
1d26a3f1ef am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit '09e13cc5f9f98382376eb49bfa6ceb94a50d37a1':
  System services detect and register app CPU ABIs
 2014-04-10 09:23:33 +00:00
Narayan Kamath
0fd40cb100 am 80413c9f: Merge "Re-implement native library search and copies." 
* commit '80413c9fe10acf36eaecd139198c7fc17e8af2e6':
  Re-implement native library search and copies.
 2014-04-10 09:23:30 +00:00