Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,548 Commits 3 Branches 0 Tags
b0c8593d97cf1df546dd3aab797bbed9d8ae367e
Commit Graph

37721 Commits

Author SHA1 Message Date
Ruchi Kandoi
b0c8593d97 am f20a5eb2: PowerManager: add powerHint method 
* commit 'f20a5eb279035d462e1f5d9895f4eb66cc152215':
  PowerManager: add powerHint method
 2014-04-04 20:29:39 +00:00
Ruchi Kandoi
f20a5eb279 PowerManager: add powerHint method 
Add powerHint method to IPowerManager for passing power hints from other
processes.

Change-Id: Ic596ace2ed1796a6da4cddb2163dcc4536115e55
 2014-04-04 20:24:16 +00:00
John Spurlock
83398922ba am 0a0454fd: am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '0a0454fdcc7aeac6e57f9466da8f39bcf5f3f6ec':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:40:10 +00:00
Adam Powell
41923aedce am dd79334f: Merge "Fix ActionBar attribute parsing" 
* commit 'dd79334f7ecb39135058c2049cd933b4b930a3d1':
  Fix ActionBar attribute parsing
 2014-04-04 19:34:15 +00:00
John Spurlock
0a0454fdcc am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '642421aa7f284817cc1a972a7f9c7a64696a0116':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:34:11 +00:00
Adam Powell
dd79334f7e Merge "Fix ActionBar attribute parsing" 2014-04-04 19:28:46 +00:00
John Spurlock
642421aa7f am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:28:09 +00:00
John Spurlock
5c31e487c4 Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 2014-04-04 19:24:09 +00:00
Adam Powell
b226bea108 Fix ActionBar attribute parsing 
Lost in some prior refactoring. Also fixes doc builds for the removed
styleable.

Change-Id: Ice27a978cd5c22c6ad1fc0b45557c6cac77b5985
 2014-04-04 12:23:42 -07:00
John Spurlock
6c191299a7 Introduce new UI_MODE_TYPE_WATCH and qualifier. 
Default ui mode to watch if we have FEATURE_WATCH.

Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
 2014-04-04 15:21:53 -04:00
Ricardo Cervera
89f5e88353 am 1e9b3f64: am 8f81d295: am d10b6543: am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs 
* commit '1e9b3f645e72d28073ef1c5dffde33aeec9f0c4b':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
 2014-04-04 17:57:56 +00:00
Ricardo Cervera
1e9b3f645e am 8f81d295: am d10b6543: am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs 
* commit '8f81d29558bb0c97187d5ae3a7ee696ec13b264a':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
 2014-04-04 17:55:45 +00:00
Adam Powell
95b0c1a723 am 33d0dad1: Merge "android.widget.Toolbar" 
* commit '33d0dad1bce329b5794091c31c50543666b3a251':
  android.widget.Toolbar
 2014-04-04 17:51:58 +00:00
Adam Powell
2e21578701 am 2efec597: Merge "Deprecate ActionBar navigation modes" 
* commit '2efec597b7ac0a0ab256bfeec8f83076cb22d4d7':
  Deprecate ActionBar navigation modes
 2014-04-04 17:51:55 +00:00
Ricardo Cervera
8f81d29558 am d10b6543: am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs 
* commit 'd10b65431547d66b41e4e282e9261453bb0658ff':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
 2014-04-04 17:48:51 +00:00
Ricardo Cervera
d10b654315 am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs 
* commit '5df825237afd016c48dd3577d839825e5161d3e7':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
 2014-04-04 17:42:44 +00:00
Ricardo Cervera
90a5f9851a docs: Added permissions note for Context.getFilesDir. Bug: 13716053 
Change-Id: I02e17c358630ab298bb99731723405cdeae701fc
 2014-04-04 10:26:05 -07:00
Adam Powell
e43340c80d android.widget.Toolbar 
Add the new Toolbar widget for use in app layouts.

ActionBar can now be used as a point of control for either a
traditional window decor action bar or for a Toolbar that appears
inline in an Activity's layout.

ToolbarActionBar is currently WIP.

Change-Id: I0da093e5645840f4fd032aa34efa0ae5f1825ff2
 2014-04-04 10:08:17 -07:00
Adam Powell
fc35dfd513 Deprecate ActionBar navigation modes 
Navigation modes were a great shortcut for patterns that are no longer
recommended or that don't integrate as nicely with application
content. Apps have done a great job both inventing new navigation
patterns that work well in their own contexts or following patterns
that can be implemented inline with an app's content. Navigation modes
as a prescriptive construct are no longer needed.

Be free, apps!

Change-Id: I9ae1c2efc830c7dcb6664061bba68b1748928ae3
 2014-04-04 10:08:17 -07:00
Adam Connors
d14b6df22b am d423986e: Merge "Add android.software.managedprofiles feature flag." 
* commit 'd423986e68d76958441c3bec1584a86f7f390988':
  Add android.software.managedprofiles feature flag.
 2014-04-04 14:47:46 +00:00
Adam Connors
d423986e68 Merge "Add android.software.managedprofiles feature flag." 2014-04-04 14:40:20 +00:00
Paul Lawrence
4a3285de79 am f17f0e0e: Merge "Save OwnerInfo so CryptKeeper can display at boot time" 
* commit 'f17f0e0eb0eef424401caa122e51a648f5ef3801':
  Save OwnerInfo so CryptKeeper can display at boot time
 2014-04-04 14:12:02 +00:00
Paul Lawrence
f17f0e0eb0 Merge "Save OwnerInfo so CryptKeeper can display at boot time" 2014-04-04 14:05:56 +00:00
Craig Mautner
ee8a81c4c4 am 4c4b1d65: Merge "Fix build due to bad javadoc link." 
* commit '4c4b1d65ff65ec2a6b45047ff24284989dbeb8b7':
  Fix build due to bad javadoc link.
 2014-04-04 02:00:34 +00:00
Craig Mautner
4c4b1d65ff Merge "Fix build due to bad javadoc link." 2014-04-04 01:57:47 +00:00
Craig Mautner
529a43f719 Fix build due to bad javadoc link. 
Change-Id: I83ca32611fb72b79be271dc3a5bd848934e9174f
 2014-04-03 18:54:52 -07:00
Craig Mautner
54d5483c28 am eb6387c1: Merge "Add the persistable attribute for Activities" 
* commit 'eb6387c16149e4d84dcb15427bb7ca8d0495554d':
  Add the persistable attribute for Activities
 2014-04-03 20:56:20 +00:00
Dianne Hackborn
d21310ae0f am 5d5902d1: Merge "Don\'t allow -1 uids for wake locks." 
* commit '5d5902d140040936fa6aa7e443220140af0e9843':
  Don't allow -1 uids for wake locks.
 2014-04-03 20:56:17 +00:00
Craig Mautner
eb6387c161 Merge "Add the persistable attribute for Activities" 2014-04-03 20:51:22 +00:00
Dianne Hackborn
5d5902d140 Merge "Don't allow -1 uids for wake locks." 2014-04-03 20:49:57 +00:00
Craig Mautner
a6066bb7a4 am 35fc6a02: Merge "Implement setActivityLabelAndIcon()." 
* commit '35fc6a02aeded9578375af5828e14043164028d5':
  Implement setActivityLabelAndIcon().
 2014-04-03 20:43:44 +00:00
Craig Mautner
35fc6a02ae Merge "Implement setActivityLabelAndIcon()." 2014-04-03 20:37:29 +00:00
Dianne Hackborn
ef640cdfb2 Don't allow -1 uids for wake locks. 
Change-Id: Ia1b412a166f69247be3b047138349e7b4031bd7d
 2014-04-03 11:20:15 -07:00
Craig Mautner
4cfa8dc77a Add the persistable attribute for Activities 
This is used for documents to allow them to be persisted across
reboots.

Fixes bug 13735406.

Change-Id: I5655ac99589d58ed5716429cf7a1ffeee677aee1
 2014-04-03 10:40:43 -07:00
Chris Craik
a66a735dc6 am ef4c0c9f: Merge "Move most TransformationInfo properties to RenderNode" 
* commit 'ef4c0c9fd5db395b2eea0a246b93bce9cc9e859a':
  Move most TransformationInfo properties to RenderNode
 2014-04-03 17:20:10 +00:00
Chris Craik
ef4c0c9fd5 Merge "Move most TransformationInfo properties to RenderNode" 2014-04-03 17:14:53 +00:00
Raph Levien
89bebfc7c7 am 537be409: am c333381b: am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements" 
* commit '537be409f281d4a872cbcebb6ac3a4d767ded4da':
  Marquee text RTL improvements
 2014-04-03 17:13:12 +00:00
Raph Levien
537be409f2 am c333381b: am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements" 
* commit 'c333381b4c1b46f13f75388099cafb740844c497':
  Marquee text RTL improvements
 2014-04-03 17:09:26 +00:00
Raph Levien
c333381b4c am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements" 
* commit '24a2f20fe64e893e28dc70b288e12567ff71019f':
  Marquee text RTL improvements
 2014-04-03 16:02:39 +00:00
Raph Levien
c420ce34ba Merge "Marquee text RTL improvements" 2014-04-03 15:50:29 +00:00
Ben Murdoch
55da62288d am 14424043: am 369a0057: Merge "Update ViewRootImpl for 64bit functor type." 
* commit '14424043b9c20edf639004e05fe8e9264a2e66f5':
  Update ViewRootImpl for 64bit functor type.
 2014-04-03 10:00:25 +00:00
Ben Murdoch
369a00574d Merge "Update ViewRootImpl for 64bit functor type." 2014-04-03 09:48:43 +00:00
Jeff Brown
05956ac302 am 10a5ec23: am c2cebee6: am 8db6d9af: Merge "Clean up certain state transitions in DreamService." into klp-modular-dev 
* commit '10a5ec230f41fcfba7bdd0acb32f7bb113eba3da':
  Clean up certain state transitions in DreamService.
 2014-04-03 08:41:20 +00:00
Jeff Brown
10a5ec230f am c2cebee6: am 8db6d9af: Merge "Clean up certain state transitions in DreamService." into klp-modular-dev 
* commit 'c2cebee67a2dafe850e39b2ae3bc8b2f44426901':
  Clean up certain state transitions in DreamService.
 2014-04-03 08:31:33 +00:00
Jeff Brown
c2cebee67a am 8db6d9af: Merge "Clean up certain state transitions in DreamService." into klp-modular-dev 
* commit '8db6d9af58b9b81dbd764acd3f6a379afb539bf6':
  Clean up certain state transitions in DreamService.
 2014-04-03 03:25:02 +00:00
Jeff Brown
8db6d9af58 Merge "Clean up certain state transitions in DreamService." into klp-modular-dev 2014-04-03 03:20:01 +00:00
Jeff Brown
344812d2f3 Clean up certain state transitions in DreamService. 
Instead of posting onDreamingStarted() to a handler from attach(), do
the work immediately.  This ensures that the dream is actually in the
expected state when the callback runs.  Previously it was possible
for the callback to run after detach() occurred which could cause
exceptions and unexpected behavior.  As it happens, there's no need
to post this callback since attach() already runs on the UI thread.

Handle certain races involving the window token lifecycle a little
better.  When the dream manager shuts down a dream, it removes the
window token.  This can happen before the dream completes its attach()
phase in which case a BadTokenException is thrown.  We now handle this
exception and abort the dream in anticipation of receiving a request
to finish it immediately.

Add a safeguard to getDozeHardware() to handle the case where it
might inadvertently be called at the wrong point in the lifecycle.

Bug: 13475612
Bug: 13760290
Change-Id: I9bc9c154370d08d7727b568d398c460a38592099
 2014-04-02 20:17:32 -07:00
Alan Viverette
031c49ff1c am aa11084c: Merge "Fix dialog style, selectable item bg pinning, and pressed state" 
* commit 'aa11084c3ba1bf166febce53ccb9852f72f2a4a5':
  Fix dialog style, selectable item bg pinning, and pressed state
 2014-04-03 02:38:22 +00:00
Alan Viverette
aa11084c3b Merge "Fix dialog style, selectable item bg pinning, and pressed state" 2014-04-03 02:33:02 +00:00
Alan Viverette
45dc35b3c9 Fix dialog style, selectable item bg pinning, and pressed state 
BUG: 13746931
Change-Id: I31c2959f3e773a3aeb66ba5842d8d6fbb288acc1
 2014-04-02 19:32:15 -07:00