OSDN Git Service
TreeHugger Robot [Fri, 13 Jul 2018 21:11:26 +0000 (21:11 +0000)]
Merge "Clean up: fix incorrect @VisibleForTesting imports"
Jordan Liu [Fri, 13 Jul 2018 20:57:52 +0000 (20:57 +0000)]
Merge "Preserve leading 0s in mcc mnc"
Fan Zhang [Fri, 13 Jul 2018 20:06:24 +0000 (13:06 -0700)]
Clean up: fix incorrect @VisibleForTesting imports
Test: rebuild and robotests
Change-Id: I33d7ee1c0622c01f592920baaf01d44ad19d9a13
Hall Liu [Fri, 13 Jul 2018 18:41:21 +0000 (11:41 -0700)]
Fix usage of SubscriptionInfo ctor am:
f0072b7345
am:
f9b76dfda1
Change-Id: I73d41c06ee5006310ccc5b0ece5b73919370231f
Hall Liu [Fri, 13 Jul 2018 18:27:19 +0000 (11:27 -0700)]
Fix usage of SubscriptionInfo ctor
am:
f0072b7345
Change-Id: I0ec1335abfef8fc30c638636e3bb1ac24a221743
Jordan Liu [Fri, 13 Jul 2018 17:43:47 +0000 (10:43 -0700)]
Preserve leading 0s in mcc mnc
Fixes:
79408450
Test: ApnEditorTest.java
Change-Id: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
TreeHugger Robot [Fri, 13 Jul 2018 17:20:48 +0000 (17:20 +0000)]
Merge "Fix 2 tests broken by fragment migration."
Hall Liu [Tue, 12 Jun 2018 22:20:50 +0000 (15:20 -0700)]
Fix usage of SubscriptionInfo ctor
Use string arguments instead of ints for mcc/mnc
Bug:
35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit
02c5f3c7acb1fd6a33168fc299411eb46bf42685)
hughchen [Thu, 5 Jul 2018 06:59:57 +0000 (14:59 +0800)]
Use corresponding profile to get active bluetooth device
- Do not use streamType to decide which active device should return.
Base on b/
80453878 comment#6, the steamType intent will only be sent
if an action is made on stream volume or a media route is changed:
For instance when a call to setStreamVolume() or getDeviceForStream() is made.
It is not broadcast on actual routing changes.
It should not be used as an indicator that the route changed during a call.
There is no callback API and the only option is polling with getDeviceForStream().
- Use corresponding profile to get active bluetooth device
instead of streamType
- Add test to verify the result of findActiveDevice()
eg:
1. A2dp device active, hearing aid device not active : return a2dp device
2. A2dp device not active, hearing aid device not active : return null
3. hfp device active, hearing aid device not active : return hfp device
4. hfp device not active, hearing aid device not active : return null
Bug:
80453878
Test: make -j42 RunSettingsRoboTests
Change-Id: I5bd94899a5d508e60ce911da9689b727ad1fc20c
Hall Liu [Fri, 13 Jul 2018 04:15:24 +0000 (21:15 -0700)]
Fix usage of SubscriptionInfo ctor
am:
1b3985010d
Change-Id: Ie4c85110eb1f9de5c8d7aba2f76b076b622872e3
TreeHugger Robot [Fri, 13 Jul 2018 01:09:39 +0000 (01:09 +0000)]
Merge "Fix crash when starting daydream setting with wrong context"
Hall Liu [Tue, 12 Jun 2018 22:20:50 +0000 (15:20 -0700)]
Fix usage of SubscriptionInfo ctor
Use string arguments instead of ints for mcc/mnc
Bug:
35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit
02c5f3c7acb1fd6a33168fc299411eb46bf42685)
Xiangyu/Malcolm Chen [Fri, 13 Jul 2018 00:09:12 +0000 (00:09 +0000)]
Merge "Fix bug of phoneListener always listens to default subId in WFC."
Fan Zhang [Thu, 12 Jul 2018 23:38:26 +0000 (16:38 -0700)]
Fix 2 tests broken by fragment migration.
Change-Id: Ieda64e5c2ed9ca43158ce361f79eff9c6b35f464
Fixes:
111194289
Test: robotests
Malcolm Chen [Tue, 26 Jun 2018 21:39:04 +0000 (14:39 -0700)]
Fix bug of phoneListener always listens to default subId in WFC.
In WiFi calling settings, although each WifiCallingSettingsForSub
instance has its mSubId, the mPhoneStateListener always listens to
state of default subId, which is incorrect. This is to fix that.
Bug:
109787945
Test: In DSDS device, open WFC settings. Make phone call using default
voice phone, and check that WFC setting tab of the other phone is
not greyed out.
Change-Id: I126047c6099bf156b40e0145aa55df0fdf8ef882
Fan Zhang [Thu, 12 Jul 2018 20:22:23 +0000 (13:22 -0700)]
Fix crash when starting daydream setting with wrong context
The context must be a UI context. This is a new requirement in P.
(Also converted the CurrentDream controller to be slice compatible)
Change-Id: I28874f296da617f4cedf6706b0663b76671f1780
Fixes:
111375261
Test: robotests
TreeHugger Robot [Thu, 12 Jul 2018 20:04:33 +0000 (20:04 +0000)]
Merge "Fix a crash when setting lock pattern in SUW"
Fan Zhang [Thu, 12 Jul 2018 19:06:17 +0000 (12:06 -0700)]
Fix a crash when setting lock pattern in SUW
Change-Id: Ic2f1bc5946014d126f2d600966764e1f00be6559
Fixes:
111381755
Test: manual in SUW
Fan Zhang [Thu, 12 Jul 2018 17:58:13 +0000 (10:58 -0700)]
Remove NewDeviceIntroSuggestion
The functionality is entirely replaced by other apps.
Change-Id: Id3d425cf92a07bae070cd22c0d726aba0472dd5d
Fixes:
111195449
Test: robotest
Raff Tsai [Thu, 12 Jul 2018 09:32:46 +0000 (17:32 +0800)]
Modify icon color and fix search bar corner
- add android:colorAccent attribute in theme
- fix wrong xmlns
Change-Id: Ia8a0a715edf40959c952f8982298a830bedfa156
Fixes:
111359684
Test: manual
TreeHugger Robot [Thu, 12 Jul 2018 08:16:32 +0000 (08:16 +0000)]
Merge "Add new widget SingleTargetGearPreference"
tmfang [Thu, 28 Jun 2018 14:57:12 +0000 (22:57 +0800)]
Settings Fragment Migration (Fix test cases)
Fix all Roboletric test cases.
In this CL, some test cases are broken.
So, We ignored these test cases temporarily.
Test: make RunSettingsRoboTests -j56
Bug:
110259478
Change-Id: I1a3075438a614432a2de4f2d96d8abf9a83ce58c
tmfang [Thu, 28 Jun 2018 03:39:05 +0000 (11:39 +0800)]
Settings Fragment Migration (Build pass app)
This patch focused on fixing compile errors and some runtime errors.
Test: We can't test it now. But we will have an integration test later.
Bug:
110259478
Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b
tmfang [Tue, 26 Jun 2018 11:01:57 +0000 (19:01 +0800)]
Settings Fragment Migration (Change imports)
This commit *only* changes imports and optimize imports.
We don't do anything else.
This patch can't compile pass and run test case.
We will update other patches to fix these problem.
Change list.
1. import android.app.Fragment; ->
import androidx.fragment.app.Fragment;
2. import android.app.DialogFragment; ->
import androidx.fragment.app.DialogFragment;
3. import android.app.ListFragment; ->
import androidx.fragment.app.ListFragment;
4. import android.app.LoaderManager; ->
import androidx.loader.app.LoaderManager;
5. import android.content.AsyncTaskLoader; ->
import androidx.loader.content.AsyncTaskLoader;
6. import android.content.Loader; ->
import androidx.loader.content.Loader;
7. import android.app.FragmentTransaction; ->
import androidx.fragment.app.FragmentTransaction;
8. import android.app.FragmentManager; ->
import androidx.fragment.app.FragmentManager;
9. import android.app.LoaderManager.LoaderCallbacks; ->
import androidx.loader.app.LoaderManager.LoaderCallbacks;
Bug:
110259478
Test: Can't test it.
Change-Id: I0a3f98fff34a3494a839c3c42aeabcec3df2c8b3
TreeHugger Robot [Thu, 12 Jul 2018 00:50:00 +0000 (00:50 +0000)]
Merge "Add some pages to search index."
Fan Zhang [Wed, 11 Jul 2018 16:41:39 +0000 (09:41 -0700)]
Add some pages to search index.
* Notification access page
* VR Listener page
* Feature flags in dev options
* QS Tile developer options
* User dictionary
* Billing cycle
* Some accessibilty pages
Bug:
70720645
Test: robotests
Change-Id: I4f7d3d65b2803cebf178ac345a79721232df707c
xiamin [Wed, 11 Jul 2018 23:13:36 +0000 (16:13 -0700)]
Merge "new password shouldn't be empty string" am:
dd7bd6b15a am:
bfb61ed2ed
am:
7ed2928876
Change-Id: I818afc8d73bc0f987ab549a29300cc07b1ef1b89
Lei Yu [Wed, 11 Jul 2018 22:23:36 +0000 (22:23 +0000)]
Merge "Add sanity check method for BatteryTip"
xiamin [Wed, 11 Jul 2018 22:16:20 +0000 (15:16 -0700)]
Merge "new password shouldn't be empty string" am:
dd7bd6b15a
am:
bfb61ed2ed
Change-Id: I97c536fc0aaaec4e317944564519a908a762e9f5
xiamin [Wed, 11 Jul 2018 21:51:09 +0000 (14:51 -0700)]
Merge "new password shouldn't be empty string"
am:
dd7bd6b15a
Change-Id: I8e3fb81aba487df22573b6fa67a36e2973c9a54b
TreeHugger Robot [Wed, 11 Jul 2018 21:21:13 +0000 (21:21 +0000)]
Merge "Clean up: remove preference_category_no_title."
Treehugger Robot [Wed, 11 Jul 2018 20:23:29 +0000 (20:23 +0000)]
Merge "new password shouldn't be empty string"
TreeHugger Robot [Wed, 11 Jul 2018 20:19:44 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE"
Fan Zhang [Wed, 11 Jul 2018 18:44:51 +0000 (11:44 -0700)]
Clean up: remove preference_category_no_title.
We already have a custom category layout that does the same thing.
Test: visual
Change-Id: Ice6daea8b2d9a14e9b013cf4175ce00f5ab1cc8d
Bill Yi [Wed, 11 Jul 2018 17:55:29 +0000 (10:55 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
11ebb14241 -s ours
am:
78f73c3352 -s ours
Change-Id: I56573cf23cf9cfb1f849f207afdcb3c63f2445e5
Bill Yi [Wed, 11 Jul 2018 17:48:27 +0000 (10:48 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
11ebb14241 -s ours
Change-Id: Idb03e6fbae91f20729a4ebbd504255c99bbba606
Bill Yi [Wed, 11 Jul 2018 05:28:21 +0000 (22:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id9deb2f66c09d1b17c35d8226673768d40d7eef7
Bill Yi [Wed, 11 Jul 2018 04:10:39 +0000 (21:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8e05b06302b091c99cfac9babc6a7ef4abafed17
Auto-generated-cl: translation import
Kevin Chyn [Wed, 11 Jul 2018 03:27:02 +0000 (03:27 +0000)]
Merge "4/n: Add basic enrollment for Face"
TreeHugger Robot [Wed, 11 Jul 2018 01:46:15 +0000 (01:46 +0000)]
Merge "Add a few pages to search index."
Kevin Chyn [Wed, 11 Jul 2018 01:43:17 +0000 (01:43 +0000)]
Merge "Fixed various strings & limits"
Kevin Chyn [Fri, 29 Jun 2018 00:59:32 +0000 (17:59 -0700)]
4/n: Add basic enrollment for Face
Bug:
110589286
Test: fingerprint enrolling still works
Test: enrollment flow with and without a pin set up still works properly
Test: enrollment continues when configuration changes, stops otherwise
Change-Id: I39f76c7f1a16e9533cef573f87cf4b81cb20cb18
Lei Yu [Mon, 9 Jul 2018 21:53:55 +0000 (14:53 -0700)]
Add sanity check method for BatteryTip
This method is used to check whether data in battery tip is still
valid. If not, try recover the data or dismiss the tip.
Change-Id: Idc9e4d49f99e33d3f5e82e694dc78227fc1da41c
Fixes:
111218723
Test: RunSettingsRoboTests
Fan Zhang [Tue, 10 Jul 2018 22:46:31 +0000 (15:46 -0700)]
Add a few pages to search index.
- Data saver
- A few special permission access pages
- Picture-in-picture
- Premium sms
- do not disturb access
- And a unrelated cleanup: move EmptyTextFragment from
notification/ to widget/
Bug:
70720645
Test: robotests
Change-Id: I6a87f712bf81f9fd32fa9a3826fba851ca748409
Lei Yu [Tue, 10 Jul 2018 23:01:13 +0000 (23:01 +0000)]
Merge "Remove DeviceProfilesSettings"
TreeHugger Robot [Tue, 10 Jul 2018 20:36:44 +0000 (20:36 +0000)]
Merge "Update auto brightness pref summary to show on/off"
jackqdyulei [Tue, 10 Jul 2018 18:26:35 +0000 (11:26 -0700)]
Remove DeviceProfilesSettings
It's not used anymore since we have a bt detail page.
Change-Id: Ib2ecfabf544913701ca613048e9f37e297ffff18
Fixes:
111305587
Test: robo still pass
Salvador Martinez [Tue, 10 Jul 2018 19:46:09 +0000 (12:46 -0700)]
Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev am:
4804c2c7a5
am:
94bebd2f80
Change-Id: Ia5274cd69ce2d6208cf9490b7a41ec080090cb6f
Salvador Martinez [Tue, 10 Jul 2018 19:41:50 +0000 (12:41 -0700)]
Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev
am:
4804c2c7a5
Change-Id: I81b835965ee39d8c877e834820ca21543d18d654
TreeHugger Robot [Tue, 10 Jul 2018 19:33:29 +0000 (19:33 +0000)]
Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev
Fan Zhang [Tue, 10 Jul 2018 18:25:18 +0000 (11:25 -0700)]
Update auto brightness pref summary to show on/off
Change-Id: I7914957cc9dbffcc12e34fc714bb9c37783a4f33
Fixes:
109885418
Test: robotests
TreeHugger Robot [Tue, 10 Jul 2018 17:45:28 +0000 (17:45 +0000)]
Merge "Update airplane mode pref key so it's sliceable."
Kevin Chyn [Tue, 10 Jul 2018 17:20:43 +0000 (10:20 -0700)]
Fixed various strings & limits
Fixes:
111170847
Fixes:
111137762
Fixes:
111174545
Fixes:
111174330
Fixes:
111174332
Fixes:
111173644
Test: builds
Change-Id: Ia39fe7b70a1bb5ac6f71c8244268aab51deed0ee
Fan Zhang [Tue, 10 Jul 2018 16:46:32 +0000 (09:46 -0700)]
Update airplane mode pref key so it's sliceable.
Bug:
110403709
Test: rebuild slice db
Change-Id: I16e13ec67705754fc55d8c797f94e407f617722c
xiamin [Tue, 10 Jul 2018 02:48:56 +0000 (10:48 +0800)]
new password shouldn't be empty string
enter "Home screen backup password" in "Developer Settings",
do nothings and then click "Set backup password", There will
be a toast display "New backup password set".
The new password field cannot be empty.
Bug: https://partnerissuetracker.corp.google.com/u/2/issues/
111261338
Test: empty string can not be set as a password
Signed-off-by: xiamin <xiamin@xiaomi.com>
TreeHugger Robot [Tue, 10 Jul 2018 02:11:34 +0000 (02:11 +0000)]
Merge "Fix NPE when querying AmbientDisply through ExternalSeting"
Fan Zhang [Mon, 9 Jul 2018 23:45:22 +0000 (16:45 -0700)]
Fix NPE when querying AmbientDisply through ExternalSeting
Bug:
110403709
Test: manual
Change-Id: I5c037b010e296cbd011f8c141932e6befd341c99
Hall Liu [Tue, 10 Jul 2018 00:08:14 +0000 (00:08 +0000)]
Merge "Fix usage of SubscriptionInfo ctor"
TreeHugger Robot [Mon, 9 Jul 2018 23:17:59 +0000 (23:17 +0000)]
Merge "Handle special case slices"
TreeHugger Robot [Mon, 9 Jul 2018 22:28:55 +0000 (22:28 +0000)]
Merge "ZenScheduleRule is valid even if it never occurs"
Salvador Martinez [Mon, 9 Jul 2018 18:52:34 +0000 (11:52 -0700)]
Fix incorrect method call to wifiManager in Tether
In the WifiTetherApBandController the incorrect method was
being called to check if the device is 5Ghz compatible. We
were calling is5GhzBandSupported directly, but we were
supposed to call isDualBandSupported instead.
Test: robotests updated
Bug:
110793581
Change-Id: I61d3ff10abedde6196b8e29591ebfd3272dbbcd9
Matthew Fritze [Tue, 12 Jun 2018 00:20:53 +0000 (17:20 -0700)]
Handle special case slices
Create a handler for any slice that doesn't include anything
from a PreferenceController.
Test: robotests
Change-Id: If23947152d61877537d0cac6240e96b9ab977bce
Bug:
80263568
TreeHugger Robot [Mon, 9 Jul 2018 18:07:36 +0000 (18:07 +0000)]
Merge "Ask profile password before unifying to prevent untrusted reset"
Pavel Grafov [Mon, 9 Jul 2018 17:54:22 +0000 (10:54 -0700)]
[automerger skipped] Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev am:
dc2db6c6c9
am:
0886bf2271 -s ours
Change-Id: I77850967d6d28f6f638bb7327def038e365c653c
Pavel Grafov [Mon, 9 Jul 2018 17:49:22 +0000 (10:49 -0700)]
Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev
am:
dc2db6c6c9
Change-Id: Id0362b8917255d81dfc83ecccc913aaa8c8349a2
TreeHugger Robot [Mon, 9 Jul 2018 17:45:34 +0000 (17:45 +0000)]
Merge "Fix NPE when querying AmbientDisply through ExternalSeting"
TreeHugger Robot [Mon, 9 Jul 2018 17:37:19 +0000 (17:37 +0000)]
Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev
Beverly [Fri, 6 Jul 2018 16:05:00 +0000 (12:05 -0400)]
ZenScheduleRule is valid even if it never occurs
Bug:
111167252
Test: make RunSettingsRoboTests -j40
Change-Id: Ibb564b2b0bca049afb17641e372276e58e487df2
Pavel Grafov [Wed, 20 Jun 2018 16:20:05 +0000 (17:20 +0100)]
Ask profile password before unifying to prevent untrusted reset
Test: make -j RunSettingsRoboTests
Test: manual, unify when profile lock is compliant
Test: manual, unify when profile lock is not compliant
Test: manual, unify when profile lock is empty
Fixes:
110262879
Change-Id: I0dfa885f2a0e44e09c217b3e7766b367f1340c9e
Bill Yi [Fri, 6 Jul 2018 03:15:20 +0000 (20:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
e338a41dac -s ours
am:
1d8eba660f -s ours
Change-Id: Id6f319ff37f94400ff9bd0379fe3da2567c1445f
Bill Yi [Fri, 6 Jul 2018 03:03:16 +0000 (20:03 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e338a41dac -s ours
Change-Id: Ifb7f5f0271381fb960b74722457a58ddb82429cf
TreeHugger Robot [Thu, 5 Jul 2018 04:17:36 +0000 (04:17 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 5 Jul 2018 04:09:50 +0000 (21:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id2d2fbe5bc2473fa6de24605fc5dbef0ae4e626f
TreeHugger Robot [Thu, 5 Jul 2018 03:46:24 +0000 (03:46 +0000)]
Merge changes from topic "q_dark_theme"
* changes:
Move NightMode to Display settings
Revert "Setting to change sysui theme"
Bill Yi [Thu, 5 Jul 2018 02:51:56 +0000 (19:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I43de322478c209034c56686b9f2ca195ed1eb815
Auto-generated-cl: translation import
Pavel Grafov [Tue, 3 Jul 2018 19:31:42 +0000 (20:31 +0100)]
Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS.
Only primary user can set LOCK_SCREEN_SHOW_NOTIFICATIONS,
profile can only set notifications to be redacted. When the
user changes notification settings for a work app, this class
is invoked from the profile, meaning it attempts to read
LOCK_SCREEN_SHOW_NOTIFICATIONS for the profile, which is not
there. As a result the function always returs 0 for work apps.
Bug:
111112011
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
Change-Id: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
Merged-In: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
(cherry picked from commit
f14de789f4cc7d145e6011e5a5562876e25c3f31)
TreeHugger Robot [Tue, 3 Jul 2018 22:35:45 +0000 (22:35 +0000)]
Merge "Fix new user setting in a call"
Matthew Fritze [Tue, 3 Jul 2018 21:43:46 +0000 (14:43 -0700)]
[automerger skipped] Merge "Conditionally block battery percantage from search" into pi-dev am:
ea97a66383
am:
76acf317a5 -s ours
Change-Id: I037b7f21c32474a769d4e870664b3e6d812148f3
Matthew Fritze [Tue, 3 Jul 2018 21:39:07 +0000 (14:39 -0700)]
Merge "Conditionally block battery percantage from search" into pi-dev
am:
ea97a66383
Change-Id: If61f6e81aebd70c88e8fc75a525f53bed3ddbac1
TreeHugger Robot [Tue, 3 Jul 2018 21:35:32 +0000 (21:35 +0000)]
Merge "Conditionally block battery percantage from search" into pi-dev
Yongjiang Wu [Wed, 12 Oct 2016 05:35:38 +0000 (13:35 +0800)]
Fix new user setting in a call
In a call, the flag of UserManager is changed, then "Add user" and
"Guest" items in Settings are still enabled.
To fix this issue, these items will be disabled according to
"UserManager#canSwitchUsers".
Bug:
80447394
Test: make RunSettingsRoboTests ROBOTEST_FILTER=UserSettingsTest
Change-Id: Ib4c754603418528f5c6f1c78b8aabf33e863c8b9
Android Build Merger (Role) [Tue, 3 Jul 2018 20:55:43 +0000 (20:55 +0000)]
Merge "[automerger skipped] Merge "Unrestrict app if it been set as device admin app" into pi-dev am:
f406fd7976 am:
13d51cd39a -s ours"
Lei Yu [Tue, 3 Jul 2018 20:54:42 +0000 (13:54 -0700)]
[automerger skipped] Merge "Unrestrict app if it been set as device admin app" into pi-dev am:
f406fd7976
am:
13d51cd39a -s ours
Change-Id: Ifd51d45a75bb245c2853773a966c6accb226b5ba
TreeHugger Robot [Tue, 3 Jul 2018 20:54:29 +0000 (20:54 +0000)]
Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS."
TreeHugger Robot [Tue, 3 Jul 2018 20:47:16 +0000 (20:47 +0000)]
Merge "Using icon resource instead of icon bitmap in task description"
Lei Yu [Tue, 3 Jul 2018 20:42:30 +0000 (13:42 -0700)]
Merge "Unrestrict app if it been set as device admin app" into pi-dev
am:
f406fd7976
Change-Id: Ic085eeee8d18999d56e7432bb13af342c0e00786
TreeHugger Robot [Tue, 3 Jul 2018 20:24:58 +0000 (20:24 +0000)]
Merge "Unrestrict app if it been set as device admin app" into pi-dev
Fan Zhang [Tue, 3 Jul 2018 19:42:33 +0000 (12:42 -0700)]
Fix NPE when querying AmbientDisply through ExternalSeting
Bug:
110403709
Test: manual
Change-Id: Iee9994061c2b5c4bdd7aefe2d25a73e8ed4c9db0
Pavel Grafov [Tue, 3 Jul 2018 19:31:42 +0000 (20:31 +0100)]
Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS.
Only primary user can set LOCK_SCREEN_SHOW_NOTIFICATIONS,
profile can only set notifications to be redacted. When the
user changes notification settings for a work app, this class
is invoked from the profile, meaning it attempts to read
LOCK_SCREEN_SHOW_NOTIFICATIONS for the profile, which is not
there. As a result the function always returs 0 for work apps.
Bug:
111112011
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
Change-Id: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
Sunny Goyal [Tue, 3 Jul 2018 18:39:00 +0000 (11:39 -0700)]
Using icon resource instead of icon bitmap in task description
Bug:
110739775
Test: Verfied that the icon is displayed correctly if icon-shape override is applied in laucher
Change-Id: Ice7e15a982479960b2644defa33dbdb036c6bd42
Matthew Fritze [Mon, 2 Jul 2018 18:22:59 +0000 (11:22 -0700)]
Conditionally block battery percantage from search
The PowerUsageSummary fragment doesn't use the regular pattern
of a static method to build preference controllers, which can be
accessed by both DashboardFragment and BaseSearchIndexProvider,
because it depends on the Activity & Fragment in the creation of
the preference controllers.
The correct & long-term solution here would be to move those dependencies
out of the getPreferenceControllers method, such that the we could use a
static buildPreferenceControllers method, as seen in DisplaySettings.java.
In the mean time, we know that BatteryPercentagePrefController should not
show up on devices, so we conditionally add the the preference controller's
into getNonIndexableKeys method based on controller Availability, which
BasePreferenceController normally does automatically with a getPreferenceController
method in the host fragment's SEARCH_INDEX_DATA_PROVIDER.
Since this is a short-term solution, it should not be merged into master, and thus
I am not marking the bug as fixed.
Bug:
110894466
Test: Robotests
Change-Id: I06f814571d0b72fbf020dd11a9d23a9eb9907bfd
Merged-In: I5993d332dbd218c981ef5432aebb735d0000f67a
Bill Yi [Tue, 3 Jul 2018 02:30:53 +0000 (19:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
20fa188802 -s ours
am:
219ffa7e4e -s ours
Change-Id: I56140bf865d34993a419e231aed874d3b81d4ce0
Bill Yi [Tue, 3 Jul 2018 02:27:51 +0000 (19:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
20fa188802 -s ours
Change-Id: If51e678c0621df0150bb22fbcbee9b16964b1215
TreeHugger Robot [Tue, 3 Jul 2018 02:26:16 +0000 (02:26 +0000)]
Merge "Unrestrict app if it been set as device admin app"
TreeHugger Robot [Tue, 3 Jul 2018 01:22:24 +0000 (01:22 +0000)]
Merge "Misc tweaks to Indexable usage and tests."
TreeHugger Robot [Tue, 3 Jul 2018 01:18:15 +0000 (01:18 +0000)]
Merge "Add Feature Flag for Hearing Aid Profile"
Bill Yi [Tue, 3 Jul 2018 01:11:20 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
110524699
Change-Id: I80e63cc3fe9148fa5c6986dfc7b470e870d683ca
Lei Yu [Thu, 28 Jun 2018 21:08:42 +0000 (14:08 -0700)]
Unrestrict app if it been set as device admin app
Bug:
110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf
Merged-In: I8229bee97d970f8b16351193cfd99ca05ff041bf
Kevin Chyn [Tue, 3 Jul 2018 00:51:49 +0000 (00:51 +0000)]
Merge changes from topic "face-settings"
* changes:
3/n: Remove all faces when Pin/Pattern/Pass is removed
2/n: Add face to ChooseLock*
1/n Start adding Face settings (base, intro)
Lei Yu [Thu, 28 Jun 2018 21:08:42 +0000 (14:08 -0700)]
Unrestrict app if it been set as device admin app
Fix merge conlict in imports area
Bug:
110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf