Commit Graph

4970 Commits

Author SHA1 Message Date
Adrian Roos
7840685465 am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev
* commit 'e2cd84196e1266200f906b5d721640217fc2e6f9':
  Fix pattern lock for accessibility
2015-07-29 21:37:08 +00:00
Adrian Roos
e2cd84196e Merge "Fix pattern lock for accessibility" into mnc-dev 2015-07-29 21:23:25 +00:00
Adrian Roos
d2def94639 Fix pattern lock for accessibility
- remove the content description in Keyguard
- only show virtual views when pattern is in progress
- add a content description when the pattern is not in progress

Bug: 22646748
Change-Id: Id32a37c4c74c82b547cee8861b2856fa0a08c41c
2015-07-29 14:13:53 -07:00
Chris Wren
2eeb47c6a1 am 1bd310e1: Merge "import more metrics enums" into mnc-dev
* commit '1bd310e18c50d4fd81207a3e2fe61cc694ee7607':
  import more metrics enums
2015-07-29 15:18:33 +00:00
Chris Wren
1bd310e18c Merge "import more metrics enums" into mnc-dev 2015-07-29 14:57:15 +00:00
Adam Lesinski
9466fa27b1 am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit 'c96e6f19937ac36c8147a52863a43b35895aeb0b':
  BatteryStats: Use proper power calculator when energy data is received
2015-07-29 00:44:05 +00:00
Adam Lesinski
c96e6f1993 Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev 2015-07-29 00:34:38 +00:00
Adam Lesinski
c691d3ccf4 BatteryStats: Use proper power calculator when energy data is received
We check for the presence of energy data when determining whether to use
the WiFiPowerCalculator or WiFiPowerEstimator. Since we can receive this data
later, we need to switch to the WiFiPowerCalculator if we weren't using it before.

We can't ask the hardware if it supports energy data because that would involve a call into
WiFiManagerService, which can cause a deadlock if we are holding the BatteryStatsService lock
while using this class.

Bug:22776010
Change-Id: Id685d487c56595eab1d382f49da9417a423bb517
2015-07-28 17:11:29 -07:00
Jorim Jaggi
66c3fc3854 am 0d210f63: Animation for touch, wake and unlock
* commit '0d210f6395072db4a4c53d4cb8fac4a59a3965b4':
  Animation for touch, wake and unlock
2015-07-28 23:22:59 +00:00
Jorim Jaggi
0d210f6395 Animation for touch, wake and unlock
- Add callback to inform SysUI when the screen has been unblocked
and turned on.
- Cleanup inconsistent messaging about device interactive/screen on
and off.
- Add callbacks to inform SysUI about screen states
- Implement a quick fade for the scrim after touch, wake, and unlock.
  First, start with a black scrim on top of everything, and then fade
  it out.
- Make sure we play the normal unlock animation when device is pulsing
- Override navigation bar animations for touch, wake and unlock: Fade
  in the same manner as the scrim.

Bug: 22571198
Bug: 21855614
Change-Id: I8ff08d72cced1e0f03c78d71ff710d8a4f6b848c
2015-07-28 23:02:54 +00:00
Dianne Hackborn
8b679bfa36 am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '3551a59b277fd4dc924f48116c153a50fb0913eb':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
2015-07-28 19:58:52 +00:00
Dianne Hackborn
57dd737443 Work on issue #21516866: Implement voice interaction in ResolverActivity
The main change here is to not allow the dialog to go in to its "focus
on the last app the user selected" when running in voice interaction mode,
instead just always giving a simple list.

This also fixes some problems with cleaning up active commands when
an activity finishes and not forcing the current session to go away
when the screen is turned off.

Also added some debug help, having activity print the state of the
voice interactor.

Change-Id: Ifebee9c74d78398a730a280bb4970f47789dadf5
2015-07-28 12:52:11 -07:00
Chris Wren
de061b8175 import more metrics enums
sysui tuners
  inactive apps

Bug: 21114836
Change-Id: I43c4b97c6998374b39d7346bae1e1eca3d761543
2015-07-28 16:55:19 +00:00
Jorim Jaggi
d315926aec am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
* commit '9e49b5d679672ea4a64382f9a36663c73603961b':
  Move PIN/Pattern appear animation to RenderThread (1/2)
2015-07-27 19:22:02 +00:00
Jorim Jaggi
9e49b5d679 Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 2015-07-27 18:55:29 +00:00
Phil Burk
a37a1b006e am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev
* commit 'fef1b28917df9a23b28ec5e5e7f83097b8574550':
  MIDI: fix running status parser
2015-07-27 17:57:01 +00:00
Phil Burk
fef1b28917 Merge "MIDI: fix running status parser" into mnc-dev 2015-07-27 17:15:04 +00:00
Phil Burk
98e94aead7 MIDI: fix running status parser
Running status was being parsed incorrectly.
This could cause stuck notes or exceptions when sending running
status messages to a Bluetooth MIDI device.

Bug: 22689606
Change-Id: I9f7abce9758927be587eead9614617d5b0076353
Signed-off-by: Phil Burk <philburk@google.com>
2015-07-24 14:11:01 -07:00
Dianne Hackborn
da56bea428 am 4a368659: Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev
* commit '4a368659baf8f86b522a6b2679bb2b2a9fd0a997':
  Fix issue #22414729: Checkin start clock time is different from hsitory reset time
2015-07-23 18:59:08 +00:00
Adam Lesinski
cac798a918 am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev
* commit '6625047a3ba26ecc52bb2757eb7576027949e435':
  BatteryStats: Use English locale for dump and checkin data
2015-07-23 18:57:52 +00:00
Jason Monk
5669e4035d am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev
* commit '4fc1b707442451f4a826929fc7e72967d443c73f':
  Add metrics to tuner
  Move tuner enable point to QS
2015-07-23 18:56:53 +00:00
Dianne Hackborn
4a368659ba Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev 2015-07-23 00:56:19 +00:00
Dianne Hackborn
d48954fb6b Fix issue #22414729: Checkin start clock time is different from hsitory reset time
There was a mistake in the code that was supposed to recover from the
initial time on a new device being bad until the real time ultimately
gets set, which was causing us to update the start clock time every time
there was a time change (instead of just when the original start time
appears bad).

Rework all of this, so we now count the start time as bad if it is more
than one year before the current time, only modifying it in that case.
Also when modifying it, adjust the time we set it to take in to account
how much realtime has actually elapsed so far in the battery stats.

Change-Id: If74bd711d9b7618c8f6148a9935c452aaaa7e257
2015-07-22 17:26:32 -07:00
Jorim Jaggi
613f55fbbb Move PIN/Pattern appear animation to RenderThread (1/2)
Bug: 22205322
Change-Id: I253f20a397ab89cb78254338a0254619232d7300
2015-07-22 15:23:52 -07:00
Adam Lesinski
6625047a3b Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 2015-07-22 21:28:37 +00:00
Adam Lesinski
8a83c61497 BatteryStats: Use English locale for dump and checkin data
Dump and checkin data is read by tools that expect a consistent
locale.

Bug:22357316
Change-Id: I0d7e6e771c3512278efca7579fe9c4b79b560e28
2015-07-22 13:50:23 -07:00
Jorim Jaggi
3bda57a05f am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
* commit '20df62345910ad390a3bb321990987757db0831d':
  Add callback to voice interaction session for lockscreen shown
2015-07-22 20:17:14 +00:00
Jorim Jaggi
7840c0a071 am c1244a29: Merge "Touch, wake and unlock" into mnc-dev
* commit 'c1244a2995087c930842b7d5e5a35a446c5c40f7':
  Touch, wake and unlock
2015-07-22 20:16:55 +00:00
Jason Monk
a403159a3b Add metrics to tuner
Bug: 22462605
Change-Id: I075f9a25630a89e85dd17603297565988c38075b
2015-07-22 14:41:02 -04:00
Jorim Jaggi
20df623459 Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 2015-07-21 22:46:30 +00:00
Jorim Jaggi
c1244a2995 Merge "Touch, wake and unlock" into mnc-dev 2015-07-21 21:53:11 +00:00
Adam Lesinski
bbd86a4b2b am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
* commit '23e19066de2caf1db1fa0759ac49a1118b59f7a5':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
2015-07-21 19:41:06 +00:00
Jorim Jaggi
19695d9711 Add callback to voice interaction session for lockscreen shown
Bug: 22402726
Change-Id: Iaf83e2f2b0389d74b6ecf480aa91a34443803f7b
2015-07-21 12:35:16 -07:00
Adam Lesinski
23e19066de Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 2015-07-21 19:26:45 +00:00
Adam Lesinski
6856964444 BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
Previously we tried to read /d/wakeup_sources to gather kernel wakelock data. If that
fails we used the older sys file /proc/wakelocks.
N7 has both /proc/wakelocks and /d/wakeup_sources, but /proc/wakelocks
has the actual data we need. All other devices are using /d/wakeup_sources, so
only N7 experienced a loss of kernel wakelock data.

The original regression was introduced here: ag/659258

Bug:22556242
Change-Id: I51ec68e957f587bc1466e24f0a1dbc8cd7753ac6
2015-07-21 12:08:56 -07:00
Jorim Jaggi
478e762b46 am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev
* commit '8924f23d3ecdcb2b1ce4dbc9bb4fbb9ddfa62710':
  Fix SysUI crashes on svelte devices
2015-07-20 23:52:32 +00:00
Jorim Jaggi
740452e875 Touch, wake and unlock
- Add onFingerprintAcquired, so Keyguard can grab a wakelock to prevent
the device from sleeping.
- If we get a successful fingerprint, wake the device up, immediately
dismiss the keyguard and tell PWM that we kicked off our frame that
will represent the correct state.
- PWM then waits for this frame to be drawn, and then turns on the
screen, which results in unlocking directly to the previsouly
opened app.

Bug: 21855614
Change-Id: I5f43df17fa5e4e9c6a6392eef4a4590b07df4f96
2015-07-20 23:52:20 +00:00
Jorim Jaggi
e446dcee8f Fix SysUI crashes on svelte devices
Bug: 22602295
Change-Id: Idac0d62683c0f6f7cf7b795967632e34d771c4f7
2015-07-20 15:47:15 -07:00
Dianne Hackborn
86e56bb371 am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev
* commit '78ead58df03e476d656c7e875fff9ade13b727c1':
  Fix issue #22531747: Assist info should declare if user has disabled...
2015-07-20 20:04:26 +00:00
Dianne Hackborn
78ead58df0 Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 2015-07-20 19:50:50 +00:00
Dianne Hackborn
17f693520d Fix issue #22531747: Assist info should declare if user has disabled...
...context and/or screenshot

Added new API to find out what contextual data has been globally disabled.

Also updated various documentation to make it clear what kind of contextual
data you will get (and when it will be null).

Also added a new Activity.showAssist() API because...  well, I was already
in there, it was easy to do, it is safe, and maybe people will build cool
things with it.

Change-Id: Ia553d6bcdd098dc0fce4b9237fbfaca9652fc74b
2015-07-20 12:49:10 -07:00
Dianne Hackborn
9631113672 am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev
* commit '5c269121d8ea0bf3f530f2314695e189ffdb3165':
  Work on issue #22556778: Starting under voice control not allowed
2015-07-17 22:18:09 +00:00
Dianne Hackborn
5c269121d8 Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 2015-07-17 22:03:46 +00:00
Dianne Hackborn
f38c4ee903 Work on issue #22556778: Starting under voice control not allowed
The ResolverActivity is voice capable.  In fact, it is capable
of EVERYTHING.

Change-Id: I37c4476d546f61fee3540b747aff77e88b702d48
2015-07-17 11:21:26 -07:00
Adam Powell
0cad2b6006 am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev
* commit '9ba039bbe9478c56ae3875a9933d3ba754367dc2':
  Update ChooserTarget constructor to take ComponentName, Bundle
2015-07-17 00:33:59 +00:00
Adam Powell
666d82a6d5 Update ChooserTarget constructor to take ComponentName, Bundle
Simplify ChooserTarget handling by requiring a target component and an
extras bundle instead of a full PendingIntent/IntentSender. This
simplifies the handling of URI grants from sending apps.

Prune ChooserTargets that point at ComponentNames that don't share a
package with the original matching Activity target or that aren't
exported so that we don't show the user something they can't launch.

Bug 22516282

Change-Id: I3439c0910b4fa4f95c7a881b529942c96ffc953e
2015-07-16 16:29:59 -07:00
Svet Ganov
f10d7708ca am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev
* commit 'd4b566bf56333de708908ce4accb5fb067be64f0':
  Add APIs for verifier to grant at install and revoke permissions
2015-07-16 22:25:16 +00:00
Svet Ganov
d4b566bf56 Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 2015-07-16 22:22:01 +00:00
Dianne Hackborn
628d4653d4 am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev
* commit 'aaee5b5334746cabd59aed69153d08ecbb70ab1d':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
2015-07-16 21:51:14 +00:00
Dianne Hackborn
aaee5b5334 Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 2015-07-16 21:44:21 +00:00