Commit Graph

4550 Commits

Author SHA1 Message Date
Abodunrinwa Toki
56546bd883 am 785c0a02: am 1f21d2a8: Merge "Hide floating toolbar when user interacts with screen." into mnc-dev
* commit '785c0a02c0016fc6c1981bd3e509948d1c1cb227':
  Hide floating toolbar when user interacts with screen.
2015-05-19 14:28:57 +00:00
Abodunrinwa Toki
1f21d2a8b1 Merge "Hide floating toolbar when user interacts with screen." into mnc-dev 2015-05-19 14:06:46 +00:00
Abodunrinwa Toki
fd3a3a1163 Hide floating toolbar when user interacts with screen.
- Adds an ActionMode.snooze(int) API.
- Clients call this to hide the floating toolbar on DOWN touch event.
- This is called repeatedly as a snooze timeout will re-show the
  toolbar.
- ActionMode.snooze(0) will "wake" the toolbar, reshowing it.
- Clients call this to re-show the toolbar on UP touch event.
- This CL also adds code to hide the toolbar when the "content rect"
  is changing.

Bug: 20148125
Change-Id: If5a9a15f72c73cad8ca01a4328a58570b3e29f66
2015-05-19 14:25:39 +01:00
Jorim Jaggi
0f9d315217 am 06ac707d: am c6767354: Merge "Add setting to disable assist data (1/2)" into mnc-dev
* commit '06ac707daf039a08367fe9127767434a3e58f758': (30 commits)
  Add setting to disable assist data (1/2)
  Make all icon fields & extras sent to listeners backward-compatible.
  Revert "Fix IMMS#mInputShown state inconsistency."
  Fix bug with jobservice context giving wrong value
  camera2: Fix work-profile eviction handling.
  Fix missing break in Icon class
  Fix post dial for remote connections
  Fix build: udpate parser factory method
  Don't keep LayoutlibCallback reference.
  Adjust lockscreen style to spec
  [RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib.
  Change the location of Brandmaster statement file.
  Revert "Update IME focus when the active view is losing the focus."
  Revert "Icon support comes to Notification."
  Fix icon-related crash.
  Don't display the "no Internet access" prompt on captive portals.
  Rewriting should fail when any paths are null.
  Ignore abandon after install relinquished.
  Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
  Fix crash in setup wizard
  ...
2015-05-19 05:02:29 +00:00
Jorim Jaggi
c6767354c5 Merge "Add setting to disable assist data (1/2)" into mnc-dev 2015-05-19 04:40:15 +00:00
Jorim Jaggi
9d91083034 Add setting to disable assist data (1/2)
Bug: 20944446
Change-Id: I8050df3177b6d540829c3f0989a4e4b1381c87ec
2015-05-18 21:39:05 -07:00
Adam Powell
ac6122c042 am 5418cde8: am f9a0d44d: Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev
* commit '5418cde8aac5f239bfab2056767e42a5e2aeb270':
  Migrate uses of config_windowIsRound to Configuration.isScreenRound
2015-05-19 01:24:18 +00:00
Adam Powell
f9a0d44d2e Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev 2015-05-19 01:10:55 +00:00
Stefan Kuhne
332914448a am c1523029: am a2968ad5: Merge "Revert "Backup/restore recents task list"" into mnc-dev
* commit 'c15230299f9c9130af74712be5f866a50196f286':
  Revert "Backup/restore recents task list"
2015-05-19 00:05:15 +00:00
Adam Powell
01f280d376 Migrate uses of config_windowIsRound to Configuration.isScreenRound
Move existing code that previously relied on config_windowIsRound to
use the new Configuration.isScreenRound() method. Also move the system
property override for emulators over to the initial setup of a Display
so that the configuration property is consistent with existing
expectations.

Remove config_windowIsRound from symbols.xml. The symbol now only
exists as a default value redirect for overlays already configured to
supply this value.

Change-Id: I24e6564030a6051c3ac7262868983b43e13eee65
2015-05-18 16:07:42 -07:00
Stefan Kuhne
e88d1e5926 Revert "Backup/restore recents task list"
Reverts commits 92dd1abef4,
18795a2299, and
ac6a3a5e9d which make-up
changes required for backing-up and restoring recent
tasks from one device to another.

The implementation had too many unresolved issues including
the ordering of the restored recent tasks which was depending
on when the task package is installed on the new device that
puts the restored recents list out of order compared to the
old device.

Bug: 15986349
Bug: 19014377
Bug: 20763296

Change-Id: I06fd35a43036ef0b7260cf4db9c42890df63b95d
2015-05-18 16:00:15 -07:00
Abodunrinwa Toki
dd6191f1a9 am 202d94c2: am 1b422a95: Merge "Hide the floating toolbar faster." into mnc-dev
* commit '202d94c2e1ae7b15025076027a453b1a7d6fd2f1':
  Hide the floating toolbar faster.
2015-05-18 17:31:26 +00:00
Abodunrinwa Toki
1408a59f1e am 7b85ce09: am 86817200: Merge "Support min/max height for FloatingToolbar overflow." into mnc-dev
* commit '7b85ce093b371a7d78c378a06880e22d1c08829a':
  Support min/max height for FloatingToolbar overflow.
2015-05-18 17:18:43 +00:00
Abodunrinwa Toki
1b422a95f7 Merge "Hide the floating toolbar faster." into mnc-dev 2015-05-18 17:12:20 +00:00
Abodunrinwa Toki
8681720055 Merge "Support min/max height for FloatingToolbar overflow." into mnc-dev 2015-05-18 16:56:56 +00:00
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