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

139207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
d3bafe826b Merge "Hide the (obsolescent) android.app.maintenance APIs" into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Christopher Tate
863d8af75a Hide the (obsolescent) android.app.maintenance APIs 
Bug 14994893

Change-Id: If3c06de006504e81c37eb6b716d613e5124d28bc
 2014-06-10 18:20:24 -07:00
Deepanshu Gupta
096e639d3d Merge "LayoutLib: Support more ContextThemeWrappers" into lmp-preview-dev 2014-06-10 22:06:31 +00:00
Deepanshu Gupta
b54b78e215 LayoutLib: Support more ContextThemeWrappers 
ContextThemeWrapper may be the base context for another
ContextThemeWrapper. We now extract the base context till we reach the
final context.

Change-Id: I034444a2d1579241543fd24248530b299e72498a
 2014-06-10 17:44:37 -07:00
John Spurlock
7baacb177b Merge "Heads-up notifications for low battery warnings." into lmp-preview-dev 2014-06-10 21:44:22 +00:00
John Spurlock
3332ba54ae Heads-up notifications for low battery warnings. 
Falls back to dialogs when heads-up are N/A.

Add new ongoing notification if battery saver mode
is active.  Offer to start battery saver on warnings,
if not already started.

True up BatteryMeterView's levels to the latest threshold
levels.  15% for first warning.

Bug:13329308
Change-Id: Id8ad11a1997079ee7165ae003a8fa1c744462ab3
 2014-06-11 19:38:00 -04:00
Amith Yamasani
1d11436eae Merge "Undo some API changes that affect third party launcher writers" into lmp-preview-dev 2014-06-10 21:44:22 +00:00
Amith Yamasani
992fdbeff2 Undo some API changes that affect third party launcher writers 
Remove hidden interface methods that were added temporarily for
launcher compatibility. These cannot be implemented by third parties
if they're hidden from the SDK.

Bug: 15574383
Change-Id: I976256da4278b7077f8d357e971e8cadb4d2d686
 2014-06-12 13:37:43 -07:00
Adam Powell
55e33b03ab Merge "Fix incorrect dispatch of empty WindowInsets from ActionBarOverlayLayout" into lmp-preview-dev 2014-06-10 21:44:22 +00:00
Adam Powell
720924b6a9 Fix incorrect dispatch of empty WindowInsets from ActionBarOverlayLayout 
Fix a bug where ActionBarOverlayLayout was using a private constructor
of WindowInsets to return empty insets that should have been marked
fully consumed. This caused dispatch to further child views not to
stop appropriately, corrupting application layout in some cases.

Bug 15588587

Change-Id: I97fcefa4755addf2385a7e7b0ffbf6d3e91adc5c
 2014-06-12 14:53:10 -07:00
Selim Cinek
1c9c717f1b am f1187ac8: Merge "Added card elevation when card is clicked on the lockscreen" into lmp-preview-dev 
* commit 'f1187ac8e8d2c8927caf322a12de8c32ee3f919f':
  Added card elevation when card is clicked on the lockscreen
 2014-06-10 21:41:46 +00:00
Fabrice Di Meglio
fb522b6798 Merge "Fix Material Preference Framework layout" into lmp-preview-dev 2014-06-10 21:38:43 +00:00
Fabrice Di Meglio
eb05811a5f Fix Material Preference Framework layout 
- replace "left" with "start"

Change-Id: I02f3ce5ce98bab7eb9eb2f2928cd5eb8f6b155d2
 2014-06-11 14:18:00 -07:00
John Reck
e830c37a4a Merge "Fix DA bugs" 2014-06-10 21:38:43 +00:00
George Mount
168a212848 Merge "Add reasonable default activity transitions to theme.material.light." into lmp-preview-dev 2014-06-10 21:38:43 +00:00
George Mount
01cdce69e9 Add reasonable default activity transitions to theme.material.light. 
Bug 15583434

Change-Id: Ie4dd08a0392698d2e2794a82d50ad9a213658917
 2014-06-12 07:41:13 -07:00
Daniel Sandler
c776997e87 Clean up progress bars for media & other notifications. 
Bug: 15147533
Change-Id: Ib4905203c004232bd7d78fe9fa316aa5688eaaa2
 2014-06-11 13:18:59 +00:00
Jessica Hummel
542588e3ba Update documentation so it meets api requirements 
Change-Id: Ice52dc3d5ecca77f81d3df1b43179c94aece6fef
bug:15023443

Conflicts:
	api/current.txt
	core/java/android/app/admin/DeviceAdminReceiver.java
 2014-06-11 11:37:53 +01:00
Andrew Solovay
ded9c171ea Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 2014-06-10 21:32:31 +00:00
Florin Malita
cf6edd2b22 Merge "Pass full matrix + clip save flags to the native SkCanvas." 2014-06-10 21:32:31 +00:00
Przemyslaw Szczepaniak
d3919a318a Add missing copyright headers in speech.tts 
Change-Id: Icf1c3cf71ac45cb00606c8034af375e657c31ea5
 2014-06-12 12:39:46 +00:00
Robert Phillips
88b0078468 Merge "Update Picture documentation Enhanced comment" 2014-06-10 21:32:31 +00:00
John Spurlock
c830d8f3b1 Merge "SystemUI asset update." into lmp-preview-dev 2014-06-10 21:32:31 +00:00
John Spurlock
899f439a29 SystemUI asset update. 
- Updated location icons.
- Updated no-sim, plumb up to QS.
- Updated zen mode synthetic notification icon.
- Updated color inversion icons.

Change-Id: I4849fbe11683feab37160c3d23502b01035de66a
 2014-06-11 11:04:43 -04:00
justinzhang
800c103495 Hide status bars in lock task 
Call StatusBarManager to show/hide status bars for lock task.
(Same CL as https://googleplex-android-review.git.corp.google.com/#/c/461068/,
sorry for the confusion.)

Bug: 13669575
Change-Id: I5c90bdb1d868aa02d3679e854b5ccbe434d996d6
(cherry picked from commit cc2365ac9eae0393154c863a21286c9a95311e15)
 2014-06-11 14:53:28 +00:00
Dan Sandler
59c11b5dda Merge "NotificationListenerService: API updates" into lmp-preview-dev 2014-06-10 21:32:31 +00:00
Christoph Studer
d0694b6735 NotificationListenerService: API updates 
Introduce RankingMap holding single notification Rankings
indexed by SBN keys.

Also, pass RankingMap with notification event callbacks so
subclasses don't have to call getCurrentRanking() unnecessarily.

Bug: 15415840
Change-Id: Id41e174f00c06c86359c03646abc3db78028b324
 2014-06-11 18:27:18 +02:00
John Spurlock
0c377a9024 Merge "PowerUI: dismiss warning notifications when falling back." into lmp-preview-dev 2014-06-10 21:32:31 +00:00
John Spurlock
eb44a7de47 PowerUI: dismiss warning notifications when falling back. 
The full-screen intents simply fire broadcasts to open fallback
dialogs.  This means the warning notifications are left visible
under the dialog on the lockscreen, or after the dialog is
quickly dismissed.

Once we launch the fallback dialogs, there is no reason for the
notification form to exist.

Bug:13329308
Change-Id: I5735c65d7e8eb620493d3ef3a2cfc27f75cecbb5
 2014-06-12 13:00:55 -04:00
John Spurlock
8e2c4da2c1 Merge "PowerUI: Remove obsolete workaround." into lmp-preview-dev 2014-06-10 21:32:31 +00:00
John Spurlock
0bd2f266a5 PowerUI: Remove obsolete workaround. 
No longer need to cancel and repost notifications when
transitioning from/to heads-up.

Bug:15534198
Change-Id: I93e5433e51410c80c2e183976e0041ca1bfeb3c7
 2014-06-12 14:53:47 -04:00
John Spurlock
edbfd04060 Merge "Brightness slider no longer displays the automatic icon." into lmp-preview-dev 2014-06-10 21:32:31 +00:00
John Spurlock
6d20526adf Brightness slider no longer displays the automatic icon. 
Bug:15414855
Change-Id: I3a1b8e7758e41abd172c20177f42452077bfc7a7
 2014-06-10 19:28:03 -04:00
Julia Reynolds
1b8aef2be7 Merge "Material-ize the restrictions pin challenge." 2014-06-10 21:32:31 +00:00
Adrian Roos
e74b853d9f resolved conflict for merge of 3ca33b70 to master 
Change-Id: I5226015ca7cef030586349cc698a46e458ac788e
 2014-06-11 15:02:55 +02:00
Jorim Jaggi
e6cad8027c am 5eb62efd: Merge "Do not override mColor with default color if none set" into lmp-preview-dev 
* commit '5eb62efd935399335ee2504a483900c69a45494a':
  Do not override mColor with default color if none set
 2014-06-11 12:41:45 +00:00
Jorim Jaggi
1a8e848dc4 Merge "Fix blank lockscreen." into lmp-preview-dev 2014-06-10 21:32:31 +00:00
Jorim Jaggi
0a27be899c Fix blank lockscreen. 
Bug: 15281241
Change-Id: If315891274a97fa5cc579554b83b85cf3c87f0fb
 2014-06-11 15:45:22 +02:00
Chris Wren
b6f4ba7a92 Merge "Only post interrupting notifications to the Heads Up." into lmp-preview-dev 2014-06-10 21:38:43 +00:00
George Mount
a035b56271 Merge "DO NOT MERGE Allow enter activity transitions to be delayed until data is ready." into lmp-preview-dev 2014-06-10 21:44:22 +00:00
George Mount
28a8d10805 DO NOT MERGE Allow enter activity transitions to be delayed until data is ready. 
Bug 15539194

Change-Id: I8de9806b0bcdf8129eb3b5a555a2433f0c7be634
 2014-06-10 17:06:34 -07:00
Jorim Jaggi
44f8d455fe Merge "Improve unlock motion." into lmp-preview-dev 2014-06-10 21:31:35 +00:00
Jorim Jaggi
fd9d4414e8 Improve unlock motion. 
Bug: 15244051
Change-Id: Ib33a7a8e27a2dc191c6e18ffe1cd2725dfa3bb37
 2014-06-12 06:08:12 +02:00
Jorim Jaggi
c746e1f6fd Merge "Material navigation bar." into lmp-preview-dev 2014-06-10 21:31:35 +00:00
Dan Sandler
bd7f105022 Material navigation bar. 
Bug: 15567777
Change-Id: I248eddca0e75df6ebf421913f12bfa488bb860ec
 2014-06-11 22:02:26 -04:00
Robin Lee
44eb1b0189 Merge "More meaningful errors for DPM calls by non-owners" 2014-06-10 21:31:35 +00:00
Jae Seo
cf5085bd49 Merge "Add channel types for NTSC, PAL and SECAM" 2014-06-12 05:34:42 +00:00
Jae Seo
3a0f19980d Add channel types for NTSC, PAL and SECAM 
Bug: 14451655, Bug: 15321686
Change-Id: I2618fb79a4b20898c95cea22154379738710da44
 2014-06-11 18:25:11 -07:00
vandwalle
f980c53f86 reset counters when disconnecting 
Change-Id: If19d97d481a93343cf9792ff77bf9926ae5c26a7
 2014-06-11 17:21:22 -07:00
Elliott Hughes
f4c6a154e9 am b9525871: am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface." 
* commit 'b952587184572070805243e6f8380ceb769f441c':
  Switch to a type-safe album art interface.
 2014-06-12 00:15:38 +00:00