Commit Graph

47118 Commits

Author SHA1 Message Date
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
Kevin Chyn
0b95687f59 3/n: Remove all faces when Pin/Pattern/Pass is removed
Bug: 110589286

Test: set up fingerprint + pass, change lock screen to swipe
      no regression, fingerprints are all removed, activity is finished()

Change-Id: Ie5e586b2f9d2c982d929e5c5b80911897889e7a4
2018-06-29 18:19:34 -07:00
Kevin Chyn
81dc0295d7 2/n: Add face to ChooseLock*
Bug: 110589286

Test: manual
Test: make -j56 RunSettingsRoboTests
Test: setting up new fingerprint still works
Change-Id: I1b7d2bb6bb417dae2c99e5abeb68d3f694cb3cb8
2018-06-29 18:19:34 -07:00
Kevin Chyn
4882e875ae 1/n Start adding Face settings (base, intro)
This change refactors common biometric settings code as well to minimize
duplicated code in areas such as:
    Preference Controller
    EnrollBase
    EnrollIntro

This change also updates ChooseLock to have Face + Pin/Pattern/Pass

Bug: 110589286

Test: Fingerprint settings/enrollment still works
Test: make -j56 RunSettingsRoboTests
Change-Id: Ie35406a01b85617423beece42683ac086e9bc4a7
2018-06-29 18:19:34 -07:00
Hall Liu
02c5f3c7ac Fix usage of SubscriptionInfo ctor
Use string arguments instead of ints for mcc/mnc

Bug: 35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
2018-06-29 17:09:52 -07:00
Doris Ling
8700777839 Fix continous playing of gesture animation video.
In the gesture settings, we listen to surface texture updates to
determine when both the view and video is ready, and we auto play the
animation video. However, sometimes, the video listener will receive
the surface texture updates after the settings activity is being paused,
in which case, the video will continue to play until the user navigate
back to that gesture settings page.

In onSurfaceTextureUpdated(), check for view visibility before we try to
update anything to avoid unnecessary operation.

Change-Id: I46474c9f461d5705f599deb8b2535d8505f2fe75
Bug: 110923173
Test: make RunSettingsRoboTests
2018-06-29 14:22:36 -07:00
Jeff Sharkey
4baf53228b Merge "Disable "internal" when adoption not possible." 2018-06-29 20:50:48 +00:00
Ivan Chiang
ca0101fe1f Add new widget SingleTargetGearPreference
Add the new widget SingleTargetGearPreference
with a gear on the side.

Bug: 110238502
Test: m -j SettingsRoboTests RunSettingsRoboTests
Change-Id: I7463e5b4fdd8bc86d0ab6cb930f0053ce0fa79fa
2018-06-29 16:06:28 +08:00
TreeHugger Robot
6acf0510fb Merge "Revert "First commit of dynamic home page feature"" 2018-06-29 01:24:49 +00:00
Lei Yu
457f6ef140 Revert "First commit of dynamic home page feature"
This reverts commit 3515bc7259.

Reason for revert: CLs in this topic break color check in repohook.

Bug: 110960820
Change-Id: I5934b6baf65515ebbc4e4660ed99747dd581f526
2018-06-29 00:21:14 +00:00
Lucas Dupin
a7ea18a6ce Move NightMode to Display settings
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DarkUIPreferenceController
Bug: 110758454
Change-Id: Ie389a0e55eb39f2b43d4e9c0739ad3f61469d740
2018-06-28 14:16:17 -07:00
Lucas Dupin
c74969e7cc Revert "Setting to change sysui theme"
This reverts commit 74fde3ea31.

Reason for revert: CL was intended to be a workaround while we were still working on global theming.

Change-Id: I2c10971b9eab5382c1782c8d09c569edc35ea191
2018-06-28 13:50:13 -07:00
Jeff Sharkey
9a3bac25fd Disable "internal" when adoption not possible.
When adoption isn't possible, we shortcut to try formatting as
external, but that still results in a warning dialog that the user
could cancel away from and then manually pick "internal."

Bug: 110863258
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I04645c3fce11a883c10996772d73440a0dcd51ec
2018-06-28 11:56:37 -06:00
TreeHugger Robot
969e5689d0 Merge "Add log and turn on debug flag" 2018-06-28 17:03:16 +00:00
hughchen
37dd4f1c71 Add log and turn on debug flag
Add log and turn on debug flag

Bug: 80161203
Test: make -j42 RunSettingsRoboTests
Change-Id: Ibd57f91b83c487ee71adb9e3de7ecfc5ea66bbef
2018-06-28 09:42:05 +00:00
Raff Tsai
b2e6654be4 Merge "First commit of dynamic home page feature" 2018-06-28 07:43:59 +00:00
TreeHugger Robot
5e07f74fa8 Merge "Fork SettingsDrawerActivity in Settings." 2018-06-28 06:38:17 +00:00