Commit Graph

4533 Commits

Author SHA1 Message Date
Dan Sandler
a42d27804e am a9dca98e: am f6351ece: Merge "Mmm mmm mmm mmm." into mnc-dev
* commit 'a9dca98ec32ac0ad5e13c70d1954f3ea46230b7d':
  Mmm mmm mmm mmm.
2015-05-16 03:32:32 +00:00
Dan Sandler
f6351ece20 Merge "Mmm mmm mmm mmm." into mnc-dev 2015-05-16 03:11:53 +00:00
Adam Lesinski
7fb55c66b5 am e171e34e: am 18f84162: Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev
* commit 'e171e34e63bbeea790cb6c5191873fc181d1b5c0':
  BatteryStats: Enable bluetooth energy collection
2015-05-15 23:21:58 +00:00
Adam Lesinski
18f84162fe Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev 2015-05-15 22:57:02 +00:00
Adam Lesinski
719e61fa5f BatteryStats: Enable bluetooth energy collection
Device firmware has been fixed and bluetooth energy values
should be correct now.

Change-Id: I9b9eff378d81e8de4a3f475c071a4ef26cc97f21
2015-05-15 15:49:24 -07:00
Paul Mclean
a53b87c918 am bb2387bd: am 0844dcd0: Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"" into mnc-dev
* commit 'bb2387bd3f715e1ecc9aed6555519d769e1f4631':
  Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"
2015-05-15 22:48:13 +00:00
Paul Lawrence
8e16c38f35 am edc3fbb9: am 21c8a493: Merge "DOn\'t save encryption settings when not encrypted" into mnc-dev
* commit 'edc3fbb90619eb89da7db5cf1c76026a19a2ac98':
  DOn't save encryption settings when not encrypted
2015-05-15 22:48:00 +00:00
Adam Lesinski
89d1f70748 am 47247e72: am ce27996c: Merge "BatteryStatsHelper: Bluetooth wasn\'t being included in usage list" into mnc-dev
* commit '47247e728abb6bee77e2f650b9a339cdd55ddc29':
  BatteryStatsHelper: Bluetooth wasn't being included in usage list
2015-05-15 22:33:31 +00:00
Paul McLean
abe665cf2e am 46f7c233: am 8c501a3a: Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into mnc-dev
* commit '46f7c233ec2edbefe4cb3728871f3dcc0537d9fd':
  Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java
2015-05-15 22:33:22 +00:00
Paul Mclean
0844dcd070 Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"" into mnc-dev 2015-05-15 22:28:31 +00:00
Paul Mclean
788854b8c0 Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"
This reverts commit 34f5e04290.

Change-Id: Ie2a00ef26b20a662fb0e801925a3721804e427ba
2015-05-15 22:28:07 +00:00
Paul Lawrence
21c8a49306 Merge "DOn't save encryption settings when not encrypted" into mnc-dev 2015-05-15 22:22:25 +00:00
Adam Lesinski
ce27996c4f Merge "BatteryStatsHelper: Bluetooth wasn't being included in usage list" into mnc-dev 2015-05-15 22:18:59 +00:00
Adam Lesinski
ee36c2861a BatteryStatsHelper: Bluetooth wasn't being included in usage list
Bug:20892246
Change-Id: I6eaf204a2cd970ff75704be22c9006fe4dc696cd
2015-05-15 15:18:06 -07:00
Paul McLean
8c501a3a56 Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into mnc-dev 2015-05-15 22:09:15 +00:00
Paul McLean
34f5e04290 Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java
Not the cause of, but related to...
Bug: 19082426

Change-Id: I296c67989debc932838b39d63fdb57396448c50c
2015-05-15 14:58:30 -07:00
Adam Lesinski
9304393043 am 10595666: am 038959e8: Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev
* commit '10595666e441952c5ab7fa1d7f9b4e8f7d25d200':
  Remove UID from kernel cpu accounting when uninstalled
2015-05-15 21:44:01 +00:00
Adam Lesinski
b5a29958e6 am 1e9352ae: am b99e6d69: Merge "Parse uid_cputime proc file" into mnc-dev
* commit '1e9352aef5afbcc17cb87131b1fd23956846b816':
  Parse uid_cputime proc file
2015-05-15 21:43:55 +00:00
Adam Lesinski
038959e851 Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev 2015-05-15 21:25:00 +00:00
Adam Lesinski
b99e6d69c3 Merge "Parse uid_cputime proc file" into mnc-dev 2015-05-15 21:23:09 +00:00
Adam Powell
1b9560e21f am ce3f7931: am 6d54f81a: Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into mnc-dev
* commit 'ce3f79312777e0b2f90a16062f50b11bdbdb6af1':
  Preserve ResolverDrawerLayout fully collapsed state across relayout
2015-05-15 21:15:24 +00:00
Adam Powell
6d54f81a9e Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into mnc-dev 2015-05-15 21:01:17 +00:00
Adam Powell
c9f2293471 Preserve ResolverDrawerLayout fully collapsed state across relayout
Fix a bug where a relayout that grows the size of ResolverDrawerLayout
content would cause it to get stuck in a half-collapsed state. This
could also lead to janky touch interaction behavior in
onStopNestedScroll as it animates to the fully open/closed state after
clicking in a descendant list.

Bug 21202727

Change-Id: I5f0a8b19fc079c57fcf2be7c6fa7627b1cb12a3c
2015-05-15 13:59:40 -07:00
Dan Sandler
696f6a3c48 Mmm mmm mmm mmm.
Change-Id: I23b560694b9cc0eb2103ec16769b0446099d1e83
2015-05-15 16:10:22 -04:00
Paul Lawrence
688af6c574 DOn't save encryption settings when not encrypted
If this setting is saved when unencrypted, it will apply after encryption
and cause the user to get the wrong default in the 'Require pattern to start
device' dialog.

Bug: 21105662
Change-Id: Ibd2918abb6af27e20dc03a1a10f4cad1033bc575
2015-05-15 11:26:17 -07:00
Dan Sandler
2910f53aaa am 031339ba: am d63f9321: Icon support comes to Notification.
* commit '031339baea5c53a4e015a345261a94215c4894ba':
  Icon support comes to Notification.
2015-05-15 16:38:26 +00:00
Dan Sandler
d63f9321e6 Icon support comes to Notification.
And you may ask yourself: what is that beautiful icon?
  And you may ask yourself: where does that API go to?
  And you may ask yourself: is it a resource? is it a Bitmap?
  And you may say to yourself: my god, what have I done

(This patch fixes a number of bugs in the initial
implementation, but other than that, it's the same as it
ever was.)

Bug: 18568715
Bug: 21141842
Change-Id: I1d3f9427abd7f0bb57e533fcfac708851ff644b6
2015-05-15 12:35:21 +00:00
Daniel Sandler
b5b114a3f0 am 15de90de: am 9cb90cbb: Merge "Revert "Icon support comes to Notification."" into mnc-dev
* commit '15de90de0e7f2da9e28d1b46644faeb21df13300':
  Revert "Icon support comes to Notification."
2015-05-14 19:29:55 +00:00
Wojciech Staszkiewicz
b8ee07d10c am e2ad30ef: am be752b1f: Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev
* commit 'e2ad30ef5168d55f7c1b4a2dc4fe699be1bf8a48':
  Pass charset to XmlPullParser.setInput instead of null
2015-05-14 19:27:51 +00:00
Daniel Sandler
09e51a739f Revert "Icon support comes to Notification."
This reverts commit 08a04c1524.
This also reverts commit 5bcbf857d1.

Change-Id: Ia0b0a5339d523581c877822a3a1feec97ae4b73d
2015-05-14 12:23:24 -04:00
Wojciech Staszkiewicz
9e9e2e73c6 Pass charset to XmlPullParser.setInput instead of null
Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.

bug: b/20849543

Change-Id: Iaff97be9df2d0f99d7af8f19f65934439c9658e2
2015-05-14 10:24:34 +01:00
Dan Sandler
9349eb5640 am 6da734c6: am 08a04c15: Icon support comes to Notification.
* commit '6da734c6caf0952fd030273ee861cbcc14110047':
  Icon support comes to Notification.
2015-05-14 06:39:57 +00:00
Dan Sandler
08a04c1524 Icon support comes to Notification.
And you may ask yourself: what is that beautiful icon?
  And you may ask yourself: where does that API go to?
  And you may ask yourself: is it a resource? is it a Bitmap?
  And you may say to yourself: my god, what have I done

Bug: 18568715
Change-Id: I4377b311c538bd1cf36b3fba22326bae81af40c9
2015-05-13 23:50:43 -04:00
Dianne Hackborn
b49e9f4fda am 8fb32071: am c352722e: Ignore small time changes in alarm manager.
* commit '8fb320717510e0703e99299f7df4543fbafcab02':
  Ignore small time changes in alarm manager.
2015-05-14 01:46:15 +00:00
Dianne Hackborn
c352722e8a Ignore small time changes in alarm manager.
It turns out switching to the new kernel alarm
reporting causes lots and lots of spurious flags
that the clock has changed.  The alarm manager
would blindly trust these, thinking the world has
changed on it and recomputing everything and reporting
this to everyone else.  This was expensive.

We now verify that the time has changed sufficiently
that it is worth caring about.  This is basically the
same algorithm that battery stats was using to avoid
recording small clock changes, so we are really just
pushing this down into the alarm manager and can now
remove that from battery stats.

Also since we are getting these so much, make use of
the other information in about the wakeup that tells us
if an alarm went off to avoid doing anything if it didn't.

Change-Id: I6f4f4226db6eb2b38ca73860786e7cf7c9136cc3
2015-05-13 17:44:05 -07:00
Jorim Jaggi
53edbb1aee am 1a4df69f: am 645edef4: Merge "Make sure the app can draw a frame before unlocking" into mnc-dev
* commit '1a4df69f4c4a63b943f3f4f4102e957adbc3e341':
  Make sure the app can draw a frame before unlocking
2015-05-13 22:34:47 +00:00
Jorim Jaggi
645edef483 Merge "Make sure the app can draw a frame before unlocking" into mnc-dev 2015-05-13 22:13:27 +00:00
Jorim Jaggi
827e0facfe Make sure the app can draw a frame before unlocking
- The mechanism to stop windows drawing while window animator was
animating was somehow flaky. It relied on the fact that the client
would call relayout() whenever the animating state changed. This is
mostly the case, but not for lockscreen animations. Instead, we now
use a push model, where window manager tells the app that the state
has changed.
- In addition, it only stopped drawing if that window was animating,
but then only resumed drawing after all windows have finished
animating. Now, we do this per window, so we only stop drawing for
windows that are currently animating.
- We resume the top activity now at the very beginning of the
unlocking sequence. This gives the app a chance to draw a frame
before the user sees anything. If it's to slow, then we just use the
outdated framebuffer.

Bug: 19964562
Change-Id: Ifef8abd189a3146d854b81b9b948861e4d38c155
2015-05-13 14:23:05 -07:00
Chris Wren
ab559c01c8 am 37d3e6dd: am 5e4027fe: Merge "induct a bunch of new logging categories." into mnc-dev
* commit '37d3e6dd53311f12585b9481b23261b4d562660a':
  induct a bunch of new logging categories.
2015-05-13 18:29:48 +00:00
Chris Wren
5e4027fe25 Merge "induct a bunch of new logging categories." into mnc-dev 2015-05-13 18:05:56 +00:00
Chris Wren
28890446fd induct a bunch of new logging categories.
Bug: 20264417
Change-Id: Ica85a31016592be87f727c0d86a4be59eb854158
2015-05-13 13:37:42 -04:00
Clara Bayarri
127702e24a am f47edadd: am 99bd704f: Merge "Fix Floating Toolbar appearing after ActionMode was cancelled" into mnc-dev
* commit 'f47edaddba33238e0978266f4910263899d0d1e9':
  Fix Floating Toolbar appearing after ActionMode was cancelled
2015-05-13 16:22:08 +00:00
Clara Bayarri
99bd704f1c Merge "Fix Floating Toolbar appearing after ActionMode was cancelled" into mnc-dev 2015-05-13 15:46:59 +00:00
Brian Colonna
5cfcaac302 am 0e232a66: am 9a61013d: Merge "Removed unused Face Unlock aidl files" into mnc-dev
* commit '0e232a667c7e201a1d94a88b967a02c77eba6705':
  Removed unused Face Unlock aidl files
2015-05-13 15:28:02 +00:00
Clara Bayarri
0d7d4ef560 Fix Floating Toolbar appearing after ActionMode was cancelled
The Views created for the Toolbar were not cleaned up properly when the
mode was cancelled by the client in onCreateActionMode, leading to the
toolbar appearing over other views when it shouldn't due to
onWindowFocusChanged showing the Toolbar if it exists.

We don't actually need the views if we don't know whether they are
going to be shown yet, so moved view creation to after onCreateActionMode

Bug: 20713912
Change-Id: Ic0c31d1634e1e96d9981a77b2c769306a8bf1a8d
2015-05-13 16:03:14 +01:00
Brian Colonna
9a61013d2d Merge "Removed unused Face Unlock aidl files" into mnc-dev 2015-05-13 13:27:15 +00:00
Adam Powell
3d26822447 am bad22506: am 8c6cd908: Merge "Apply API feedback for ChooserTarget" into mnc-dev
* commit 'bad225069c719dc5c802fd758a4dd18acac1a2c4':
  Apply API feedback for ChooserTarget
2015-05-13 00:13:21 +00:00
Adam Powell
8c6cd9088e Merge "Apply API feedback for ChooserTarget" into mnc-dev 2015-05-12 23:57:32 +00:00
Xiyuan Xia
655c1e807e am 0d3f7e65: am 55e603ee: Merge "Make PIN/Password/Pattern check async" into mnc-dev
* commit '0d3f7e65f1792586604a36859b72e474e4e05766':
  Make PIN/Password/Pattern check async
2015-05-12 22:22:28 +00:00
Mike Lockwood
2b3f80c8a0 am a29558c5: am 62975ae4: Merge "MidiManager: Address API Council feedback:" into mnc-dev
* commit 'a29558c5c5001cdadf5f59fed35134bbfffe763b':
  MidiManager: Address API Council feedback:
2015-05-12 22:22:23 +00:00