PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,367 Commits 1 Branch 0 Tags
595cda2d14bb0b0d47a95d123cc465dbb8d56adc
Commit Graph

44367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yuemingw
59b7244dcc Merge "Disallow_airplane_mode should not disable mobile network." into pi-dev 
am: cc65760354

Change-Id: I13c39e2857bc58f6062a5d74ad3c4e672200a029
 2018-03-29 16:53:38 +00:00
TreeHugger Robot
cc65760354 Merge "Disallow_airplane_mode should not disable mobile network." into pi-dev 2018-03-29 16:45:43 +00:00
Rubin Xu
9d2edcbcbf Remove password blacklist check 
Bug: 73750934
Test: compiles
Change-Id: Ic6c40255333d171dc55df479dd6c0004371551b7
 2018-03-29 17:26:01 +01:00
Beverly
020117e9ba Merge "Settings should use Oxford comma" into pi-dev 
am: 51646b5f07

Change-Id: I94ac135a10015933a2dc7e2d5d0b7d8f72b6b865
 2018-03-29 16:09:50 +00:00
TreeHugger Robot
51646b5f07 Merge "Settings should use Oxford comma" into pi-dev 2018-03-29 15:41:21 +00:00
Eran Messeri
e0856e6d99 Require unlocked work profile to change notification settings 
Require that the work profile be started and unlocked before the user
can change the notification settings for the work profile.

That prevents leaking of notifications from the work profile, which
could happen when the user set the work profile notifications to show
even if the profile was unlocked (an example scenario is a family member
of the user using the device while the work profile is locked).

Test: Manually with TestDPC
Bug: 75252682
Change-Id: I300d001b7439c0a1d0130d7dbc9ec4c2430be227
 2018-03-29 14:54:53 +01:00
yuemingw
6e78482016 Disallow_airplane_mode should not disable mobile network. 
Found mobile_network_settings preference is dependent on toggle_airplane
preference so once Disallow_airplane_mode is turned on,  toggle_airplane
preference will be set disabled, and mobile_network_settings preference
is also set disabled because of the dependence. Can fix this bug moving
the dependance and let MobileNetworkPreferenceController listen to
Settings.Global.AIRPLANE_MODE_ON.

Bug: 76468718
Test: manually but TestDpc
Change-Id: I137938766557d7bc5ae0795bc3359a6bfbae17e3
 2018-03-29 14:34:33 +01:00
Beverly
bf4f4bf4ad Settings should use Oxford comma 
Test: manual
Change-Id: Ie4edd64d423ce96ce097e91f9f5a31bb4339774c
Fixes: 77230158
 2018-03-29 09:30:54 -04:00
Rubin Xu
95970db0fa Merge "Confirm parent user's credential when setting lock for profile" into pi-dev 
am: b0a35de10b

Change-Id: I8df143549c8e4bb0e79350c8ee3d993a039f112f
 2018-03-29 08:49:24 +00:00
Rubin Xu
b0a35de10b Merge "Confirm parent user's credential when setting lock for profile" into pi-dev 2018-03-29 08:35:46 +00:00
Jyun LuoLai
dbcc3d4176 Let battery status icon has consist UI in PowerSummaryPage 
Change-Id: Ia82adb4a964cb63c656c70a7277c76991c6b2505
Fixes: 76219062
Test: Manual test & make RunSettingsRoboTests
 2018-03-29 15:52:34 +08:00
Jane Chiang
b2f7a325b4 Merge "Reduce size of 'GB' and '%' in storage settings." into pi-dev 
am: 01933aa02c

Change-Id: Icee729e83d50e6447b1872fd4340b7f113fb7ec4
 2018-03-29 03:24:18 +00:00
Jane Chiang
01933aa02c Merge "Reduce size of 'GB' and '%' in storage settings." into pi-dev 2018-03-29 03:20:35 +00:00
Jane Chiang
a2860a488d Reduce size of 'GB' and '%' in storage settings. 
Test: Manual
Fixes: 62548317
Change-Id: I5ff8ff8c463c2718e48bf04731924922bc0ecc9c
 2018-03-29 11:07:08 +08:00
Fan Zhang
8c7824bc29 Merge changes I236b1124,Iad16b06e into pi-dev 
am: 6a89e511d1

Change-Id: I82ae2d375b99bd9c1ae58b2919ed87f02ed18adf
 2018-03-29 03:04:11 +00:00
Andrew Chiang
e469636038 Merge "Update toggle text for Data Saver" into pi-dev 
am: f3ea58a7df

Change-Id: I5119ec416a7c531eaf73fdf5e9c160f17e42b202
 2018-03-29 03:02:49 +00:00
TreeHugger Robot
6a89e511d1 Merge changes I236b1124,Iad16b06e into pi-dev 
* changes:
  Add conformance test for preference controller constructor
  Remove duplicate framework classes/robotest compile stub
 2018-03-29 02:48:21 +00:00
Andrew Chiang
f3ea58a7df Merge "Update toggle text for Data Saver" into pi-dev 2018-03-29 02:44:04 +00:00
Fan Zhang
6deb639427 Merge "Fix a NPE when getting ZenMode in RingerMutedCondition." into pi-dev 
am: 6b36c2e402

Change-Id: Ifad1dbe1fad852fa72ea005c2478cf77c651f79d
 2018-03-29 02:05:34 +00:00
Scott Nien
1fd894fd66 Merge "Apply entity header effect to storage summary screen" into pi-dev 
am: 27ba675ddd

Change-Id: Ic1b2b4cff34ecb5468420dac9d100e0226914609
 2018-03-29 01:50:53 +00:00
TreeHugger Robot
6b36c2e402 Merge "Fix a NPE when getting ZenMode in RingerMutedCondition." into pi-dev 2018-03-29 01:23:41 +00:00
Fan Zhang
b803a23031 Check time-spent-in-app intent must come from system app. 
Change-Id: Ie73aacdaf919b336d99a296328c2fbb4f75036b0
Fixes: 74580195
Test: robotests
 2018-03-28 18:15:58 -07:00
Scott Nien
27ba675ddd Merge "Apply entity header effect to storage summary screen" into pi-dev 2018-03-29 01:07:46 +00:00
Fan Zhang
92ca05e15e Add conformance test for preference controller constructor 
BasePreferenceController's constructor must be in a certain format in
order to work with search and slice. This test enforces that.

Change-Id: I236b11248b09ce71f052c449d39e994c84981a06
Fixes: 77216595
Test: robotests
 2018-03-28 17:51:05 -07:00
Fan Zhang
e1398d1350 Remove duplicate framework classes/robotest compile stub 
Bug: 76167422
Test: robotests
Change-Id: Iad16b06e54bd7290fd363c3abebdb8c66434c0e2
 2018-03-28 17:51:05 -07:00
Dieter Hsu
9180cade44 Merge "Support AOD in the Universal Settings API" into pi-dev 
am: 3025bc7c18

Change-Id: I90309ffd96e9668a286a3019691748e319ed6d4f
 2018-03-29 00:42:11 +00:00
Dieter Hsu
3025bc7c18 Merge "Support AOD in the Universal Settings API" into pi-dev 2018-03-29 00:13:56 +00:00
Philip P. Moltmann
4280a00341 Merge "A18y: Don't double announce 'searching for printers.'" into pi-dev 
am: f9cfc7c75a

Change-Id: I8198b511255e9e78e7c378adc62886aa4f31fac8
 2018-03-28 23:59:30 +00:00
Fan Zhang
e2f9e63a2a Merge "Remove duplicate classes from test/robotests" into pi-dev 
am: 8b63a03278

Change-Id: I2e82659b4341d3bec2ae0020216f73284c30f7f7
 2018-03-28 23:26:59 +00:00
Fan Zhang
025d9d2a47 Fix a NPE when getting ZenMode in RingerMutedCondition. 
Change-Id: If9a8b6f4a2d5e9b45402240d8e1401cef7dd001c
Fixes: 77217038
Test: robotest
 2018-03-28 16:26:21 -07:00
Doris Ling
ab8d5cc02b Merge "Move IMS registration state to SIM status screen" into pi-dev 
am: 6fa3b89033

Change-Id: Ib4a76ca53a04cf9a9f6ab62312bbf3c9b685528c
 2018-03-28 23:21:31 +00:00
TreeHugger Robot
f9cfc7c75a Merge "A18y: Don't double announce 'searching for printers.'" into pi-dev 2018-03-28 23:02:04 +00:00
Daniel Nishi
103b4d4619 Don't allow a zero-length device name to work. 
Technically, if a device has a zero-length device name, the bug will
resurface. The EditText validator doesn't trigger on opening -- only
when the text is edited. A zero-length device name is flagged as being
invalid, but that fails if the text box starts empty.

By pre-filling it with the previous device name, we can ensure that, as
long as a zero-length device name is never set, it can never be set.

Change-Id: I0d28aaae09f99b7d697b753835ba39c0c06644a1
Fixes: 73127912
Test: Robotest
(cherry picked from commit b216550944)
 2018-03-28 23:00:03 +00:00
Victor Chang
b074d0640c Merge "Fix incorrect GMT offset in display" into pi-dev 
am: caf72cf3ff

Change-Id: Id8ccf9caa54e655f810d77baf19c7d6df55a9087
 2018-03-28 22:53:29 +00:00
TreeHugger Robot
8b63a03278 Merge "Remove duplicate classes from test/robotests" into pi-dev 2018-03-28 22:40:45 +00:00
Fan Zhang
2223050dc8 Add some debug logging 
- Increase logging in SettingsActivity's onCreate and launch fragment
  flow.
- Log class name when enable/disable tiles

Bug: 75030092
Test: logcat
Change-Id: Ieb00228562a79c12aba2198021ece505bc371b58
 2018-03-28 15:39:07 -07:00
Lei Yu
18b737af5d Update the battery saver summary 
Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: If3866e39c1ab3c9de74b7cabcf8fe6657ca37791
 2018-03-28 15:38:33 -07:00
Daniel Nishi
3c6627d894 Better public volumes handling on secondary users. 
Public volumes are only mounted for a single user at a time, so only
show notifications and launch Intents for the relevant user.

Test: RunSettingsRobotest
Bug: 73642796
Change-Id: Ic386ec03598ab8968b75320be7844b6ac7f1387b
 2018-03-28 15:31:17 -07:00
TreeHugger Robot
6fa3b89033 Merge "Move IMS registration state to SIM status screen" into pi-dev 2018-03-28 22:24:30 +00:00
Lei Yu
1050c49cd2 Update battery strings 
1. restriction strings in App Info page
2. restriction strings in Dialog
3. restriction summary

Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: I35f45f2923cda6380c4498ebb9e0923e6f92e46a
 2018-03-28 14:53:01 -07:00
Kousuke Kitahara
072a60c8c3 [automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen" am: e8b70d7422 -s ours 
am: 7d906895e8  -s ours

Change-Id: Ia1ae6679a2e3c5c2372bee1280ef8577efa3ef84
 2018-03-28 21:13:08 +00:00
TreeHugger Robot
caf72cf3ff Merge "Fix incorrect GMT offset in display" into pi-dev 2018-03-28 21:05:15 +00:00
Kousuke Kitahara
7d906895e8 [automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen" 
am: e8b70d7422  -s ours

Change-Id: I16c7823773e1a1ca070bfc5189be080996f0d38e
 2018-03-28 20:49:50 +00:00
Jan Nordqvist
976280308d Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev 
am: 00a2dcb8f9

Change-Id: I1d577b8432cde8b696a84a1aaa284576013612d7
 2018-03-28 20:40:15 +00:00
Philip P. Moltmann
ef99b7d0ef A18y: Don't double announce 'searching for printers.' 
Change-Id: I0c0f904aae8345e725a34d38ecf1eb45c3c11670
Fixes: 67323891
Test: Navigated to screen with talkback
 2018-03-28 13:13:20 -07:00
TreeHugger Robot
00a2dcb8f9 Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev 2018-03-28 20:12:46 +00:00
Fan Zhang
f08dd43f2a Merge "Revert "Ignore broken test to unblock TreeHugger"" into pi-dev 
am: 8482455df7

Change-Id: I10b2fc33b345607358ad81c98784eb15fcd2c2e5
 2018-03-28 20:07:23 +00:00
Doris Ling
649751a4a8 Move IMS registration state to SIM status screen 
Manually merge change I3aff03ebdc9dc165db66c5007a2fa987ab8cd822 due
to merge conflicts.

To show IMS registration state for each SIM, move the preference of
IMS registration state from Status screen to SIM Status screen.

Fixes: 66063299
Test: manual - Checked that the IMS registration state is displayed on
the SIM Status screen.
Test: make RunSettingsRoboTests

Change-Id: Ic0713c357085d94b59605c1b924e7b56a362e256
 2018-03-28 13:01:33 -07:00
Makoto Onuki
4cd5487e11 Merge "Fix battery saver setting default state" into pi-dev 
am: 856017f915

Change-Id: I32f20eac01ddeed16ed95c3b8b9323067b8d0608
 2018-03-28 20:00:45 +00:00
Treehugger Robot
e8b70d7422 Merge "DO NOT MERGE Move IMS registration state to SIM status screen" 2018-03-28 19:51:28 +00:00