Commit Graph

13634 Commits

Author SHA1 Message Date
Suprabh Shukla
991efe5467 Merge "Using a list to store usage events" into pi-dev am: 10b77a39a2
am: 38465c19b5

Change-Id: I33e640edc422df34ca47e1d7b0501aa44cccb53d
2018-04-26 16:29:22 -07:00
Suprabh Shukla
38465c19b5 Merge "Using a list to store usage events" into pi-dev
am: 10b77a39a2

Change-Id: I92f83289bd5a10b0a17012c2fd993ade0033375e
2018-04-26 16:17:55 -07:00
TreeHugger Robot
10b77a39a2 Merge "Using a list to store usage events" into pi-dev 2018-04-26 22:58:40 +00:00
Philip P. Moltmann
0fc26e75ed Merge "Compute correct rejected time" into pi-dev am: 29e2a3dd92
am: 787409aec0

Change-Id: I178f89f3ac313eee9f8ffa6acedc4b7ff98774ac
2018-04-26 14:06:34 -07:00
Philip P. Moltmann
787409aec0 Merge "Compute correct rejected time" into pi-dev
am: 29e2a3dd92

Change-Id: Ifbbf9fc7ff2b6392bdf3084849b276c9daae3767
2018-04-26 13:56:02 -07:00
Philip P. Moltmann
76f04073f9 Compute correct rejected time
Fixes: 78632929
Test: atest FrameworksServicesTests:AppOpsServiceTest
            CtsPermissionTestCases:AppOpsTest

Change-Id: I34e1de6658c89c40cae3a8bb6e9fdb4e7fd80795
2018-04-26 11:01:08 -07:00
Suprabh Shukla
60aa35b756 Using a list to store usage events
Moving UsageEvent.Event objects to an array list sorted on the event
timestamps as there can be multiple events with the same timestamps.

Test: atest android.app.usage.EventListTest
Existing tests:
atest android.app.usage.cts.UsageStatsTest

Bug: 74406113
Change-Id: Idc7f2a8db6e5a9499b3b0b74efbf014b17fa495f
2018-04-25 16:36:35 -07:00
Makoto Onuki
906bf6c91a Merge "Make "Want to start battery saver?" dialog better." 2018-04-25 23:23:05 +00:00
Dianne Hackborn
0b7bbdb60d Merge "Work on issue #78480444: Start tracking uid state in app ops" into pi-dev am: fcefeb25ac
am: 510aab7583

Change-Id: Idb3a115f87d2abe3974412111b56f8071f7d6dda
2018-04-25 14:21:05 -07:00
Dianne Hackborn
510aab7583 Merge "Work on issue #78480444: Start tracking uid state in app ops" into pi-dev
am: fcefeb25ac

Change-Id: I11aee7e90d9ce9680933e2d3433a0159513c435c
2018-04-25 14:11:58 -07:00
Dianne Hackborn
fcefeb25ac Merge "Work on issue #78480444: Start tracking uid state in app ops" into pi-dev 2018-04-25 20:59:04 +00:00
Makoto Onuki
e8bbf95cdf Make "Want to start battery saver?" dialog better.
- Don't line-break in "Battery" (only in English)
- Add "Learn more" link.

Bug: 78261259

Test: Manual test with:
- adb shell dumpsys battery unplug
- adb shell settings delete secure low_power_warning_acknowledged
- Enable battery saver
- Make sure the link is clickable if a link is set.
- Make sure there's no "learn more" link if the link is not set in strings.xml

Cherry picked I83364f628dd596a4d50bf2aca4db7cbfe7cf4909 and manually resolved conflict.

Change-Id: Icf6d4e62d8cb3556561f992afc45aaea868bce0e
2018-04-25 13:55:48 -07:00
Makoto Onuki
fc7e2cff84 Merge "DO NOT MERGE Make "Want to start battery saver?" dialog better." into pi-dev
am: 6f79bd0019

Change-Id: I452931c53e1ed5b86b8389f120b9ebb3b4059ca3
2018-04-25 10:13:18 -07:00
Makoto Onuki
778ce66697 DO NOT MERGE Make "Want to start battery saver?" dialog better.
- Don't line-break in "Battery" (only in English)
- Add "Learn more" link.

Bug: 78261259

Test: Manual test with:
- adb shell dumpsys battery unplug
- adb shell settings delete secure low_power_warning_acknowledged
- Enable battery saver
- Make sure the link is clickable if a link is set.
- Make sure there's no "learn more" link if the link is not set in strings.xml

Change-Id: I83364f628dd596a4d50bf2aca4db7cbfe7cf4909
2018-04-25 15:27:47 +00:00
Dianne Hackborn
cd1f30b439 Work on issue #78480444: Start tracking uid state in app ops
We now push uid states down from activity manager in to app
ops, and it uses them to keep track of access/reject times for
each uid/package at the various states.

Bug: 78480444
Test: manual
Change-Id: Ia0bc9174b60b4bf0851834961cc48507a6a60951
2018-04-24 16:08:25 -07:00
Bernardo Rufino
d2e2c3a6e4 Merge "Check self permission in BackupManager#isBackupServiceActive" into pi-dev am: ad8159bea0
am: e348c14524

Change-Id: Ic31eabf98521d0823b6329914809dcfd937e33fe
2018-04-24 05:29:34 -07:00
Bernardo Rufino
e348c14524 Merge "Check self permission in BackupManager#isBackupServiceActive" into pi-dev
am: ad8159bea0

Change-Id: I3500ed3ae311d5df2ddf265a7132ac05d7eb536c
2018-04-24 05:20:29 -07:00
TreeHugger Robot
ad8159bea0 Merge "Check self permission in BackupManager#isBackupServiceActive" into pi-dev 2018-04-24 12:12:53 +00:00
Rubin Xu
b4c0d951bc Merge "Clarify SystemUpdatePolicy" into pi-dev am: 4019c39405
am: 5fbc0e59f5

Change-Id: Ia4f9475bac63504d9332bf576d9e12517e89d23a
2018-04-24 04:20:14 -07:00
Rubin Xu
5fbc0e59f5 Merge "Clarify SystemUpdatePolicy" into pi-dev
am: 4019c39405

Change-Id: I7d9129aaa404940391139acf2f40eca97fda9165
2018-04-24 04:10:58 -07:00
TreeHugger Robot
4019c39405 Merge "Clarify SystemUpdatePolicy" into pi-dev 2018-04-24 10:59:50 +00:00
Bernardo Rufino
2bf65c6e5c Check self permission in BackupManager#isBackupServiceActive
Old method only checked for IPC caller, method isn't an IPC, adding
check for self permission as well.

Bug: 78467264
Test: atest com.google.android.gts.devicepolicy.DeviceOwnerTest#testBackupServiceActive
Change-Id: If9eed90f2deaaf1a4f2376fdf1881e62ee8954fb
2018-04-24 11:41:13 +01:00
Selim Cinek
fe5e954e9e Merge changes from topic "notification_reply_action" into pi-dev am: 53790c1c8f
am: 0744f1d4b1

Change-Id: Ic0fdf693f31edc0402c43451610c051b2d8571cf
2018-04-24 02:37:39 -07:00
Selim Cinek
0744f1d4b1 Merge changes from topic "notification_reply_action" into pi-dev
am: 53790c1c8f

Change-Id: Ia6f227ca49a2004a2346da91cfea4f9a3fa65c47
2018-04-24 02:26:30 -07:00
Kenny Guy
d79d5c9bd6 Merge "Add spinner for smart replies." into pi-dev am: 5f18904a00
am: 06c4122c74

Change-Id: I5a2d775500b0a43eea281592f2325add233e7de1
2018-04-24 02:11:49 -07:00
Selim Cinek
53790c1c8f Merge changes from topic "notification_reply_action" into pi-dev
* changes:
  Cleaned up the paddings of the messaging layout and smart replies
  Changed the size of the largeIcon
  Moved the disabling from alpha to manual color blending
  Updated the color of the reply button to be more neutral
  Updated the reply icon
  Disabled reply action when pending intents are cancelled
  Split the reply icon permanently from the right icon
2018-04-24 09:10:38 +00:00
Kenny Guy
06c4122c74 Merge "Add spinner for smart replies." into pi-dev
am: 5f18904a00

Change-Id: I2eed8580057fe6565674c376ffd5cbdc5aaf0dcd
2018-04-24 02:02:47 -07:00
TreeHugger Robot
5f18904a00 Merge "Add spinner for smart replies." into pi-dev 2018-04-24 08:51:56 +00:00
Selim Cinek
1c72fa0249 Cleaned up the paddings of the messaging layout and smart replies
Refactored the code such that the reply icon's inset was substracted
from the overall paddings to make all of them consistent. This
will also help in the future as we don't have to update those
paddings manually anymore.

Test: test all sorts of combinations with Notify
Change-Id: I8c6c9951bc73c88d95cb443c8e618c7adca7ebd3
Fixes: 78441535
2018-04-24 14:33:29 +08:00
Selim Cinek
4717d862a0 Updated the color of the reply button to be more neutral
The primaryTextColor wasn't a good fit, because it was
drawing too much attention being pure black. We're now
taking the default color instead. It's also used for
active permissions now.

Test: add notification, look at reply button.
Change-Id: If390c66e927a92a1115250abb7254fafe81b054c
Fixes: 72750728
2018-04-24 13:05:56 +08:00
Selim Cinek
d83203cde4 Disabled reply action when pending intents are cancelled
Previously the user could open inline reply even when the
action was already cancelled. This also enables listening
to pending intent cancellations.

Test: manual
Fixes: 77811784
Change-Id: I4ae164081c6abdeb60a8e78d61bf5e4f26cca1d3
2018-04-24 13:05:53 +08:00
Winson Chung
131ac05712 Merge "Add windowing mode to task snapshot." into pi-dev am: 167710981c
am: ec1e188e67

Change-Id: If2193c37570deb762d7ae74fcbda4c3d9fd61729
2018-04-23 15:46:34 -07:00
Winson Chung
ec1e188e67 Merge "Add windowing mode to task snapshot." into pi-dev
am: 167710981c

Change-Id: I0348be9f7e096e7effc1476f5015d33263a163fe
2018-04-23 15:30:23 -07:00
Winson Chung
a4fa8d5bd4 Add windowing mode to task snapshot.
Bug: 78155683
Test: atest FrameworksServicesTests:TaskSnapshotPersisterLoaderTest
Change-Id: I4e562d818416a30d6759baef37c74b6d9c514a00
2018-04-23 12:25:38 -07:00
Kenny Guy
a0f6de8ab2 Add spinner for smart replies.
Add a spinner to MessagingGroup that is enabled
when the user has clicked on a smart reply.

Bug: 73607490
Test: atest SystemUiTests

Change-Id: I4d892c19b5df2b443761819929a83f016967e217
2018-04-23 18:58:19 +01:00
Rubin Xu
fcf3d6e5e2 Clarify SystemUpdatePolicy
Bug: 69734091
Test: make ds-docs
Change-Id: Ibd40f4c6bdc2e70ffe41c785c5a5b389fbeabd78
2018-04-23 16:40:44 +01:00
Selim Cinek
384804b42d Split the reply icon permanently from the right icon
Previously these would overlap, but they are now completely
separate.

Test: ensure that all notification styles still work with the new affordance.
Change-Id: I16f5f863b4afac27494a4a7615631bca240ca532
Fixes: 72750728
2018-04-23 16:19:21 +08:00
Andrii Kulian
98fdc42d9a Merge "Don't require post-execution state for onActivityResult" into pi-dev am: 5007c67a70
am: 33fd905c37

Change-Id: Ia05f8c33ce038d76c3c1753ac58b6b82a3b6a679
2018-04-20 17:25:23 -07:00
Andrii Kulian
33fd905c37 Merge "Don't require post-execution state for onActivityResult" into pi-dev
am: 5007c67a70

Change-Id: I6ea56c0e6e68afd354426194bd0d4536129abe86
2018-04-20 17:10:42 -07:00
Andrii Kulian
5007c67a70 Merge "Don't require post-execution state for onActivityResult" into pi-dev 2018-04-20 23:21:25 +00:00
Jeff Sharkey
4cdf6e58ed Merge "Give CTS a way to force-poll network stats." into pi-dev am: 46e58e1b40
am: 77c7b732c4

Change-Id: I93be7a46fc345efc31e98975c65a287f2d344220
2018-04-20 14:07:19 -07:00
Jeff Sharkey
77c7b732c4 Merge "Give CTS a way to force-poll network stats." into pi-dev
am: 46e58e1b40

Change-Id: Id2252b803a33ddadfef71618b3b9106c93c5be2a
2018-04-20 13:51:02 -07:00
Andrii Kulian
e55b009a3d Don't require post-execution state for onActivityResult
According to the documentation, onActivityResult() should be called
immediately before onResume(). This, however, was not always the case
in previous releases and fixing this caused some app compatibility
issues.
This CL removes required post execution state for ActivityResultItem.

Bug: 77695691
Test: ActivityLifecycleTests
Change-Id: Id8c02e9b49f9758aac616e37948570722d802de8
2018-04-20 12:58:49 -07:00
Jeff Sharkey
c3c8d16380 Give CTS a way to force-poll network stats.
Collecting network statistics is pretty heavy, which is why we're
throttling callers.  However, to keep CTS running fast, we provide a
way for tests to force a poll event, instead of making them wait for
the throttle timeout.

Bug: 77908520
Test: atest cts/tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java
Change-Id: Ia792f0cd495023366ff8c4839df54e7da2ae8331
2018-04-20 12:18:23 -06:00
Adrian Roos
4a3d9ff120 Merge "Defer resizing invisible stacks while drag resizing" into pi-dev am: 5e12ebfffd
am: 03d4aeda37

Change-Id: Ic4e21bcd38e09cd237fcf149ba308bfdbf77240d
2018-04-20 08:07:53 -07:00
Adrian Roos
03d4aeda37 Merge "Defer resizing invisible stacks while drag resizing" into pi-dev
am: 5e12ebfffd

Change-Id: I9252974e456740921a5778bd167e115d25e0d7bc
2018-04-20 08:00:08 -07:00
TreeHugger Robot
5e12ebfffd Merge "Defer resizing invisible stacks while drag resizing" into pi-dev 2018-04-20 14:43:38 +00:00
Adrian Roos
a6d6aab0e0 Defer resizing invisible stacks while drag resizing
Works around a source of jank when drag resizing in split
screen mode: instead of immediately resizing the (potentially
numerous) invisible secondary stacks, we defer that until
the user lets go of the handle.

Change-Id: I3b9faa83005fa86185d4e51b2849e3a826b7f6a9
Fixes: 78214347
Test: Open a gazillion (resizeable) tasks. Enter split screen. Drag handle, verify there is no jank
Test: atest RectTest
2018-04-20 15:09:02 +02:00
Peter Visontay
c4523fcd78 Merge "Add unit test for AppOps logic where a different op is used to control an app op." 2018-04-20 10:55:09 +00:00
Jeff Sharkey
3b25e5306c Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev am: ddb15c471c
am: 37bbe98e86

Change-Id: If8cfddaf96d28b3815dd6dca6aa52a7b9bd15da6
2018-04-19 20:08:03 -07:00