Commit Graph

36038 Commits

Author SHA1 Message Date
Doris Ling
7c5ef68505 Merge "Fix crash when primary user select app installed by secondary user." into oc-dev
am: f9d9524574

Change-Id: I8b02370267e682ec17efcdf877c960e4189304ae
2017-05-06 00:02:54 +00:00
TreeHugger Robot
f9d9524574 Merge "Fix crash when primary user select app installed by secondary user." into oc-dev 2017-05-05 23:59:29 +00:00
Fan Zhang
4f8b9ebd58 Merge "Update tether summary text when airplane mode turns on" into oc-dev am: fe5d64feb0
am: 12cc6aad3c

Change-Id: If61ae23a8a908452f26c07c7908d1cdd365feb4a
2017-05-05 22:54:11 +00:00
Matthew Fritze
be0989cc61 Prevent race conditions after dropping database
Manual merge from: ag/2155898

Bug: 37501479
Test: make RunSettingsRoboTests
Change-Id: I02f8423c0ffc27abbb8ceb61a8c47d2f0796d0bb
2017-05-05 15:30:39 -07:00
TreeHugger Robot
52836c2191 Merge "Tether screen cleanup" 2017-05-05 22:27:58 +00:00
Fan Zhang
12cc6aad3c Merge "Update tether summary text when airplane mode turns on" into oc-dev
am: fe5d64feb0

Change-Id: I3bfc37b5bcdcf562faf2c528048e0a5c9427a8f2
2017-05-05 22:14:10 +00:00
Doris Ling
cc28cb372d Fix crash when primary user select app installed by secondary user.
- PackageManager.getPackageInfo() can return null. When trying to check
the app permission info, check for null package info and only process
the permission info when package info is available.
- Update usage of PackageManager.MATCH_UNINSTALLED_PACKAGES to
PackageManager.MATCH_ANY_USER, as the implementation for querying
packages for other users have been changed.
- Add PackageManager APIs used by AppStateAppOpsBridge to
IPackageManagerWrapper for test purpose.
- Change UserManager.get() to Context.getSystemService() to fix test
failure.

Change-Id: I52de924618aa252ffaae02b8f06ebe5b1d0def61
Fix: 37409266
Test: make RunSettingsRoboTests
2017-05-05 14:53:32 -07:00
TreeHugger Robot
fe5d64feb0 Merge "Update tether summary text when airplane mode turns on" into oc-dev 2017-05-05 21:52:07 +00:00
Suprabh Shukla
3dea2a9654 Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev am: 43083b4332
am: 3cadb80e8d

Change-Id: I6503c03ce91af9c3059135160abcdebe8d6fd6b8
2017-05-05 21:02:10 +00:00
Suprabh Shukla
3cadb80e8d Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
am: 43083b4332

Change-Id: I0df3898794b7bc7d5f31a33dbe4363e7502edb5c
2017-05-05 20:56:10 +00:00
TreeHugger Robot
43083b4332 Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev 2017-05-05 20:48:50 +00:00
TreeHugger Robot
4ae7816fb6 Merge "Revert "Remove custom layout for expandpreference."" 2017-05-05 20:41:49 +00:00
Fan Zhang
cdca63c4c7 Remove summary template in sleep timeout setting.
The template causes incorrect display in search, and it's not
needded by anyone in code.

Bug: 36101902
Test: rerun robotests
Change-Id: Ib399e15c799e08d377b124e88eda0b8f13494ed3
2017-05-05 13:40:36 -07:00
Roozbeh Pournader
15bebece94 Fix bidi direction of dialog and bidi-wrap service name
Previously, the name of the service being in a different direction
from the locale could cause bidi artifacts.

Now, we explicitly set the direction of the dialog to the locale, and
bidi-wrap the service name.

Test: Manual
Change-Id: I563299866b24a4ce90fa2d09781aa269d8de2edd
Fixes: 37761152
2017-05-05 13:40:05 -07:00
Fan Zhang
768824d7ad Update tether summary text when airplane mode turns on
Change-Id: I62c52351abbad50aeac077785afb21822773956e
Fix: 37934871
Test: make RunSettingsRoboTests
2017-05-05 12:55:11 -07:00
jackqdyulei
72cce92768 Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev am: 651261c7dd
am: 83e2511d45

Change-Id: I217d9f4a835f8352dcc7868067f09a5cd9b313ae
2017-05-05 19:35:55 +00:00
jackqdyulei
83e2511d45 Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev
am: 651261c7dd

Change-Id: I3c030efa5dc025dbeae7dfa059d58cd617f2691a
2017-05-05 19:24:11 +00:00
TreeHugger Robot
651261c7dd Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev 2017-05-05 18:55:29 +00:00
TreeHugger Robot
658599328e Merge "Change the logic for showing "App info" vs "show more"" 2017-05-05 18:36:42 +00:00
TreeHugger Robot
e3a6a8dbae Merge "Misc string updates" 2017-05-05 18:02:31 +00:00
jackqdyulei
01e690e377 Only use PROCESS_STATE_TOP as foreground time.
There are some miscalculations in state FOREGROUND_SERVICE and
FOREGROUND, so we move them out of the foreground time for now.

We will fix it after O and may add them back later.

Bug: 37000096
Test: RunSettingsRoboTests
Change-Id: Ic3f2f7fa69e8a213895c601630d1cca94fd32220
2017-05-05 10:23:09 -07:00
Fan Zhang
daad10b428 Change the logic for showing "App info" vs "show more"
Fix: 33265548
Test: robotests

The old logic shows "show more" when there is any recent app, new logic
first checks if there is any displayable recent app. Otherwise go back
to display "app info".

Change-Id: I485725eaa025b9e2cfffc5e9e1923aa771bb0e12
2017-05-05 09:39:24 -07:00
Fan Zhang
b2b6f7d20e Misc string updates
- Use BidiFormat wrap dp number
- Update billing cycle starting day string

Change-Id: Ifb57e3bb18ced72f91f30599a2ff7bcfa329630f
Fix: 37353209
Fix: 37657115
Fix: 38005987
Test: visual
2017-05-05 09:31:22 -07:00
Fan Zhang
3c8cad4a67 Revert "Remove custom layout for expandpreference."
This reverts commit 403ff14638.

Change-Id: Ia13843842d147da0ff52b0898c39393d5a113f06
2017-05-05 16:03:44 +00:00
Bill Yi
e50f314cbf Merge "Import translations. DO NOT MERGE" into oc-dev am: 2dcbda8004 -s ours
am: 9330470b28  -s ours

Change-Id: I41ce102c1bf82edb4f1e7474fa62a2c3f849d255
2017-05-05 12:23:47 +00:00
Bill Yi
9330470b28 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 2dcbda8004  -s ours

Change-Id: I8b39a0a9c01fff1d44613e98a390d257e3f2f858
2017-05-05 12:08:31 +00:00
TreeHugger Robot
2dcbda8004 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-05 11:58:06 +00:00
TreeHugger Robot
887207b2f7 Merge "Import translations. DO NOT MERGE" 2017-05-05 11:28:19 +00:00
Bill Yi
566095ecf9 Import translations. DO NOT MERGE
Change-Id: I7a4ac37a8286e8f977d70b26a11ee83105b611cf
Auto-generated-cl: translation import
2017-05-04 23:26:52 -07:00
Bill Yi
9d332b1552 Import translations. DO NOT MERGE
Change-Id: I640708da51131645bee0b3dd92968ead7a2e44f0
Auto-generated-cl: translation import
2017-05-04 23:09:38 -07:00
TreeHugger Robot
910f69c62a Merge "Add ability to speak to provider for enhanced estimate" 2017-05-05 04:50:14 +00:00
TreeHugger Robot
78a3f9a748 Merge "Fix randomly showing anomaly icon" 2017-05-05 03:13:58 +00:00
Salvador Martinez
126c032afa Add ability to speak to provider for enhanced estimate
Added code that checks if the provider for the enhanced battery
drain estimate is available. If it is available we use that
value instead of the one computed by BatteryStats.

Test: Robotests
Bug: 37753227
Change-Id: I7eae01b56f85d33eafc42ee0f18bb752779581b2
2017-05-04 20:05:53 -07:00
TreeHugger Robot
dd1339f412 Merge "Swipe for notification should be default-on in settings app" 2017-05-05 02:39:45 +00:00
Dan Sandler
5cfcd6d8db Merge "Defend against underspecified notifications." into oc-dev am: 1bba60cf0e
am: ca445e20af

Change-Id: I176281bc5367e671f056834720586fc0735072b4
2017-05-05 02:34:29 +00:00
Dan Sandler
ca445e20af Merge "Defend against underspecified notifications." into oc-dev
am: 1bba60cf0e

Change-Id: I5aec6c34bd9c8b985637d38a73a21db88e6642a9
2017-05-05 02:25:31 +00:00
TreeHugger Robot
161e356de4 Merge "Limit the summary text for App info->Permissions to one line." 2017-05-05 02:22:50 +00:00
TreeHugger Robot
1bba60cf0e Merge "Defend against underspecified notifications." into oc-dev 2017-05-05 02:21:11 +00:00
Suprabh Shukla
c1f10cb9c6 Adding SecureTouchListener to DeviceAdminAdd
Dropping any touches to the activate admin button if any other
window is partly or wholly obscuring the device admin add window

Test: Cts Verifier -> Device Administration -> Device Admin Tapjacking
Test

Bug: 35056974
Change-Id: I048ecc1944c13fea624eede7861d39df2beeb393
2017-05-04 18:50:33 -07:00
TreeHugger Robot
81586b5681 Merge "Add impl for force stop action" 2017-05-05 01:27:24 +00:00
jackqdyulei
3bd2420911 Fix randomly showing anomaly icon
Sometimes PowerGaugePreference will show anomaly icon when they
shouldn't. I think it is because PreferenceViewHolder has cache
about the previous data.

This cl fixes it by setting compound drawable as 0 when
showAnomalyIcon is false.

Bug: 36924669
Test: RunSettingsRoboTests
Change-Id: I5ea0dc307aafcce386c84963e618d1213de5ec19
2017-05-04 18:08:31 -07:00
Ajay Panicker
7ab36fb747 Merge "Limit btsnoop file size (4/9)" into oc-dev am: b72a8b5ab3 -s ours
am: bb98791b80  -s ours

Change-Id: I43c8352e07427f7c2a42125516de0c7f8e52fdf2
2017-05-05 00:17:30 +00:00
Ajay Panicker
bb98791b80 Merge "Limit btsnoop file size (4/9)" into oc-dev
am: b72a8b5ab3  -s ours

Change-Id: I2ecb2e2c297953eba1f515e636c6204e8474591e
2017-05-04 23:21:19 +00:00
Doris Ling
e249c00a3c Limit the summary text for App info->Permissions to one line.
- the summary text is the list of permissions that the app has. It is
dynamic, and when the list is long, setting the summary will expand
the text view height and make the page launch looks janky. We cannot
pre-set the summary to certain line, since the permissions list for each
app is unknown beforehand. To avoid the jank, limit the summary to 1
line and truncate it if necessary.

Change-Id: I1acb1ac9f46c55808ce03626e53cf71502231ab2
Fix: 36413664
Test: make RunSettingsRoboTests
2017-05-04 23:20:32 +00:00
Ajay Panicker
b72a8b5ab3 Merge "Limit btsnoop file size (4/9)" into oc-dev 2017-05-04 22:56:23 +00:00
Daniel Sheng
7b9e3fdd08 Camera lift preference now saves correctly
Bug: 37751057
Test: manual + make RunSettingsRoboTests

Fixed issue where camera lift preference was saving the opposite value
of what it was supposed to. Added test to cover saving of value on
preference change.

Change-Id: I2d2c454eb478afb7f73519f9f05c9a9a1933938b
2017-05-04 15:14:39 -07:00
TreeHugger Robot
cdf5fe0d64 Merge "Force refresh language & input fragment title onResume." 2017-05-04 21:58:12 +00:00
TreeHugger Robot
c2e6c82c66 Merge "Add control for the anomaly detection" 2017-05-04 21:32:31 +00:00
Daniel Nishi
8381755263 Fix Settings crash in Storage settings.
If you tap aggressively before the fragment has fully initialized, it
was possible to NPE. This null-checks to avoid this.

Change-Id: I3488245d230cf1e16b23e34614c8e6b43ea14ff1
Fixes: 37945253
Test: Robotest
2017-05-04 14:12:45 -07:00
Julia Reynolds
5c5830f865 Merge "Only show one copy of each preference" into oc-dev am: 31de48193e
am: c265993528

Change-Id: I705f27b9692671a2a36324e794e098243fa9275b
2017-05-04 20:19:01 +00:00