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

13083 Commits

Author SHA1 Message Date
John Spurlock
f1832e2444 am 64e034e3: am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev 
* commit '64e034e351ad73b9cb99cb04511d0fea137c7a3b':
  Zen: Improve zen mode panel condition selection.
 2014-12-01 19:46:50 +00:00
John Spurlock
53da315f1d am c1e4d155: am 1a3af711: Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev 
* commit 'c1e4d1554f23db7f0de91a212d94a1b624dec64d':
  Doze: Break out proxcheck stats by pulse reason.
 2014-12-01 19:46:44 +00:00
John Spurlock
edd0d0ea98 am fdc07dce: am 26a695d9: Merge "Volume: Update remote volume icons." into lmp-mr1-dev 
* commit 'fdc07dce372e94b274b725ba571c2ad4979565da':
  Volume: Update remote volume icons.
 2014-12-01 19:46:38 +00:00
Adrian Roos
588d8e46df am 17e0a7e7: am 09eeab7c: Merge "Fix projection permission dialog layering" into lmp-mr1-dev 
* commit '17e0a7e7ac289deacff01c84591dae4009f86415':
  Fix projection permission dialog layering
 2014-12-01 19:33:21 +00:00
John Spurlock
64e034e351 am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev 
* commit 'e3f8b31466f45eb4d5c9971049b71215a9f2c8a4':
  Zen: Improve zen mode panel condition selection.
 2014-12-01 15:04:02 +00:00
John Spurlock
c1e4d1554f am 1a3af711: Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev 
* commit '1a3af711ab6f811a6bc4e9211cb255721fb1847d':
  Doze: Break out proxcheck stats by pulse reason.
 2014-12-01 15:03:57 +00:00
John Spurlock
fdc07dce37 am 26a695d9: Merge "Volume: Update remote volume icons." into lmp-mr1-dev 
* commit '26a695d974f7ee3b32b8d65a44a42f804af8f01c':
  Volume: Update remote volume icons.
 2014-12-01 15:03:52 +00:00
John Spurlock
e3f8b31466 Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev 2014-12-01 14:59:05 +00:00
John Spurlock
1a3af711ab Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev 2014-12-01 14:58:38 +00:00
John Spurlock
26a695d974 Merge "Volume: Update remote volume icons." into lmp-mr1-dev 2014-12-01 14:58:18 +00:00
Geoff Mendal
a990faec87 Import translations. DO NOT MERGE 
Change-Id: I372891f089f72f814e92a63ac7f78a25cee9ebbf
Auto-generated-cl: translation import
 2014-12-01 06:40:31 -08:00
Geoff Mendal
9cde3e1d82 Import translations. DO NOT MERGE 
Change-Id: I2cb5a0bf876f8553710f0ed3882f7ef56da24557
Auto-generated-cl: translation import
 2014-12-01 06:36:32 -08:00
John Spurlock
3e07701636 Zen: Improve zen mode panel condition selection. 
- Decouple condition requests from expansion, now
   pre-request when zen panel unhidden.
 - Animate zen mode panel expansion.
 - Improve default selection logic, ensure something
   is selected as soon as we are in the expanded state.
 - Tweak visual spacing.
 - Map null condition to Indef properly when we start
   out in zen.
 - Avoid unnecessary condition teardown when the conditions
   are updated but unchanged from current.
 - Cap number of optional conditions to display, default=3.

Bug: 18335618

Change-Id: I007b7c3b2e75e2b42805af240684aa8581e9951a
 2014-11-30 10:41:33 -05:00
John Spurlock
eab28e6602 Doze: Break out proxcheck stats by pulse reason. 
Enumerate all possible reasons for doze pulses, and subdivide
the proxcheck stats (near/far) by reason.  Include reason in
doze log when starting a pulse.

Bug: 18373928
Change-Id: I4ebc2df082f51d47e3b2f0cb3999faeb582ef8dc
 2014-11-29 11:45:31 -05:00
Adrian Roos
17e0a7e7ac am 09eeab7c: Merge "Fix projection permission dialog layering" into lmp-mr1-dev 
* commit '09eeab7cbffae64add657f1a1e7ab6c7f20b6d9b':
  Fix projection permission dialog layering
 2014-11-27 13:06:00 +00:00
Adrian Roos
09eeab7cbf Merge "Fix projection permission dialog layering" into lmp-mr1-dev 2014-11-27 13:01:01 +00:00
Jeff Davidson
f01fac9965 am c452bac6: am 3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev 
* commit 'c452bac6fc100bf30d4ddde5b4e008dd862750e5':
  Add string for "Connected via Wi-Fi assistant".
 2014-11-26 23:52:56 +00:00
Jeff Davidson
c452bac6fc am 3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev 
* commit '3caf0f8e440fcc9947b8b153464ccdbc62640c97':
  Add string for "Connected via Wi-Fi assistant".
 2014-11-26 23:46:44 +00:00
Jeff Davidson
3caf0f8e44 Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev 2014-11-26 23:42:54 +00:00
Jeff Davidson
6903a1a40f Add string for "Connected via Wi-Fi assistant". 
Bug: 18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
 2014-11-26 15:38:45 -08:00
John Spurlock
b20cdd3b6b am 4a0e40a7: am f17f04a5: Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev 
* commit '4a0e40a76431cc4ea0c052ea9106616593c1a3de':
  Volume: Avoid making bad forceVolumeControlStream call.
 2014-11-26 18:45:10 +00:00
Jeff Davidson
480580775e am e5454d57: am f8a3b8e0: Merge "Fix WifiTile\'s Connected indicator for ephemeral networks." into lmp-mr1-dev 
* commit 'e5454d5733a4216a5ad0efb158fe090b19faddf1':
  Fix WifiTile's Connected indicator for ephemeral networks.
 2014-11-26 18:44:46 +00:00
Jorim Jaggi
199d621c5f am f1b05619: am 95e89cae: Fix jank when pin/pattern is shown 
* commit 'f1b05619cc44b039721110955695fa261f1746da':
  Fix jank when pin/pattern is shown
 2014-11-26 18:43:52 +00:00
Jorim Jaggi
f1e6d2315e am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev 
* commit 'c5c2e53779c2c2b6d889bdad5d11d47da9e72789':
  Make IKeyguardService interface asynchronous
 2014-11-26 18:43:47 +00:00
Paul Jensen
f19f90b229 am 58a493ac: am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev 
* commit '58a493accfeafa13fd77a16e832c5ad72a4c9006':
  Don't let NetworkMonitor state stop user-initiated transitions.
 2014-11-26 18:43:29 +00:00
Alan Viverette
ed79856db2 am 30c0d5b5: am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev 
* commit '30c0d5b5eadecf5ba3c9ee536f153adc4c8c8723':
  Load SPEAK_PASSWORD from currently active user rather than self
 2014-11-26 18:41:35 +00:00
Adrian Roos
752aee8a6f Fix projection permission dialog layering 
Bug: 18392920
Change-Id: I32c2c61339cbea9edd4a7a3f80365213fb4a69ac
 2014-11-26 18:09:35 +01:00
John Spurlock
cfe9fb6794 Volume: Update remote volume icons. 
Remove last holo references by using the new-style cast connected
icon.  There is only one icon for the remote stream, since
it is never muted by policy.

Bug: 18102850
Change-Id: Iffe3a19deca6599780ebdb26869ae46aa8623f81
 2014-11-26 11:37:00 -05:00
John Spurlock
4a0e40a764 am f17f04a5: Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev 
* commit 'f17f04a51e1e0b7f16d7c53015d0a66059b80cd3':
  Volume: Avoid making bad forceVolumeControlStream call.
 2014-11-26 16:35:53 +00:00
John Spurlock
f17f04a51e Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev 2014-11-26 16:32:38 +00:00
Jeff Davidson
e5454d5733 am f8a3b8e0: Merge "Fix WifiTile\'s Connected indicator for ephemeral networks." into lmp-mr1-dev 
* commit 'f8a3b8e008c1214afb3de99a7bccb08aa8f86796':
  Fix WifiTile's Connected indicator for ephemeral networks.
 2014-11-26 16:00:03 +00:00
Jeff Davidson
f8a3b8e008 Merge "Fix WifiTile's Connected indicator for ephemeral networks." into lmp-mr1-dev 2014-11-26 15:54:25 +00:00
John Spurlock
e506c85eaa Volume: Avoid making bad forceVolumeControlStream call. 
Ensure we don't call audio manager with STREAM_MASTER, which is
a pseudo-stream value internal to volume panel.

Bug: 18250921
Change-Id: I4b6af9fc60d7683e9103be52cc937c33c1c15e31
 2014-11-26 10:11:19 -05:00
Geoff Mendal
cb3a6f89f1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-26 15:10:41 +00:00
Geoff Mendal
38499cf8a1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-26 15:08:47 +00:00
Geoff Mendal
014aba26ed Import translations. DO NOT MERGE 
Change-Id: I1c487be2ef6c76224feae69f285a18ef0eda4840
Auto-generated-cl: translation import
 2014-11-26 07:03:09 -08:00
Geoff Mendal
b82f42a139 Import translations. DO NOT MERGE 
Change-Id: I885436b95251805a80c4a6edf308448d5ed43ca3
Auto-generated-cl: translation import
 2014-11-26 06:56:43 -08:00
Jorim Jaggi
f1b05619cc am 95e89cae: Fix jank when pin/pattern is shown 
* commit '95e89caeb252a54807c76d60c7440766829e418c':
  Fix jank when pin/pattern is shown
 2014-11-26 14:49:56 +00:00
Jorim Jaggi
c5c2e53779 Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev 2014-11-26 14:48:47 +00:00
Geoff Mendal
57086523d5 Import translations. DO NOT MERGE 
Change-Id: Ic378d28436a78faca2428b60431714db6dc7a0f2
Auto-generated-cl: translation import
 2014-11-26 06:35:08 -08:00
Geoff Mendal
441d4f04d1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-26 14:32:45 +00:00
Geoff Mendal
92ed2ec015 Import translations. DO NOT MERGE 
Change-Id: Idfd2434481ce912e23afaaa7fb6bbef3dcad35f8
Auto-generated-cl: translation import
 2014-11-26 06:31:37 -08:00
Jorim Jaggi
d9b91d0d49 resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev 
Change-Id: I194616c947a3366911e932f4c7111097d3767db3
 2014-11-26 15:17:14 +01:00
Jorim Jaggi
95e89caeb2 Fix jank when pin/pattern is shown 
- Only update layout params of status bar window when needed
- Do not update security method all the time, only when needed (only
  when reset gets called)
- Check for actual used security method when updating states for
  bouncer

Bug: 18505838
Change-Id: Ib3d0021c0cc364fa5598e06e0a2bae059ae79cbe
 2014-11-26 14:07:49 +00:00
Jorim Jaggi
803a6dc080 Merge "Make IKeyguardService interface asynchronous" into lmp-mr1-dev 2014-11-26 14:07:21 +00:00
Paul Jensen
58a493accf am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev 
* commit 'be3736d38774210549deb2999bb226d83a29f1ee':
  Don't let NetworkMonitor state stop user-initiated transitions.
 2014-11-26 12:08:47 +00:00
Paul Jensen
be3736d387 Merge "Don't let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev 2014-11-26 12:05:01 +00:00
Jorim Jaggi
2f47df8334 am dccd3662: am c1de25d8: Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1-dev 
* commit 'dccd3662da356ed7b0beedc09c8a58103723b463':
  Animate notifs depending on touch when exiting doze mode
 2014-11-26 12:02:13 +00:00
John Spurlock
a2decb0e4d am f74ae93c: am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev 
* commit 'f74ae93cac3c78762fc87cdaa9edd6f86f2dbec8':
  VolumeZen: Introduce internal vs external ringer mode.
 2014-11-26 12:01:35 +00:00
Alan Viverette
30c0d5b5ea am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev 
* commit '8a45126a2986fd408dec7c531ee1cadb690aaffd':
  Load SPEAK_PASSWORD from currently active user rather than self
 2014-11-26 00:56:43 +00:00