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

7179 Commits

Author SHA1 Message Date
Jeff Brown
b530aeb0fe resolved conflicts for merge of f0b9ee96 to master 
Change-Id: I1b347e895049474e11076c60074dc5918cfe1405
 2013-11-11 16:10:53 -08:00
Jeff Brown
7117c0c184 am 40c81e4a: am 3105b6d2: am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev 
* commit '40c81e4a5d96f8a3853045b289f6131c44d3155d':
  Make quick settings show the standard media router icon.
 2013-11-11 15:23:40 -08:00
Jeff Sharkey
874dfd733a am 34163e82: am 55d12486: Merge "Give storage provider access to secondary devices." into klp-dev 
* commit '34163e8259db8661afbb267e3b899b64f429bcb7':
  Give storage provider access to secondary devices.
 2013-11-11 15:22:37 -08:00
Jeff Sharkey
34163e8259 am 55d12486: Merge "Give storage provider access to secondary devices." into klp-dev 
* commit '55d12486df5e801dc8e74d96abdf87a250bc0ba1':
  Give storage provider access to secondary devices.
 2013-11-11 15:19:44 -08:00
Jeff Sharkey
55d12486df Merge "Give storage provider access to secondary devices." into klp-dev 2013-11-11 23:16:38 +00:00
Baligh Uddin
c2c5689da5 Merge "Import translations. DO NOT MERGE" 2013-11-11 22:39:44 +00:00
Baligh Uddin
840587b309 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-11 22:39:35 +00:00
Baligh Uddin
0914c0a20c Merge "Import translations. DO NOT MERGE" 2013-11-11 22:39:10 +00:00
Jeff Sharkey
7e1f5410ff Give storage provider access to secondary devices. 
Bug: 11411460
Change-Id: I3827ed5b859a68c60742a27917459e8df2c276bb
 2013-11-11 14:36:33 -08:00
Baligh Uddin
e5347dfffa Import translations. DO NOT MERGE 
Change-Id: Ie6cacaae8072f3d4ed70b5f1459f8084b49a526c
Auto-generated-cl: translation import
 2013-11-11 08:59:18 -08:00
Baligh Uddin
e7e1a20e02 Import translations. DO NOT MERGE 
Change-Id: I78f1c240c242ca7f9b4e52503e65a991460de62e
Auto-generated-cl: translation import
 2013-11-11 08:56:43 -08:00
Baligh Uddin
de0bb5a097 Import translations. DO NOT MERGE 
Change-Id: I44ee60eb6a5bf5ec7099461ecf11930436a1fc05
Auto-generated-cl: translation import
 2013-11-11 08:12:59 -08:00
Baligh Uddin
9c530e1855 Import translations. DO NOT MERGE 
Change-Id: I75eb5e47f9851174f7bd7e8301537bf7c94a8b5a
Auto-generated-cl: translation import
 2013-11-11 08:11:33 -08:00
Baligh Uddin
ed822f8a39 Import translations. DO NOT MERGE 
Change-Id: I79945322799c86169e725cb3c67be0b8046f55fe
Auto-generated-cl: translation import
 2013-11-11 08:10:44 -08:00
Jeff Brown
f0b9ee9637 am 5773f724: am dd4f9e8b: Merge "Update the media router dialogs and integrate into system UI." into klp-dev 
* commit '5773f72457246e437c24624cda8ec2a869165ee8':
  Update the media router dialogs and integrate into system UI.
 2013-11-10 22:04:54 -08:00
Jeff Brown
40c81e4a5d am 3105b6d2: am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev 
* commit '3105b6d2f192fc25f57911ef7bafbd62bae5b7e3':
  Make quick settings show the standard media router icon.
 2013-11-10 22:04:51 -08:00
Jeff Brown
5773f72457 am dd4f9e8b: Merge "Update the media router dialogs and integrate into system UI." into klp-dev 
* commit 'dd4f9e8b61c0a5639aa82480b7fdd760a2ed609c':
  Update the media router dialogs and integrate into system UI.
 2013-11-10 22:02:23 -08:00
Jeff Brown
3105b6d2f1 am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev 
* commit '12c32b4d484cc7cc2278a76c6e0fc2304a74b593':
  Make quick settings show the standard media router icon.
 2013-11-10 22:02:20 -08:00
Jeff Brown
0abd3a6ce8 Update the media router dialogs and integrate into system UI. 
Port the new style UI back into the framework from the support library.
There are now two dialogs: a chooser and a controller.  We use the
same dialogs for selecting routes within app and within quick settings.

Note that the new UI does not support any grouping features since they
are deprecated and unused.

Bug: 11257292
Change-Id: I64e936a18d25ab75f0c470cbc1e7085f67004863
 2013-11-10 14:39:19 -08:00
Jeff Brown
e2126baf72 Make quick settings show the standard media router icon. 
Fixed a bug in ImageView where we failed to inform a newly updated
Drawable about the visibility state.  This caused AnimationDrawables
to not animate when attached to an existing ImageView *unless* that
ImageView happened to be attached to the window *later* or have
its visibility toggled for some other reason.

Bug: 11257292
Change-Id: Iba9e0db5ba0db2b022950aec0c6f60a435da8ad2
 2013-11-09 18:59:46 -08:00
Jim Miller
a6754bb884 am 7aa535a8: am 01edb226: am ed7376fc: Merge "Restore permission check in keyguard." into klp-dev 
* commit '7aa535a8633ec93426381c68dc061cd951ab5832':
  Restore permission check in keyguard.
 2013-11-08 16:31:11 -08:00
Jim Miller
7aa535a863 am 01edb226: am ed7376fc: Merge "Restore permission check in keyguard." into klp-dev 
* commit '01edb22617a96502dfb5297eff1cdf5f265299e2':
  Restore permission check in keyguard.
 2013-11-08 16:27:38 -08:00
Jim Miller
01edb22617 am ed7376fc: Merge "Restore permission check in keyguard." into klp-dev 
* commit 'ed7376fc4829e93f5f2d3037633a37d652a13a7c':
  Restore permission check in keyguard.
 2013-11-08 16:25:06 -08:00
Jim Miller
ed7376fc48 Merge "Restore permission check in keyguard." into klp-dev 2013-11-09 00:22:08 +00:00
John Spurlock
4cccc47ce5 am 73d15db0: am 575d07ed: am 105b9b05: Merge "Avoid unnecessary ticker animation if already visible." into klp-dev 
* commit '73d15db0f03cadbb54bf13400218191fb009a8d4':
  Avoid unnecessary ticker animation if already visible.
 2013-11-08 16:03:49 -08:00
John Spurlock
73d15db0f0 am 575d07ed: am 105b9b05: Merge "Avoid unnecessary ticker animation if already visible." into klp-dev 
* commit '575d07ed54514958caf80d64e0503c55abdf2577':
  Avoid unnecessary ticker animation if already visible.
 2013-11-08 15:05:32 -08:00
John Spurlock
575d07ed54 am 105b9b05: Merge "Avoid unnecessary ticker animation if already visible." into klp-dev 
* commit '105b9b05041ea6f1109d961d548f3dde2bd69501':
  Avoid unnecessary ticker animation if already visible.
 2013-11-08 15:02:35 -08:00
John Spurlock
105b9b0504 Merge "Avoid unnecessary ticker animation if already visible." into klp-dev 2013-11-08 23:00:31 +00:00
Jim Miller
505329b21b Restore permission check in keyguard. 
Fixes bug 11584685

Change-Id: I80621f5608505bdc365930e0276c297c0d5bff67
 2013-11-08 14:08:10 -08:00
John Spurlock
26a08ac51a Avoid unnecessary ticker animation if already visible. 
When ticker disabled (e.g. on lockscreen) we should avoid
animating on halt if already halted.

Bug:11033324
Change-Id: Id2927d66492a128928b80ff98dc9182209be0652
 2013-11-08 17:00:05 -05:00
Jim Miller
ed1cfc45b1 am c9fd186b: am 44ee0fb1: am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev 
* commit 'c9fd186b4692e2da63698f15be59abcd360e321c':
  Delay tearing down external displays until keyguard finishes
  Show keyguard scrim on external displays while keyguard showing
 2013-11-08 11:38:12 -08:00
Jim Miller
c9fd186b46 am 44ee0fb1: am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev 
* commit '44ee0fb144947206713e6527a5227fd44e2d4e1e':
  Delay tearing down external displays until keyguard finishes
  Show keyguard scrim on external displays while keyguard showing
 2013-11-08 11:35:18 -08:00
Jim Miller
44ee0fb144 am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev 
* commit 'c55edb266f96364277b4a3552295c94363d847fb':
  Delay tearing down external displays until keyguard finishes
  Show keyguard scrim on external displays while keyguard showing
 2013-11-08 11:01:57 -08:00
Jeff Brown
ae9bf8dd42 resolved conflicts for merge of 6a1a2f9b to master 
Change-Id: Ie204a484b9b989a66423b756bb4743d7018c0884
 2013-11-07 21:25:26 -08:00
Jim Miller
0b9d8accc5 Delay tearing down external displays until keyguard finishes 
This waits until the keyguard window is actually removed before turning
off external presentations to avoid flashing the user's password.

Fixes bug 11562369

Change-Id: I74bfc0d5e23dccc5a8628abfe02868c71c371f6e
 2013-11-07 19:15:49 -08:00
Jim Miller
3192148fb4 Show keyguard scrim on external displays while keyguard showing 
Fixes bug 11562369

Change-Id: I577f9d3683e62689954b4640601b3f360b78cb31
 2013-11-07 18:44:56 -08:00
Jeff Brown
6a1a2f9b88 am 7938feef: am 52277428: Merge "Integrate remote display providers into Quick Settings." into klp-dev 
* commit '7938feef5abd003bf54efa4f862f995856305e44':
  Integrate remote display providers into Quick Settings.
 2013-11-07 17:44:17 -08:00
Jeff Brown
7938feef5a am 52277428: Merge "Integrate remote display providers into Quick Settings." into klp-dev 
* commit '52277428d54cc71f0cde3f1efa035f1e6742b900':
  Integrate remote display providers into Quick Settings.
 2013-11-07 17:41:48 -08:00
Jeff Brown
52277428d5 Merge "Integrate remote display providers into Quick Settings." into klp-dev 2013-11-08 01:37:03 +00:00
Jim Miller
55565a493f am eaacc7c1: am bb78ae9e: am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev 
* commit 'eaacc7c1ba4ff00bac36f5fbfd7269b04eb77cae':
  Fix scrubbing behavior on keyguard music transport
 2013-11-07 16:13:13 -08:00
Jeff Brown
635e915296 Integrate remote display providers into Quick Settings. 
This is a first pass at integrating new remote display functionality
into Quick Settings.  The Wireless Display card which previously
only supported Wifi Display is reimplemented to use the media router
to enumerate available remote display routes.  This ensures that the
user is presented with a consistent state regarding the currently
selected display route.

In this patch, the Wireless Display card still launches the old
Settings preference page for Wifi Display when clicked.  This will be
addressed in future patches.

As part of this change, it was necessary to derive some new lifecycle
information regarding the visibility of the Quick Settings model.
When Quick Settings is shown, an onPrepare event is delivered to
give the model a chance to update its state.  Likewise when Quick
Settings is hidden, an onUnprepare event is delivered.

These events allow the system to determine precisely when remote
display discovery is required to update the UI so as not to waste
power performing discovery in the background all of the time.

Bug: 11257292
Change-Id: Id802aa0983b625aeb972b5d123e4cc080dd6705f
 2013-11-07 16:07:18 -08:00
Jim Miller
eaacc7c1ba am bb78ae9e: am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev 
* commit 'bb78ae9eedce1136410be326274b5304e8e046dc':
  Fix scrubbing behavior on keyguard music transport
 2013-11-07 14:57:16 -08:00
Jim Miller
bb78ae9eed am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev 
* commit '8cba0d0b21db0fc4f9006403d6706e5893582dc8':
  Fix scrubbing behavior on keyguard music transport
 2013-11-07 14:54:37 -08:00
Jim Miller
8cba0d0b21 Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev 2013-11-07 22:52:57 +00:00
Baligh Uddin
2d55e61bb9 Merge "Import translations. DO NOT MERGE" 2013-11-07 03:55:27 +00:00
Baligh Uddin
5be3186bac Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-07 03:55:19 +00:00
Baligh Uddin
a91256a7d2 Merge "Import translations. DO NOT MERGE" 2013-11-07 03:55:12 +00:00
Jim Miller
e85d20a32e am a7756cbc: am b8aba3f4: am b892ac68: Merge "Fix glitch with switching users from QuickSettings" into klp-dev 
* commit 'a7756cbc62d19bef22c99990043621086f731b25':
  Fix glitch with switching users from QuickSettings
 2013-11-06 19:22:10 -08:00
Jim Miller
a7756cbc62 am b8aba3f4: am b892ac68: Merge "Fix glitch with switching users from QuickSettings" into klp-dev 
* commit 'b8aba3f4df3962ea6b11806aff4479f0b61eae0f':
  Fix glitch with switching users from QuickSettings
 2013-11-06 19:20:13 -08:00
Jim Miller
b8aba3f4df am b892ac68: Merge "Fix glitch with switching users from QuickSettings" into klp-dev 
* commit 'b892ac680b045daca2926037955857889d32e1c0':
  Fix glitch with switching users from QuickSettings
 2013-11-06 19:16:59 -08:00