Commit Graph

4389 Commits

Author SHA1 Message Date
Filip Gruszczynski
2217f61e51 Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""
This includes the fix for the broken dialog windows. The outsets will
only be calculated and applied if the window is full screen, since
they don't make much sense otherwise.

This reverts commit 4bb6b751fb.

Change-Id: I977a85a78c990c1840784dc0be0dddd5a6d84e6b
2015-05-27 15:36:10 -07:00
Andres Morales
5ccfe51d8b Merge "[LockSettings] migrate password attempt throttling to hardware" into mnc-dev 2015-05-27 18:37:32 +00:00
Alan Viverette
cffaf7e7e4 Add workaround for measuring stacked button bar layout
Bug: 21300645
Change-Id: If9544da4995c3dce118dd9e36d42764662b3aecd
2015-05-27 10:28:05 -07:00
Andres Morales
2397427cb1 [LockSettings] migrate password attempt throttling to hardware
leverage root protected, cryptographically secured hardware
if available

Bug: 21118563
Change-Id: Ifa804c5a0728bfd14466eb2a84051bace6d33d57
2015-05-26 19:48:51 -07:00
Paul Lawrence
3452d2d0db Merge "Honor password visible setting in CryptKeeper" into mnc-dev 2015-05-26 21:52:58 +00:00
Abodunrinwa Toki
4d2fc599cf Merge "Hide the floatingtoolbar when content rect is invisible." into mnc-dev 2015-05-26 21:31:36 +00:00
Abodunrinwa Toki
6a0b277c7c Hide the floatingtoolbar when content rect is invisible.
Hide the floating toolbar when the content rect is outside the
source view's visible area.

Bug: 21304845
Change-Id: I0dd10ad2cda7a8d9b05c81334cdfbd68c22dbc6a
2015-05-26 21:35:18 +01:00
Abodunrinwa Toki
b21562c465 Support icons in the FloatingToolbar
Bug: 20202541
Change-Id: Id4d27851739ba557c7f7348094d79f0c5f782e6b
2015-05-26 12:55:17 +01:00
Dianne Hackborn
4bb6b751fb Revert "resolved conflicts for merge of 47249f2a to mnc-dev"
This reverts commit c7becb7ee7, reversing
changes made to 8562b08f04.
2015-05-22 16:34:44 -07:00
Filip Gruszczynski
c7becb7ee7 resolved conflicts for merge of 47249f2a to mnc-dev
This is a merge of chin support.

Change-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635
2015-05-20 20:15:29 -07:00
Filip Gruszczynski
47249f2a9e am cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-dev
* commit 'cb89ac84c621e047d81873428325dfd747b90a6b':
  Support for devices with a chin.
2015-05-20 22:54:14 +00:00
Filip Gruszczynski
3e11bf33a6 Support for devices with a chin.
Information about the chin is now part of the config.xml instead of the
theme. It is retrieved by WindowManagerService and passed to the clients
as insets. Clients can adjust their behavior in a way that makes it
invisible to the user, that part of the surface doesn't actually exist.

Bug: 19908853

Change-Id: Iedf57bf3c848201b854f91ffeb3b59187d375c1f
2015-05-20 14:20:30 -07:00
Jorim Jaggi
52a66ae41c Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)" into mnc-dev 2015-05-20 19:01:53 +00:00
Jorim Jaggi
10449c1d15 Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)
Change-Id: I071282032b4c4d6e19b5093a25cc541b0e83ebb4
2015-05-19 14:01:07 -07:00
Paul McLean
6f421764fe Merge "Turning off logging in ALSA device connection routines." into mnc-dev 2015-05-19 18:21:38 +00:00
Paul McLean
afe55a5ce9 Turning off logging in ALSA device connection routines.
bug: 21298614
Change-Id: Ia88393698072af8f7c101382f180192646bf713e
2015-05-19 10:32:13 -07:00
Abodunrinwa Toki
378939ad14 Merge "Hide floating toolbar when selection is out of bounds." into mnc-dev 2015-05-19 17:00:07 +00:00
Abodunrinwa Toki
737c6f16a5 Merge "Fix wrong delay values for floatingtoolbar.hide/dismiss" into mnc-dev 2015-05-19 16:45:20 +00:00
Dianne Hackborn
8e3f29540d Merge "Update power manager to track uid state like netstats." into mnc-dev 2015-05-19 16:44:12 +00:00
Abodunrinwa Toki
4ce050bd83 Fix wrong delay values for floatingtoolbar.hide/dismiss
Change-Id: Ie16b5f49babd0df0c70b188c9637e17c661e029c
2015-05-19 17:36:55 +01:00
Xiyuan Xia
00d1fcf737 Merge "No input instead of disabling password entry" into mnc-dev 2015-05-19 16:06:06 +00:00
Xiyuan Xia
cead91974a No input instead of disabling password entry
So that the keyboard does not come and go all the time.

Bug:21271425
Change-Id: I9ba2fa7034777885a6e53f135eca31fc89568e9d
2015-05-19 09:04:43 -07:00
Abodunrinwa Toki
a8151e4ef7 Hide floating toolbar when selection is out of bounds.
Bug: 20212141
Change-Id: I7844308e339ba9a5027c629da8090053011e019d
2015-05-19 15:21:10 +01: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
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
Dianne Hackborn
d23e0d6901 Update power manager to track uid state like netstats.
To follow the correct semantics for when restricts due to
device idle can be applied, power manager need to know about
uid process states like net policy so that it can allow
wake locks from apps that are in the foreground.

Since this is being added to a second place, I reworked things
so that the activity manager now keeps track of per-uid process
states and allows apps to register to listen to those, rather
than having to track lower-level process states and transform
them into an overall uid state.  Both net policy and power
manager use this new facility.

Change-Id: I77359164c40d0f36fe1ef296dd9f9c3062431148
2015-05-18 18:13:41 -07:00
Adam Powell
f9a0d44d2e Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev 2015-05-19 01:10:55 +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
Paul Lawrence
d8fdb33891 Honor password visible setting in CryptKeeper
Bug: 20184626

Change-Id: Ida0f34299947a5d4067406cc6e029fb841077804
2015-05-18 15:13:21 -07: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
f6351ece20 Merge "Mmm mmm mmm mmm." into mnc-dev 2015-05-16 03:11:53 +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
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
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
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