Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
209,531 Commits 3 Branches 0 Tags
dea786bf7c06272aba387874be3733698dfe704a
Commit Graph

4958 Commits

Author SHA1 Message Date
Chris Wren
014964d8d4 am 0d46bed3: am 525cfc01: am baafac4a: am ce10d7a5: am 1bd310e1: Merge "import more metrics enums" into mnc-dev 
* commit '0d46bed330fcf99ec68b0ecf99d95c9aae4a930c':
  import more metrics enums
 2015-07-29 18:42:33 +00:00
Chris Wren
0d46bed330 am 525cfc01: am baafac4a: am ce10d7a5: am 1bd310e1: Merge "import more metrics enums" into mnc-dev 
* commit '525cfc010593763e6ec88f62e4b7dd005865ecdf':
  import more metrics enums
 2015-07-29 18:20:44 +00:00
Chris Wren
1bd310e18c Merge "import more metrics enums" into mnc-dev 2015-07-29 14:57:15 +00:00
Adam Lesinski
7ca82d915e am 2a098fe9: am 2529d39d: am 858e4a6f: am 9aae8d9c: am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev 
* commit '2a098fe90ab0e60c2326e9aedbfdd85529de782f':
  BatteryStats: Use proper power calculator when energy data is received
 2015-07-29 02:10:51 +00:00
Adam Lesinski
2a098fe90a am 2529d39d: am 858e4a6f: am 9aae8d9c: am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev 
* commit '2529d39d3184ab66207f3fde9f2106276a2c1c16':
  BatteryStats: Use proper power calculator when energy data is received
 2015-07-29 01:47:06 +00:00
Jorim Jaggi
e1d440be81 am 7580672f: am ce58fa95: am fed9b281: am 353fe1c6: am 0d210f63: Animation for touch, wake and unlock 
* commit '7580672fa8455dccc78806dcd878a5e191a62a45':
  Animation for touch, wake and unlock
 2015-07-29 00:49:19 +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
Jorim Jaggi
7580672fa8 am ce58fa95: am fed9b281: am 353fe1c6: am 0d210f63: Animation for touch, wake and unlock 
* commit 'ce58fa9593ae9b0d5e29485019876bde5c54848b':
  Animation for touch, wake and unlock
 2015-07-29 00:28:13 +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
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
6105a30d9d am 0091e2c0: am 639fd0e9: am 025a5dc6: am 108f5493: am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 
* commit '0091e2c03d1f2d212c94a3096e86407c78df6820':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
 2015-07-28 21:26:50 +00:00
Dianne Hackborn
0091e2c03d am 639fd0e9: am 025a5dc6: am 108f5493: am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 
* commit '639fd0e9d8ecb59f8d15b3f1e5ec7a6ae6cc3161':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
 2015-07-28 21:03:15 +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
16478a8d5c am 7eec4216: am 04f61ee8: am f040100c: am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 
* commit '7eec421639a6d71f1f5cf1ee066766731d94955b':
  Move PIN/Pattern appear animation to RenderThread (1/2)
 2015-07-27 20:21:02 +00:00
Jorim Jaggi
7eec421639 am 04f61ee8: am f040100c: am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 
* commit '04f61ee85da93f2d15034f290faec7512c176d59':
  Move PIN/Pattern appear animation to RenderThread (1/2)
 2015-07-27 20:04:14 +00:00
Phil Burk
f244b3aa97 am 4a30f4d8: am 95e51b84: am 5821d548: am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev 
* commit '4a30f4d864fb208890ce7f65ebebcec287c10d2f':
  MIDI: fix running status parser
 2015-07-27 19:01:07 +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
4a30f4d864 am 95e51b84: am 5821d548: am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev 
* commit '95e51b84454e41d2a54e845f57a73e8c3b54931d':
  MIDI: fix running status parser
 2015-07-27 18:47:14 +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
e3a1ea1152 am b365dff5: am bd3d9a0d: am 86f88bc4: am b572b950: am 4a368659: Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev 
* commit 'b365dff5c23b35170f12dd034fa40f911a00b325':
  Fix issue #22414729: Checkin start clock time is different from hsitory reset time
 2015-07-24 05:13:06 +00:00
Adam Lesinski
e4e691b802 am a0d43c31: am 602d71db: am 898e3dda: am 92638a0c: am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 
* commit 'a0d43c31df8a5c1d3a52dc28a263cb2c4b1b0092':
  BatteryStats: Use English locale for dump and checkin data
 2015-07-24 05:11:36 +00:00
Jason Monk
180dff0bae am bb8b0368: am dea13a96: am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit 'bb8b0368c5b4ddf5cbf3cb5c0c9bbe9027bc617b':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 05:10:01 +00:00
Dianne Hackborn
b365dff5c2 am bd3d9a0d: am 86f88bc4: am b572b950: am 4a368659: Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev 
* commit 'bd3d9a0d41f0977b9827c55a98cda3b9e6852b5b':
  Fix issue #22414729: Checkin start clock time is different from hsitory reset time
 2015-07-24 04:03:47 +00:00
Adam Lesinski
a0d43c31df am 602d71db: am 898e3dda: am 92638a0c: am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev 
* commit '602d71db2e32faf2349d6b4c9a1fe71ba9f27e39':
  BatteryStats: Use English locale for dump and checkin data
 2015-07-24 04:02:30 +00:00
Jason Monk
bb8b0368c5 am dea13a96: am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit 'dea13a962356e54881c3924fc07c1aed97a97f46':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 04:01:38 +00:00
Jorim Jaggi
ffbc117229 am f30c5f56: am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit 'f30c5f56187fed6452d557a44df8b63d8eb130a2':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 22:06:29 +00:00
Jorim Jaggi
f30c5f5618 am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit '93a25f77bb4b4aeb7b3a1313fe3117f4c9781dc8':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 21:48:48 +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
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
26bfaa5c97 am 208d273e: am e1cd38e9: am ca34b184: am a50f43e0: am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 
* commit '208d273edcaa59470fa1a83d96b0b3cd036dbbf1':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
 2015-07-21 21:43:32 +00:00
Adam Lesinski
208d273edc am e1cd38e9: am ca34b184: am a50f43e0: am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev 
* commit 'e1cd38e9298f0a62418e95adee64e5f2d7e36297':
  BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
 2015-07-21 20:24:36 +00:00
Adam Lesinski
a50f43e002 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:40:24 +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
368c53a998 am 96ee8e8f: am 537cd82a: am 027db7c9: am e58ba842: am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev 
* commit '96ee8e8f04252ff7289e7e79289706b05637e40b':
  Fix SysUI crashes on svelte devices
 2015-07-21 00:22:35 +00:00
Jorim Jaggi
96ee8e8f04 am 537cd82a: am 027db7c9: am e58ba842: am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev 
* commit '537cd82ad5ab416eae2199d2dfe4634f974c89c8':
  Fix SysUI crashes on svelte devices
 2015-07-21 00:08:08 +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
e58ba842de am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev 
* commit '8924f23d3ecdcb2b1ce4dbc9bb4fbb9ddfa62710':
  Fix SysUI crashes on svelte devices
 2015-07-20 23:24:21 +00:00
Qiwen Zhao
06e260b8db Merge commit '01fda527' 
Change-Id: I08b5e7e8576f463c00be12879b465fa9c8cda8f5
 2015-07-20 15:52:23 -07: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
01fda52778 am ed3b4253: am 5cdc7f04: am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 
* commit 'ed3b42539a4d883533177d008c7ffb2a58e50af6':
  Fix issue #22531747: Assist info should declare if user has disabled...
 2015-07-20 20:42:32 +00:00