Commit Graph

8479 Commits

Author SHA1 Message Date
Jason Monk
8ca3a3661b Merge "Fix shift in share sheet" into oc-mr1-dev
am: 3a31bdede5

Change-Id: I3e1b3f3acf77a9df31b3f38b942bcbc728efffeb
2017-09-06 18:04:40 +00:00
Jason Monk
3a31bdede5 Merge "Fix shift in share sheet" into oc-mr1-dev 2017-09-06 17:50:36 +00:00
Jason Monk
fd44738090 Merge "Make settings themed apps have light nav" into oc-mr1-dev
am: 181d4a8096

Change-Id: Ibf53883d951936a543c28ac070ea515625914a35
2017-09-06 17:00:38 +00:00
Jason Monk
4548420674 Make settings themed apps have light nav
This is needed to help with differential aging.

The nav needs to be white with a 1dp divider on it, so add support
for the divider and add hidden attribute to set the nav buttons
inverted.

Test: Open settings
Bug: 63630024
Change-Id: Iec6046baeb86fb554df73346df8652fee8b2736a
2017-09-06 09:33:36 -04:00
Rubin Xu
c17f1d412b Merge "Fix resetPasswordWithToken before user unlock" into oc-mr1-dev
am: 2e21fba2b5

Change-Id: I83688cd83cf18f37b3507ebe69d29dbc2669178b
2017-09-06 12:19:51 +00:00
Rubin Xu
7cf4509c31 Fix resetPasswordWithToken before user unlock
1. Fix system server crash when resetPasswordWithToken is called before use
   unlock, due to DPMS enforces user is unlocked when calculating password
   sufficiency.
2. Propogate new password metric from LockSettingsService to DPMS after a
   password reset with token, and fix a bug where stale quality was used.

Bug: 64923343
Bug: 64928518
Bug: 65286643
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.ManagedProfileTest#testResetPasswordWithTokenBeforeUnlock
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testResetPasswordWithToken
Test: runtest frameworks-services -p com.android.server.locksettings
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminHostSideTestApi24#testRunDeviceOwnerPasswordTest
Test: runtest frameworks-core -c android.app.admin.PasswordMetricsTest
Test: runtest frameworks-services -c com.android.server.devicepolicy.DevicePolicyManagerTest
Change-Id: Ibb3736547b3b36da4a8a67af711e08a38427aa56
2017-09-05 14:49:00 +01:00
Tarandeep Singh
a040bae50a Merge "Add multi-display support to FloatingToolbar." into oc-mr1-dev
am: 01b6ff0178

Change-Id: Ic3c317435ba408522b2b26f74c4df5a772871566
2017-08-31 21:38:33 +00:00
Julian Mancini
831458a65a Remove PDF Thumbnail functionality
am: 30175b958e

Change-Id: Id58212dce0b51eada2a31936f1614d773d89ecad
2017-08-31 21:11:16 +00:00
Tarandeep Singh
01b6ff0178 Merge "Add multi-display support to FloatingToolbar." into oc-mr1-dev 2017-08-31 20:45:48 +00:00
Julian Mancini
30175b958e Remove PDF Thumbnail functionality
Bug: 64225798
Test: Removing Functionality
Change-Id: Id02f1b50d161c6f2779c9f65c579383c18028b65
2017-08-31 14:26:10 -06:00
Ruchi Kandoi
0caca11df4 Merge "Do not call setAlwaysButtonEnabled if the activity doesn't support defaults." into oc-mr1-dev
am: c1235a1ff2

Change-Id: I109b96ae365e102428fbe6c7174ebd140145e293
2017-08-31 20:01:13 +00:00
TreeHugger Robot
c1235a1ff2 Merge "Do not call setAlwaysButtonEnabled if the activity doesn't support defaults." into oc-mr1-dev 2017-08-31 19:47:42 +00:00
Jason Monk
a38fe85e75 Fix shift in share sheet
Was counting the padding twice, its included in height already.

Test: visual
Change-Id: I012c6db585eb5fac0d5cee87971d94740c520f07
Fixes: 63647502
2017-08-31 15:42:51 -04:00
Tarandeep Singh
c9c83a9ccb Add multi-display support to FloatingToolbar.
DecorView has no support for multi-display (bug 65172902).
Until that is done, the easy fix for displaying cut, copy, paste
on non-default display is to modify FloatingToolbar.
FloatingToolbar uses context of Default display. Changed it
to use context of the window (which makes it multi-display
compatible).

Fixes: 64837794
Test: Manual using AAe's KitchenSink test app
bit FrameworksCoreTests:android.widget.TextViewActivityTest
bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Change-Id: I513f1aac1c0d22355c996247e3bf56c6d812348f
2017-08-31 17:51:50 +00:00
Kang Li
adc714972a Merge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev
am: f10b0d000e

Change-Id: I6befef8d1f27666e5a6c721378ba5c02cc769947
2017-08-31 00:52:18 +00:00
TreeHugger Robot
f10b0d000e Merge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev 2017-08-31 00:34:57 +00:00
jackqdyulei
9950104f7a Merge "Add static lock in PowerProfile" into oc-mr1-dev
am: dcadf1934a

Change-Id: I3ae1a99852d5c9c4a87ee402b3e2e1cc88b8bd0d
2017-08-31 00:06:06 +00:00
TreeHugger Robot
dcadf1934a Merge "Add static lock in PowerProfile" into oc-mr1-dev 2017-08-30 23:35:07 +00:00
Kang Li
0935f152c7 Fixes NPE thrown in sort if new targets are added.
Test: manually tested it to verify that it works as expected.

Bug: 65035399
Change-Id: Ie99b05c5324f47cbac66687d7301ef62a7c83e55
2017-08-30 21:32:08 +00:00
jackqdyulei
0e3504c0fa Add static lock in PowerProfile
Before this cl, there exists nullpointer crash in PowerProfile in
following part:

"sPowerMap.containsKey(key) && (Double) sPowerMap.get(key) > 0"

To my best knowledge, it is because in
PowerUsageSummary.SummaryProvider, we may create batterystats in
meantime:
1. setListening is invoked in worker thread, in which we will force
update the batterystats.
2. In setListening we will register receiver, which may update
batterystats through onReceive in UI thread.

This cl adds static lock in PowerProfile, making the init part can
only be accessed by an thread at a time.

Bug: 64209576
Test: Manual
Change-Id: I00bc094f44416669b4f0e11e647b0fae2ff61013
2017-08-29 15:30:42 -07:00
Ruchi Kandoi
65d76c1213 Do not call setAlwaysButtonEnabled if the activity doesn't support defaults.
13405c5529 introduced a bug where
activities using ResolverActivity without dafaults/always option get selected,
the ResolverActivity tries to set a default causing a crash.

Test: Test Application using TECH_DISCOVERED intent filter
Bug: 38358120
Change-Id: Id36635d84963bcf1dc7e55938e2370542ed291ab
2017-08-29 15:19:21 -07:00
Jiongxuan Gao
4c04055489 Merge "Fix ListView can not be moved after rotation." into oc-mr1-dev
am: 10477217f5

Change-Id: Ifb68ab61a474a559586b6ad76a6b25cc6fd167d3
2017-08-29 20:18:27 +00:00
TreeHugger Robot
10477217f5 Merge "Fix ListView can not be moved after rotation." into oc-mr1-dev 2017-08-29 20:09:56 +00:00
Hyunyoung Song
b93fe49a9e Merge "Add shadow to adaptive icons to the shared sheet Test: manual Bug: 65015602" into oc-mr1-dev
am: cc4f60fe4b

Change-Id: Id657cc6bb5c5a63c408048c39908d24b2bc0cdb0
2017-08-29 20:01:25 +00:00
TreeHugger Robot
cc4f60fe4b Merge "Add shadow to adaptive icons to the shared sheet Test: manual Bug: 65015602" into oc-mr1-dev 2017-08-29 19:54:26 +00:00
Vladislav Kaznacheev
8e8b215272 Merge "Fix tooltips for views in a popup window" into oc-mr1-dev
am: 6a1dad9194

Change-Id: I3ac05ae79fe908819d56f90c90f80cc1368670ba
2017-08-29 19:21:09 +00:00
TreeHugger Robot
6a1dad9194 Merge "Fix tooltips for views in a popup window" into oc-mr1-dev 2017-08-29 19:08:30 +00:00
Sudheer Shanka
4411d84551 Merge "KernelUidCpuFreqTimeReader: Put logs under debug flag." into oc-mr1-dev
am: 903dc2fdd2

Change-Id: I2810e61300d5c2317639b261898931e66d075cb5
2017-08-29 18:01:14 +00:00
Jiongxuan Gao
3365b16821 Fix ListView can not be moved after rotation.
Symptom:
"Share with" popup displayed incompletely, and cannot be slid after
rotated the screen twice.

Root cause:
Since ChooserActivity's configChanges attribute contains
"screenSize|orientation" , when user rotates device, Android will
not recreate ChooserActivity, its content view ResolverDrawerLayout
is also not recreated. In ResolverDrawerLayout's onMeasure, it will
call getHeightUsed to calculate the ListView's height. getHeightUsed
will check against the lowest child view plus padding and margin
instead of the actual measured height of the ListView. This lets the
ListView hang off the edge when all of the content would fit on-screen
. Because of ResolverDrawerLayout has not been drawn yet, we can not
get the actual showing items' count of ListView before it's drawn, the
result of getChildCount for ListView will return the value in landscape
mode. The heightUsed of ListView might be smaller. mCollapsibleHeight
will be 0. When received a move action, the mCollapseOffset and new
position might both be 0.

Solution:
When configuration changed, we should rebuild the list and refresh
adapter's data set. Just like onRestart does.

Bug: 34365764

Change-Id: I4be0f9afc68588fbb0d8d152c41509650d04c754
2017-08-29 10:26:39 -07:00
Sudheer Shanka
6b1396e8fe KernelUidCpuFreqTimeReader: Put logs under debug flag.
Bug: 63041570
Test: N/A
Change-Id: Ifdeacb227bb936de82af9c9505621b327de3a9d2
2017-08-28 23:06:38 -07:00
Hyunyoung Song
dadb9e1728 Add shadow to adaptive icons to the shared sheet
Test: manual
Bug: 65015602

Change-Id: I01de79edc0a13817680106b1ef46e3212487b62f
2017-08-28 12:22:42 -07:00
Fyodor Kupolov
8908b418ee Merge "Added tron metrics for shutdown time" into oc-mr1-dev
am: 30c565d399

Change-Id: I10d4479c79c1997325f74477a94e4f74eb043f46
2017-08-28 18:50:48 +00:00
Fyodor Kupolov
30c565d399 Merge "Added tron metrics for shutdown time" into oc-mr1-dev 2017-08-28 18:41:52 +00:00
Fyodor Kupolov
291f63bb54 Added tron metrics for shutdown time
The metrics are persisted in /data/system/shutdown-metrics.txt file
property and logged after reboot. MetricsLogger API cannot be directly
used during shutdown since event log is cleared on reboot/power off.

Test: manual reboot/shutdown and verify that metrics are logged
Bug: 64815357
Change-Id: I7fa1af8be58a80a3d5bae26d55c1ed40bf98f4c0
2017-08-25 16:59:08 -07:00
Selim Cinek
f3dbfd5e88 Merge "Fixed that the status icons were showing in the camera" into oc-mr1-dev
am: 02f8fa9603

Change-Id: Ic46388c35651217b7f39b12aec8ba1a34f537d36
2017-08-25 19:33:07 +00:00
TreeHugger Robot
02f8fa9603 Merge "Fixed that the status icons were showing in the camera" into oc-mr1-dev 2017-08-25 19:13:44 +00:00
Selim Cinek
3a49ba2e40 Fixed that the status icons were showing in the camera
When launching to quicksettings, the camera icons showed
above the camera, clashing with their UI

Test: launch camera (locked) and click on galery
Fixes: 64317909
Change-Id: I4ef68963af11f6d0be739c79cdf352ba35d9ece0
2017-08-25 09:44:14 -07:00
Sudheer Shanka
24fbd020fb Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev
am: 29091ec55f

Change-Id: I2540bd98007d8471758dfcbf365cab231594c52c
2017-08-23 22:38:49 +00:00
Sudheer Shanka
29091ec55f Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev 2017-08-23 22:26:08 +00:00
Sudheer Shanka
8cde930d71 Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e
Bug: 63041570
Test: N/A
Change-Id: I2cb12f1b8f0333c4a000d601624dc95934cf9b90
2017-08-23 11:29:23 -07:00
Selim Cinek
0c8a132ea3 Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev
am: 60a09546c0

Change-Id: If41351abbd54b19dbdcaecca01fe7104176f488b
2017-08-23 16:07:49 +00:00
Selim Cinek
87c3153dcd Transforming all texts of decorated media custom views
Since otherwise they would be illegible with the color
tranformation.

Change-Id: I5c1fa085fc3d6f682012c267d489a95fc7073f32
Fixes: 64810767
Test: manual, add decoratedMediaCustomView
2017-08-23 02:30:14 +00:00
Vladislav Kaznacheev
df6ee1ecbe Fix tooltips for views in a popup window
The current implementation is using the anchor view's getWindowToken to
construct the TooltipPopup instance. This does not work if the anchor
view is in a popup window.

Using getApplicationWindowToken fixes the problem.

Bug: 64595364
Test: android.view.cts.TooltipTest#testTooltipInPopup
Change-Id: I1a887c9ae6ac00f2412891f316367acfc56cef94
2017-08-22 15:34:22 -07:00
Julia Reynolds
30e9c9c973 Merge "Let the foreground service channel be blocked" into oc-dr1-dev am: 6614a2e5d0
am: 4796cf6b43

Change-Id: I9b654b4d2e01785a9bc19e985062395073718e7f
2017-08-17 23:20:57 +00:00
Julia Reynolds
4796cf6b43 Merge "Let the foreground service channel be blocked" into oc-dr1-dev
am: 6614a2e5d0

Change-Id: Ic155670df78a6e779174cbd705f07260c8d305b6
2017-08-17 23:13:29 +00:00
Julia Reynolds
c23a2e67ac Let the foreground service channel be blocked
And update the channel name

Change-Id: Ic4b909d31b38b9e1ee05f9b3e4e5c91efc6752b1
Fixes: 36891897
Test: manual
2017-08-17 14:11:45 -04:00
Lucas Dupin
fda1152e59 Merge "API Council feedback" into oc-mr1-dev
am: 07c83d00c9

Change-Id: I115e1145b47d97b29a988133d9ec94ebe6e39637
2017-08-16 23:38:38 +00:00
Luis Hector Chavez
22f95dbdc0 Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55 am: 755baf92b4
am: 64f1d42e6c

Change-Id: I785676decb2fc7ddfa9034fbafdfc2deb2f07604
2017-08-16 23:11:35 +00:00
TreeHugger Robot
07c83d00c9 Merge "API Council feedback" into oc-mr1-dev 2017-08-16 22:55:52 +00:00
Luis Hector Chavez
64f1d42e6c Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55
am: 755baf92b4

Change-Id: I07eb375c2b86651fd7d65f944b19161d2c977df4
2017-08-16 22:11:14 +00:00