Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
128,041 Commits 3 Branches 0 Tags
858737d08d9a2db7ef230a17975cd4ded709c3c5
Commit Graph

34990 Commits

Author SHA1 Message Date
Jeff Brown
858737d08d resolved conflicts for merge of 4e5c089e to master-lockscreen-dev 
Change-Id: I456ff6be1e39b65f3e0efeb7fb1924e71d11f6b1
 2014-04-11 01:47:08 -07:00
Jeff Brown
4e5c089ef3 resolved conflicts for merge of 337e764d to master 
Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26
 2014-04-11 01:33:20 -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
Sungsoo Lim
bd35c5f4d2 am f0e74f08: Merge "Add equals, hashCode, and toString methods in TvInputInfo." 
* commit 'f0e74f08a1a11a6d7bb25f34350ff996716036a1':
  Add equals, hashCode, and toString methods in TvInputInfo.
 2014-04-11 02:29:46 +00: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
3b5f8522f7 am 494fb7b5: Update volume panel 
* commit '494fb7b58a21a7a9a8eba3bacecffe115edcb8c6':
  Update volume panel
 2014-04-11 01:16:17 +00:00
Alan Viverette
494fb7b58a Update volume panel 
Change-Id: I6f0887069598f8addc5c5af5aef9c07a69532424
 2014-04-10 18:13:08 -07:00
John Reck
c1776b1426 am 822bbb38: Merge "Make attachFunctor blocking" 
* commit '822bbb382fa6b6c8d1b45770e27c2c2732a7afb7':
  Make attachFunctor blocking
 2014-04-10 22:26:01 +00:00
John Reck
822bbb382f Merge "Make attachFunctor blocking" 2014-04-10 22:23:22 +00:00
John Reck
d3d8dafc2f Make attachFunctor blocking 
Bug: 13930200

Change-Id: I9b0cf92fd16bb30baa09b6f8d7ae22a8b2a7fd80
 2014-04-10 15:00:13 -07:00
Jianing Wei
a0b2be85b8 am dcb495ff: Merge "Camera2 API: enable burst capture and repeating burst." 
* commit 'dcb495ff86b1322256585dbd5eda92949a1e8a4f':
  Camera2 API: enable burst capture and repeating burst.
 2014-04-10 19:54:58 +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
Svetoslav
dd137a85d3 resolved conflicts for merge of 6be2f952 to master-lockscreen-dev 
Conflicts:
	core/java/android/view/IWindowManager.aidl
	tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: Idcbc581294cc52b53eabefd61e5c20cbcea611db
 2014-04-10 12:48:07 -07:00
Svetoslav
6be2f95202 Merge "Adding render stats APIs to UiAutomation (framework)." 2014-04-10 19:32:59 +00:00
Chris Wren
93a03d9b24 am 2bb8dde4: Merge "support the people extra on the notification object" 
* commit '2bb8dde44be10212ec453d435aaad27177714f5e':
  support the people extra on the notification object
 2014-04-10 19:20:07 +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
Paul Lawrence
17f2fdd018 am 9502f990: Merge "Allow encryption when keyguard is set to pattern or no protection" 
* commit '9502f990899ef576879048ec5147d403158ad89d':
  Allow encryption when keyguard is set to pattern or no protection
 2014-04-10 14:33:29 +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
2a6599d335 am f148f36d: am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit 'f148f36d140e995ec8f755e60bbb0b37f33c3da7':
  System services detect and register app CPU ABIs
 2014-04-10 09:47:21 +00:00
Narayan Kamath
954a4666ab am d11f223c: resolved conflicts for merge of 286a247e to master 
* commit 'd11f223c535ed9ce628fe5aaf0fd5692dd0cf9e4':
  Re-implement native library search and copies.
 2014-04-10 09:47:18 +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
Jessica Hummel
e61981c06b am e5e8444c: Merge "Allow setting the active admin across users." 
* commit 'e5e8444ce864e7ac5d07308b9a5c5ca2caaa4e0a':
  Allow setting the active admin across users.
 2014-04-10 08:41:51 +00:00
Jessica Hummel
e5e8444ce8 Merge "Allow setting the active admin across users." 2014-04-10 08:16:28 +00:00
Jessica Hummel
6d36b60beb Allow setting the active admin across users. 
This is required so that provisioning can call it from the primary user when it sets up the mdm on the managed profile.

Change-Id: I185af168754aa4aeae61f1d4522c1794681cb400
 2014-04-10 08:15:42 +00:00
Zhijun He
ad9fa8b735 am 9ce83761: Merge "Camera2: Add MANUAL capture intent" 
* commit '9ce83761cc9908e6acad8af5ad45574163b28b19':
  Camera2: Add MANUAL capture intent
 2014-04-10 02:10:41 +00:00
Zhijun He
9ce83761cc Merge "Camera2: Add MANUAL capture intent" 2014-04-10 02:07:37 +00:00
Zhijun He
e30adb762a Camera2: Add MANUAL capture intent 
Change-Id: I6a3ba818cc7d13e0fcf0d90a16c53884b6cc20ab
 2014-04-09 19:04:31 -07:00
Zhihai Xu
f6a021c4c3 am 7e6fe14f: am 54499194: am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev 
* commit '7e6fe14f0264cef4fa2e0e3bbe5ea26c9a211ec6':
  LE: Return false if an attribute read/write is in progress
 2014-04-10 01:13:51 +00:00
Zhihai Xu
7e6fe14f02 am 54499194: am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev 
* commit '544991946287bdd3a9e6a71855642e378594bf73':
  LE: Return false if an attribute read/write is in progress
 2014-04-10 01:07:26 +00:00
John Reck
04c9040491 am 9817ddd4: Merge "Merge hasFunctors & pushStaging into prepareTree" 
* commit '9817ddd420aaa885f92f778ae2cfd17e6a71bc87':
  Merge hasFunctors & pushStaging into prepareTree
 2014-04-10 00:16:52 +00:00
John Reck
9817ddd420 Merge "Merge hasFunctors & pushStaging into prepareTree" 2014-04-10 00:14:10 +00:00
John Reck
f4198b713e Merge hasFunctors & pushStaging into prepareTree 
Bug: 13902607
 Fixes synchronous mode for WebView in HardwareLayers

Change-Id: I90de1e26dcfd9b75cc2f03bac72705fc23237b68
 2014-04-09 17:00:04 -07:00
Alan Viverette
a11f8b50a8 am 5062649a: Merge "Update list item text appearance" 
* commit '5062649abac9bf873123fe560fbb7b0748b30a54':
  Update list item text appearance
 2014-04-09 23:58:39 +00:00
Alan Viverette
5062649aba Merge "Update list item text appearance" 2014-04-09 23:54:24 +00:00
Alan Viverette
55565ecd46 Update list item text appearance 
Adds a new attribute for secondary list item text and points
the Gingerbread and Holo themes to use TextAppearance.Small for
compatibility's sake.

Change-Id: I8e78a908b699baae6d1f5b3623fd7b5648b99b77
 2014-04-09 16:52:54 -07:00
Zhihai Xu
5449919462 am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev 
* commit '2e8a2d207f446e156a8cfb9532cdfb569caa9458':
  LE: Return false if an attribute read/write is in progress
 2014-04-09 23:50:39 +00:00
Jeff Brown
6fdb5e6df1 resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp 
Change-Id: I5bdc8862828b56557410a95e7f9b14def81a0ded
 2014-04-09 16:47:40 -07:00
John Reck
615c946448 am 8e1f9187: Merge "Switch DisplayListData to a staging model" 
* commit '8e1f918738abf70a4dc86dbb12b386a9deea37f8':
  Switch DisplayListData to a staging model
 2014-04-09 23:03:09 +00:00
John Reck
8e1f918738 Merge "Switch DisplayListData to a staging model" 2014-04-09 23:01:02 +00:00
John Reck
8de65a8e05 Switch DisplayListData to a staging model 
Bug: 13912977

Change-Id: I5b2f664e797be22a58300964f57ceb4fab60528c
 2014-04-09 15:48:00 -07:00
Fabrice Di Meglio
da426fa918 am 03fee276: Merge "Update SearchIndexablesContract" 
* commit '03fee27646564cf1b559b7f8a53d35a1db18d0bd':
  Update SearchIndexablesContract
 2014-04-09 20:32:21 +00:00
Fabrice Di Meglio
03fee27646 Merge "Update SearchIndexablesContract" 2014-04-09 20:29:19 +00:00