PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,333 Commits 1 Branch 0 Tags
9eff8f7a8d5140a4b674fa09cf333dce07fde76c
Commit Graph

52333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ng Zhi An
6940466b52 Update strings used in SAW unsupported screen 
Bug: 132183451
Test: adb shell am start-activity -a android.settings.action.MANAGE_OVERLAY_PERMISSION
Change-Id: Ia840b82838bed43234572c4a08bd56b97f391a5b
 2019-05-09 19:28:49 +00:00
Raff Tsai
c617fa2e87 Merge "Fix robolectric test error" into qt-dev 2019-05-09 19:01:20 +00:00
Beth Thibodeau
d5efb5995d Make preview image not selectable 
Fixes: 132050099
Test: manual
Change-Id: I102ced947d352901f5bdbf34eeeba98ab0a32cca
 2019-05-09 14:38:24 -04:00
TreeHugger Robot
f39ed1f432 Merge "Display profile picker for content capture settings." into qt-dev 2019-05-09 18:27:37 +00:00
TreeHugger Robot
7d3a67b04d Merge "Catch another exception when we are building slices data for search" into qt-dev 2019-05-09 17:45:10 +00:00
Annie Meng
b1f4bb60f3 Merge "Change inactive backup UI to show "Disabled by admin"" into qt-dev 2019-05-09 09:20:03 +00:00
Yanting Yang
19261a97ff Fix mirrored arrow issue for RTL 
There is no mirrored arrow for RTL in Settings after applying icon
overlays for theming (b/131346125), add autoMirrored attr to fix it.

Fixes: 132174923
Test: visual
Change-Id: I6e70c39c00a5859e49b3a4dce493ea9ccac0417a
 2019-05-09 15:52:03 +08:00
Jason Chiu
46294872c7 Remove On/Off subtext next to the Wi-Fi toggle 
Fixes: 132312797
Test: robotest, visual
Change-Id: I2c3b39e8deda211d23be0b2a73426778dbbf53db
 2019-05-09 15:19:02 +08:00
Raff Tsai
1b28754b98 Fix robolectric test error 
Bug: 132302277
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.AdaptiveSleepPreferenceControllerTest"
Change-Id: I6c823298d8e346eb2e87686a691dc4a2536423f6
 2019-05-09 11:36:35 +08:00
tmfang
6410821f04 Catch another exception when we are building slices data for search 
We lose chance to build all Settings slices if we got an exception
when settings was creating slice data for controllers.
We should make sure the process goes well even we got an exception
on an incorrect controller.

Also, we log exceptions for each catch.

Bug: 131449561
Test: Open Settings search and then we can see slice for some
search result.

Change-Id: Iac9f0e0a187f6d10cf53886afeb9cab479b6ce02
 2019-05-09 10:31:53 +08:00
TreeHugger Robot
28006039c5 Merge "Fix WebViewAppPickerTest" into qt-dev 2019-05-09 02:00:26 +00:00
Arc Wang
5c461a2859 Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev 2019-05-09 01:29:48 +00:00
Arc Wang
fa85f564ac Merge "Add margin 24dp to the error message of Wi-Fi QR code scanner" into qt-dev 2019-05-09 01:29:25 +00:00
TreeHugger Robot
cf964643b5 Merge "Update summary for mobile data toggle for CBRS." into qt-dev 2019-05-09 00:51:31 +00:00
Jonathan Scott
416b49569a [automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357 am: bd3672b2d8 am: 9f280a15a2 am: 306ff7e3a9 -s ours 
am: 550496d236 -s ours
am skip reason: subject contains skip directive

Change-Id: I2571156e2d9a07fdae9e5685dd3edc6c6fb18849
 2019-05-08 16:56:02 -07:00
Kevin Chyn
0f65b773be Merge changes from topic "Face Intro Changes" into qt-dev 
* changes:
  Added Face Enroll Education Screen
  Updated Face Enroll Introduction
 2019-05-08 23:55:22 +00:00
Jonathan Scott
550496d236 [automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357 am: bd3672b2d8 am: 9f280a15a2 
am: 306ff7e3a9 -s ours
am skip reason: subject contains skip directive

Change-Id: If66c539a683b4edeeca60140fb6c85eed1902d99
 2019-05-08 16:25:48 -07:00
Jonathan Scott
306ff7e3a9 [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357 am: bd3672b2d8 
am: 9f280a15a2

Change-Id: I2dae0b0e41b34480c99a81fd3c05014e5ec43f33
 2019-05-08 16:09:26 -07:00
Andrew Sapperstein
477e345f21 Update summary for mobile data toggle for CBRS. 
Fixes: 127529917
Test: robotests
Change-Id: Id2d0bdbcf9674106a3dff8db8e9ceb22dbdda314
 2019-05-08 15:55:04 -07:00
Jonathan Scott
9f280a15a2 [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357 
am: bd3672b2d8

Change-Id: I9157d6fd4afc3426142dbfbbdc9a57aceb2b7d7f
 2019-05-08 15:43:07 -07:00
TreeHugger Robot
32e0172136 Merge "Increase char limit as requested by i18n team" into qt-dev 2019-05-08 21:26:14 +00:00
TreeHugger Robot
cbd925bf73 Merge "Clear preferences when dialog acknowledged and increase order" into qt-dev 2019-05-08 21:12:52 +00:00
Lei Yu
04d19a489e Merge "Increate max height of sliceView" into qt-dev 2019-05-08 21:02:22 +00:00
Android Build Merger (Role)
bd3672b2d8 [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357 
Change-Id: If8d375a600b9db7b011b08770ad6e7fbf29073c4
 2019-05-08 20:51:48 +00:00
Android Build Merger (Role)
333afb4357 [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 
Change-Id: Ief43c33183fa5f24cf3bd9f26c9d7362d235492e
 2019-05-08 20:51:45 +00:00
Android Build Merger (Role)
003ce809c6 [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b 
Change-Id: I89b5b93b63beb9f52e5799c822edccf208158f39
 2019-05-08 20:51:43 +00:00
Android Build Merger (Role)
7d86790c7b [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc 
Change-Id: Ibb0d6c1d0253c78160d66e27a2847192c19d10d1
 2019-05-08 20:51:40 +00:00
Android Build Merger (Role)
133337b4dc [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 
Change-Id: Iee20bc7fe4fe756b87c9231689792ab50f8a76bc
 2019-05-08 20:51:37 +00:00
Jonathan Scott
b985aa2f29 [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. 
Bug: 127605586
Test: Manual
Change-Id: I4186c2d57b42b6e3d27013f2c9708fca56c561fe
Merged-In: I1cdd82bea4dc9e4182694b061a7746aa83dabdfe
 2019-05-08 20:51:35 +00:00
TreeHugger Robot
95c26b67f1 Merge "Re-enable the test" into qt-dev 2019-05-08 20:29:38 +00:00
Fan Zhang
c084301c02 Merge "Display settings homepage content fully edge-to-edge" into qt-dev 2019-05-08 20:26:31 +00:00
Android Build Merger (Role)
1fd7dfb12e Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours am skip reason: subject contains skip directive" into qt-dev 2019-05-08 20:20:20 +00:00
Lei Yu
285fc7f7c3 Merge "Add null check when restart batteryinfo loader" into qt-dev 2019-05-08 20:18:11 +00:00
Jonathan Scott
019e435e87 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev 
am: db98a8edec -s ours
am skip reason: subject contains skip directive

Change-Id: Ibd95dd35f7efcc5d2605799bfa65b3b296be7d88
 2019-05-08 13:17:58 -07:00
TreeHugger Robot
db98a8edec Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev 2019-05-08 20:00:27 +00:00
Salvador Martinez
fb940feebf Clear preferences when dialog acknowledged and increase order 
This CL makes it so that the order on the seekbar is increased
to a very large value to ensure it gets added to the end in the
case where a refresh is triggered due to the first time battery
saver dialog. Additionally it clears the preferences on the screen
when we receive confirmation to ensure that no caching can cause
the seekbar ot show up on top of other preferences.

Test: atest BatterySaverScheduleSeekBarControllerTest
Bug: 132107662
Change-Id: I26bf2772ed7135daa4879bca17e0ecfc22a2d0dd
 2019-05-08 12:28:43 -07:00
TreeHugger Robot
2ace95f386 Merge "Update datausage for DataUsagePreferenceController" into qt-dev 2019-05-08 19:20:13 +00:00
joshmccloskey
0458262fb3 Added Face Enroll Education Screen 
Test: Builds
Bug: 131774352
Fixes: 131857742

Change-Id: Ib384b9efaf053b405ce3f55e449dd6abb9e75296
 2019-05-08 19:15:50 +00:00
Beth Thibodeau
4765faa9cf Increase char limit as requested by i18n team 
Fixes: 132257773
Test: mp settingsg

Change-Id: I4c5c21899bb9fa61f8f8b32cd56dc57288e282bd
 2019-05-08 15:05:55 -04:00
Aran Ink
7627363d3e Merge "Use correct constants for Global Actions Panel settings." into qt-dev 2019-05-08 18:56:26 +00:00
Fan Zhang
3e14383a28 Display settings homepage content fully edge-to-edge 
This is needed to support fully gesture navigation.

Bug: 132182711
Test: visual
Change-Id: Ifaf15ecec73b974356355a74e73754f95b84ad3e
 2019-05-08 11:43:58 -07:00
TreeHugger Robot
ea6bd51bea Merge "Fix two problems related to data connectivity in the multi-SIM header" into qt-dev 2019-05-08 18:31:39 +00:00
Lei Yu
b47b99ed38 Add null check when restart batteryinfo loader 
Even though we unregister contentObserver in onPause and register
in onResume, callback still be called while fragment is detached.

Anyhow add a null check in settings to stop crash

Fixes: 131905853
Test: RunSettingsRoboTests
Change-Id: I8c0c2c04c3b8d942e0c97cf71a7d3e735a24b467
 2019-05-08 11:12:55 -07:00
Alex Salo
83a63abd2d Re-enable the test 
Update the test to handle new API and simplify the logic in the
controller.

Bug: 130897305
Test: make RunSettingsRoboTests -j64

Change-Id: I0c46ff22d4a3bf913add753f85a24af9aeee0a33
 2019-05-08 17:48:12 +00:00
Lei Yu
9bc3273489 Update datausage for DataUsagePreferenceController 
Data usage number was wrong because we didn't set correct
subId, this CL fixes this issue.

Bug: 132113657
Test: RunSettingsRoboTests
Change-Id: If7c9cf2f4709d9a8e5f9a154c02de9484800d6d5
 2019-05-08 10:25:10 -07:00
TreeHugger Robot
c949d12a12 Merge "Add flag to disable part of event_logging in Settings." into qt-dev 2019-05-08 17:15:03 +00:00
TreeHugger Robot
e3278d8240 Merge "Show admin dialog when preference is disabled by Device Admin" into qt-dev 2019-05-08 17:03:42 +00:00
TreeHugger Robot
d88ca05b2e Merge "[PATCH] Buttons in storage settings" into qt-dev 2019-05-08 16:35:12 +00:00
TreeHugger Robot
1079d2833a Merge "Add null check before setting the visibility of swipe background" into qt-dev 2019-05-08 16:34:32 +00:00
Annie Meng
6e2a67f538 Change inactive backup UI to show "Disabled by admin" 
Change text displayed when backup is inactive for a user from "Backup
service isn't active" to "Disabled by admin".

Bug: 131296047
Test: Make backup inactive, check UI (primary and work profile)
Change-Id: I087755fa1e79564d320fe1fa62de92e3dc40a343
 2019-05-08 15:18:10 +01:00