Commit Graph

22237 Commits

Author SHA1 Message Date
Beverly
e711ea4afc Merge "Settings should use Oxford comma" into pi-dev am: 51646b5f07
am: 020117e9ba

Change-Id: I387368b20e038b9f2b920793b4b5e72064f27fd1
2018-03-29 16:32:07 +00:00
Rubin Xu
9d2edcbcbf Remove password blacklist check
Bug: 73750934
Test: compiles
Change-Id: Ic6c40255333d171dc55df479dd6c0004371551b7
2018-03-29 17:26:01 +01: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
53f59f9214 Merge "Confirm parent user's credential when setting lock for profile" into pi-dev am: b0a35de10b
am: 95970db0fa

Change-Id: Ieba5594887ba89afa43c56ae3991830fa1372270
2018-03-29 09:05:48 +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
bd838bde93 Merge "Reduce size of 'GB' and '%' in storage settings." into pi-dev am: 01933aa02c
am: b2f7a325b4

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

Change-Id: If92eb9056b259965f4f195f2a450ae997eff3c22
2018-03-29 05:06:20 +00:00
Fan Zhang
6546fcb087 Merge "Fix a NPE when getting ZenMode in RingerMutedCondition." into pi-dev am: 6b36c2e402
am: 6deb639427

Change-Id: I98ae1ded481ee66eb929d8b7a41f8b4d21b08805
2018-03-29 04:54:28 +00:00
Scott Nien
e6e017f4c8 Merge "Apply entity header effect to storage summary screen" into pi-dev am: 27ba675ddd
am: 1fd894fd66

Change-Id: Ic3ed430ab27d0bb3bd6d06c1184f464362c11697
2018-03-29 04:28:09 +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
Vincent Peng
f3f9ddc684 Merge "Change DataUsageSummaryPreference.setLimitInfo(String text) to take CharSequence" 2018-03-29 02:51:02 +00:00
Andrew Chiang
f3ea58a7df Merge "Update toggle text for Data Saver" into pi-dev 2018-03-29 02:44:04 +00:00
Dieter Hsu
02aa04bc2b Merge "Support AOD in the Universal Settings API" into pi-dev am: 3025bc7c18
am: 9180cade44

Change-Id: Ic9bced3c2ec51392cdcf41c15a02adefb8031632
2018-03-29 02:38:34 +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
Doris Ling
5e63efee2e Merge "Move IMS registration state to SIM status screen" into pi-dev am: 6fa3b89033
am: ab8d5cc02b

Change-Id: I315bd95df74389acdbeca5f3715a3e58c872529d
2018-03-29 01:01:55 +00:00
Victor Chang
283fcbc43c Merge "Fix incorrect GMT offset in display" into pi-dev am: caf72cf3ff
am: b074d0640c

Change-Id: I47b47781a53fc090c0f2e5542e134732922da87b
2018-03-29 00:29:59 +00:00
Dieter Hsu
3025bc7c18 Merge "Support AOD in the Universal Settings API" into pi-dev 2018-03-29 00:13:56 +00:00
vincentpeng
665b16bbfc Change DataUsageSummaryPreference.setLimitInfo(String text) to take CharSequence
"CharSequence is more correct" than String.
Change method to take in CharSequence parameter and modify callers/tests.

Bug: b/74960034

Test: RunSettingsRoboTests:DataUsageSummaryPreferenceTest and RunSettingsRoboTests:DataUsageSummaryPreferenceControllerTest
Change-Id: Ic83bde57bafff8416c0bd86b1ff2beb44ea12d0e
2018-03-29 07:48:10 +08: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
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
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
Jan Nordqvist
3dd6e733ed Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev am: 00a2dcb8f9
am: 976280308d

Change-Id: I055b684dcb5056577e492a6d631c18a186257c4c
2018-03-28 21:15:38 +00:00
TreeHugger Robot
caf72cf3ff Merge "Fix incorrect GMT offset in display" into pi-dev 2018-03-28 21:05:15 +00:00
Makoto Onuki
5ed0d7177d Merge "Fix battery saver setting default state" into pi-dev am: 856017f915
am: 4cd5487e11

Change-Id: I65d6cb8508923786606301ed611dd925a9f266b7
2018-03-28 20:30:11 +00: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
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
Lei Yu
4571dfccfb Merge "Get anomaly info from StringArrayList" into pi-dev am: 512cb18c2e
am: 7952ddd062

Change-Id: I765c9400804d178c854b92d1650bcf7110c6eec7
2018-03-28 19:33:25 +00:00
TreeHugger Robot
856017f915 Merge "Fix battery saver setting default state" into pi-dev 2018-03-28 19:31:51 +00:00
TreeHugger Robot
512cb18c2e Merge "Get anomaly info from StringArrayList" into pi-dev 2018-03-28 18:58:00 +00:00
Victor Chang
77f97af8eb Fix incorrect GMT offset in display
- android.icu.impl.TimeZoneAdapter doesn't fully implement
java.util.TimeZone, e.g. does not override getOffset(long date).
TimeZoneAdapter isn't a public API in ICU/Android. It shouldn't be
used in the first place

Bug: 77223510
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Ic0d7794326948796dcc5cc0b268ef634a74803c4
2018-03-28 19:52:05 +01:00
Jan Nordqvist
4092b2193c Entity header: When screen scrolls, there should be shadow under the header.
Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests

Change-Id: I5c1d9f463a57d48e258d67602fc4d1fbbdfaad60
2018-03-28 11:17:23 -07:00
Victor Chang
4aef470537 Merge "Add a header view to show the country in RegionZonePicker" into pi-dev am: 05ab467e80
am: 5aa3b3c3b8

Change-Id: I19213b029819d45b63d7e9584df2e3e83773d367
2018-03-28 18:01:23 +00:00
HJ ChangLiao
6a38e5818b Merge "Move BT, NFC out of Conntection pref" into pi-dev am: c621ddc3f2
am: 941af18fe7

Change-Id: I1d4ceea2b5ac03c5e4b60a93c8e57a686ffe7b5b
2018-03-28 17:53:50 +00:00
TreeHugger Robot
05ab467e80 Merge "Add a header view to show the country in RegionZonePicker" into pi-dev 2018-03-28 17:49:36 +00:00
Jyun LuoLai
21d51728b7 Merge "Subtext of "Add device" should only show when BT is off" into pi-dev am: 671db84734
am: 8b5e2c323b

Change-Id: Ib2fc38a2970df73a9c9afedde503a77c548e82dd
2018-03-28 17:45:43 +00:00
TreeHugger Robot
c621ddc3f2 Merge "Move BT, NFC out of Conntection pref" into pi-dev 2018-03-28 17:38:34 +00:00
Makoto Onuki
c8db611068 Fix battery saver setting default state
- Battery saver is off by default.

Test: manual test with: settings delete global low_power && settings delete global low_power_trigger_level
Test: b ROBOTEST_FILTER=BatterySaver RunSettingsRoboTests

Bug: 76460719
Change-Id: I749bba9a5e36fe8ccee6e4ed843596bc94d96fcc
Fix: 76460719
2018-03-28 10:23:40 -07:00
TreeHugger Robot
671db84734 Merge "Subtext of "Add device" should only show when BT is off" into pi-dev 2018-03-28 17:22:25 +00:00
Shawn Ding
4d30b81e99 Merge "Fix data usage under Wi-Fi has title "Mobile data usage"" into pi-dev am: bbb3d3e72c
am: 3711215808

Change-Id: I8ba0193d6b91ed5be8d90939d808f7d464b39c7c
2018-03-28 16:59:00 +00:00
TreeHugger Robot
bbb3d3e72c Merge "Fix data usage under Wi-Fi has title "Mobile data usage"" into pi-dev 2018-03-28 16:36:16 +00:00