Commit Graph

47034 Commits

Author SHA1 Message Date
Hall Liu
ed31d718ad Merge "Fix usage of SubscriptionInfo ctor" 2018-07-10 00:08:14 +00:00
TreeHugger Robot
d7f4782bbc Merge "Handle special case slices" 2018-07-09 23:17:59 +00:00
TreeHugger Robot
d0ecbe1c33 Merge "ZenScheduleRule is valid even if it never occurs" 2018-07-09 22:28:55 +00:00
Salvador Martinez
78c3f368c3 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
2018-07-09 11:52:34 -07:00
Matthew Fritze
56b2bad05e 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
2018-07-09 11:21:25 -07:00
TreeHugger Robot
416a11855e Merge "Ask profile password before unifying to prevent untrusted reset" 2018-07-09 18:07:36 +00:00
Pavel Grafov
bf924bf8dd [automerger skipped] Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev am: dc2db6c6c9
am: 0886bf2271  -s ours

Change-Id: I77850967d6d28f6f638bb7327def038e365c653c
2018-07-09 10:54:22 -07:00
Pavel Grafov
0886bf2271 Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev
am: dc2db6c6c9

Change-Id: Id0362b8917255d81dfc83ecccc913aaa8c8349a2
2018-07-09 10:49:22 -07:00
TreeHugger Robot
0da46d618e Merge "Fix NPE when querying AmbientDisply through ExternalSeting" 2018-07-09 17:45:34 +00:00
TreeHugger Robot
dc2db6c6c9 Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev 2018-07-09 17:37:19 +00:00
Beverly
322a022442 ZenScheduleRule is valid even if it never occurs
Bug: 111167252
Test: make RunSettingsRoboTests -j40
Change-Id: Ibb564b2b0bca049afb17641e372276e58e487df2
2018-07-06 12:05:00 -04:00
Pavel Grafov
80d9020cc2 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
2018-07-06 14:40:10 +01:00
Bill Yi
797ab048bc [automerger skipped] Import translations. DO NOT MERGE am: e338a41dac -s ours
am: 1d8eba660f  -s ours

Change-Id: Id6f319ff37f94400ff9bd0379fe3da2567c1445f
2018-07-05 20:15:20 -07:00
Bill Yi
1d8eba660f [automerger skipped] Import translations. DO NOT MERGE
am: e338a41dac  -s ours

Change-Id: Ifb7f5f0271381fb960b74722457a58ddb82429cf
2018-07-05 20:03:16 -07:00
TreeHugger Robot
326132734a Merge "Import translations. DO NOT MERGE" 2018-07-05 04:17:36 +00:00
Bill Yi
e338a41dac Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id2d2fbe5bc2473fa6de24605fc5dbef0ae4e626f
2018-07-04 21:09:50 -07:00
TreeHugger Robot
9fa595f9c2 Merge changes from topic "q_dark_theme"
* changes:
  Move NightMode to Display settings
  Revert "Setting to change sysui theme"
2018-07-05 03:46:24 +00:00
Bill Yi
d845a6eb7a Import translations. DO NOT MERGE
Change-Id: I43de322478c209034c56686b9f2ca195ed1eb815
Auto-generated-cl: translation import
2018-07-04 19:51:56 -07:00
Pavel Grafov
f9429262d2 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 f14de789f4)
2018-07-04 13:02:03 +00:00
TreeHugger Robot
6098784bd5 Merge "Fix new user setting in a call" 2018-07-03 22:35:45 +00:00
Matthew Fritze
73537507ee [automerger skipped] Merge "Conditionally block battery percantage from search" into pi-dev am: ea97a66383
am: 76acf317a5  -s ours

Change-Id: I037b7f21c32474a769d4e870664b3e6d812148f3
2018-07-03 14:43:46 -07:00
Matthew Fritze
76acf317a5 Merge "Conditionally block battery percantage from search" into pi-dev
am: ea97a66383

Change-Id: If61f6e81aebd70c88e8fc75a525f53bed3ddbac1
2018-07-03 14:39:07 -07:00
TreeHugger Robot
ea97a66383 Merge "Conditionally block battery percantage from search" into pi-dev 2018-07-03 21:35:32 +00:00
Yongjiang Wu
5b120e7479 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
2018-07-03 14:20:39 -07:00
Android Build Merger (Role)
59fb3997b7 Merge "[automerger skipped] Merge "Unrestrict app if it been set as device admin app" into pi-dev am: f406fd7976 am: 13d51cd39a -s ours" 2018-07-03 20:55:43 +00:00
Lei Yu
861480bb49 [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
2018-07-03 13:54:42 -07:00
TreeHugger Robot
2fcd7a1cd3 Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." 2018-07-03 20:54:29 +00:00
TreeHugger Robot
666de4528b Merge "Using icon resource instead of icon bitmap in task description" 2018-07-03 20:47:16 +00:00
Lei Yu
13d51cd39a Merge "Unrestrict app if it been set as device admin app" into pi-dev
am: f406fd7976

Change-Id: Ic085eeee8d18999d56e7432bb13af342c0e00786
2018-07-03 13:42:30 -07:00
TreeHugger Robot
f406fd7976 Merge "Unrestrict app if it been set as device admin app" into pi-dev 2018-07-03 20:24:58 +00:00
Fan Zhang
b80aee943c Fix NPE when querying AmbientDisply through ExternalSeting
Bug: 110403709
Test: manual
Change-Id: Iee9994061c2b5c4bdd7aefe2d25a73e8ed4c9db0
2018-07-03 13:16:48 -07:00
Pavel Grafov
f14de789f4 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
2018-07-03 20:47:08 +01:00
Sunny Goyal
3c84675db7 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
2018-07-03 11:41:53 -07:00
Matthew Fritze
5e8005db42 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
2018-07-03 18:32:35 +00:00
Bill Yi
2d41659c32 [automerger skipped] Import translations. DO NOT MERGE am: 20fa188802 -s ours
am: 219ffa7e4e  -s ours

Change-Id: I56140bf865d34993a419e231aed874d3b81d4ce0
2018-07-02 19:30:53 -07:00
Bill Yi
219ffa7e4e [automerger skipped] Import translations. DO NOT MERGE
am: 20fa188802  -s ours

Change-Id: If51e678c0621df0150bb22fbcbee9b16964b1215
2018-07-02 19:27:51 -07:00
TreeHugger Robot
a0f175d5d8 Merge "Unrestrict app if it been set as device admin app" 2018-07-03 02:26:16 +00:00
TreeHugger Robot
710098c009 Merge "Misc tweaks to Indexable usage and tests." 2018-07-03 01:22:24 +00:00
TreeHugger Robot
8746d226d2 Merge "Add Feature Flag for Hearing Aid Profile" 2018-07-03 01:18:15 +00:00
Bill Yi
20fa188802 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 110524699
Change-Id: I80e63cc3fe9148fa5c6986dfc7b470e870d683ca
2018-07-02 18:11:20 -07:00
Lei Yu
f87897b84c Unrestrict app if it been set as device admin app
Bug: 110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf
Merged-In: I8229bee97d970f8b16351193cfd99ca05ff041bf
2018-07-02 18:07:25 -07:00
Kevin Chyn
0be7e64ffd 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)
2018-07-03 00:51:49 +00:00
Lei Yu
154af9a750 Unrestrict app if it been set as device admin app
Fix merge conlict in imports area

Bug: 110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf
2018-07-02 17:36:27 -07:00
Fan Zhang
78ea7da54c Misc tweaks to Indexable usage and tests.
- Make SettingsPreferenceFragment implement Indexable directly
- Add existing fragments that are SettingsPrefFragment but not Indexable
  to grandfather list.
- Fix "font size" fragment so it shows up in search properly.
- Remove duplicates for "lock screen display", "Screen saver".

Bug: 70720645
Test: robotests
Change-Id: I44ce0cac0fdf5e882b315861bb4bebc45dbe01e6
2018-07-02 16:46:23 -07:00
Stanley Tng
068c2547f6 Add Feature Flag for Hearing Aid Profile
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.

Test: Manual testing using Settings App
Change-Id: I16b51d7feabc914219c24731eb39a23bd1782571
2018-07-02 12:50:51 -07:00
TreeHugger Robot
636cc6caf9 Merge "Revert "Revert "First commit of dynamic home page feature""" 2018-07-02 17:21:01 +00:00
TreeHugger Robot
dbb465fbce Merge "Use getSummary in ZenStarredContactPrefController" 2018-07-02 17:15:35 +00:00
TreeHugger Robot
7ec809192c Merge "Add error handle for device that not support Bluetooth" 2018-07-02 16:49:16 +00:00
Beverly
0394ab2db0 Use getSummary in ZenStarredContactPrefController
Change-Id: I517d959371e7dde2eafef540fe000f177c064104
Fixes: 110989450
Test: ZenModeStarredContactsPreferenceControllerTest.java
2018-07-02 11:25:02 -04:00
Raff Tsai
082f8ee93c Revert "Revert "First commit of dynamic home page feature""
This reverts commit 457f6ef140.

Reason for revert: fix the color check in repohook

Test: make RunSettingsRoboTests

Change-Id: I1b466c412138dfb0f2bffc4270a8932fe3b81c94
2018-07-02 16:02:26 +08:00