Commit Graph

51937 Commits

Author SHA1 Message Date
cosmohsieh
d58b9b10b7 Merge "[PasspointV2] Fix lint error" into qt-dev
am: 7cddfa8075

Change-Id: If71b323bbc5e6be08df7a42b049bf2ea6b8f9a0c
2019-05-03 11:49:47 -07:00
Andrew Sapperstein
78f1f66e1e Merge "Tint plus icon in mobile networks list." into qt-dev
am: 8d4654682a

Change-Id: I5540eff0f202d636641f0172596ee59f6ae2eecd
2019-05-03 11:48:23 -07:00
Felipe Leme
5ef6ee7301 Merge "Changed Content Capture title." into qt-dev
am: 78b74f434b

Change-Id: Ic0e90e4cab6385299a0445cb4dfa993e1e076dbc
2019-05-03 11:44:58 -07:00
Salvador Martinez
75c9a817f0 Merge "Update battery saver footer to have learn more link" into qt-dev
am: a5bc389c9d

Change-Id: I02e36f88ee647fd8a4ea36213489b8beb54868ee
2019-05-03 10:10:21 -07:00
Jason Chiu
f742e5e0df Merge "Update strings for Vibration" into qt-dev
am: 56b88886a0

Change-Id: I82263ff13a7d73b962953e9629e6c014bc6b00d1
2019-05-03 08:33:04 -07:00
Lei Yu
1b995f2a4c Merge "Update dialog text for untethered BT device" into qt-dev
am: 76a3e5bfac

Change-Id: I2684fe796d8da2ef4148de495a136815d8059032
2019-05-03 08:03:50 -07:00
Raff Tsai
288128f719 Merge "Can't switch navigation mode from search results" into qt-dev
am: aad3cdcf5f

Change-Id: I8934be985dfd51a5d2ec5b6dd873caf0fab75a67
2019-05-03 08:02:43 -07:00
Michael Wachenschwanz
57177733d4 Merge "Simplify user flow for setting default supervisor as PO" into qt-dev
am: 563b56af75

Change-Id: I33c49b2aa091d8f97ff0f209903d5a0cdbfda877
2019-05-03 03:35:00 -07:00
Pasty Chang
f2d6143474 Merge "Update sub-text in skip lock screen dialog" into qt-dev
am: 91acd50ef2

Change-Id: Ic5cb3f4c1d1fdab865e7ca3ec73c4018ace22f33
2019-05-02 20:22:02 -07:00
Beth Thibodeau
2226ae4144 Merge "Adding strings for themepicker suggestion" into qt-dev
am: 3562a41a42

Change-Id: Idd80aa31b9498f8458406e5aa854bd0a1135d17c
2019-05-02 20:21:15 -07:00
TreeHugger Robot
7cddfa8075 Merge "[PasspointV2] Fix lint error" into qt-dev 2019-05-02 23:52:35 +00:00
yuanjiahsu
3c9a2b5514 Merge "Clean Safetyhub feature flag from Settings." into qt-dev
am: ccfd708b87

Change-Id: I3e61deae0b689d8a19dc9f7bf549d53f97caf91a
2019-05-02 16:20:47 -07:00
TreeHugger Robot
8d4654682a Merge "Tint plus icon in mobile networks list." into qt-dev 2019-05-02 22:07:36 +00:00
Felipe Leme
78b74f434b Merge "Changed Content Capture title." into qt-dev 2019-05-02 21:51:02 +00:00
TreeHugger Robot
a5bc389c9d Merge "Update battery saver footer to have learn more link" into qt-dev 2019-05-02 21:38:37 +00:00
Andrew Sapperstein
52f7903d2f Tint plus icon in mobile networks list.
Fixes: 131723134
Test: visual inspection
Change-Id: Ia6e85b99941604904e536735fadfd5c3e6ef0eba
2019-05-02 13:32:45 -07:00
Salvador Martinez
b056b7dec4 Update battery saver footer to have learn more link
This will allow tapping on the Learn More text to take a user to
the support page for battery saver.

Bug: 129010739
Test: atest BatterySaverSettingsTest
Change-Id: Ifb758ea8c608a4051c093b5d1d43f9a039ab1294
2019-05-02 13:08:52 -07:00
TreeHugger Robot
56b88886a0 Merge "Update strings for Vibration" into qt-dev 2019-05-02 19:18:36 +00:00
Lei Yu
76a3e5bfac Merge "Update dialog text for untethered BT device" into qt-dev 2019-05-02 17:18:04 +00:00
TreeHugger Robot
aad3cdcf5f Merge "Can't switch navigation mode from search results" into qt-dev 2019-05-02 16:55:53 +00:00
Felipe Leme
f580032ada Changed Content Capture title.
Fixes: 131169650
Test: m SettingsGoogle && adb sync && adb shell kill `pid com.android.settings` && \
      adb shell am start-activity -a android.settings.REQUEST_ENABLE_CONTENT_CAPTURE

Change-Id: I63a032a27f40e9f413121ba6cd5fc4b2e10da637
2019-05-02 09:07:54 -07:00
Michael Wachenschwanz
563b56af75 Merge "Simplify user flow for setting default supervisor as PO" into qt-dev 2019-05-02 14:35:20 +00:00
Pasty Chang
91acd50ef2 Merge "Update sub-text in skip lock screen dialog" into qt-dev 2019-05-02 14:15:36 +00:00
Beth Thibodeau
3562a41a42 Merge "Adding strings for themepicker suggestion" into qt-dev 2019-05-02 12:29:15 +00:00
Jason Chiu
1789d9ee6a Update strings for Vibration
Fixes: 131345468
Test: visual
Change-Id: I7670ba96cf9b66e241a0003800a30c00f2585fc9
2019-05-02 18:28:42 +08:00
TreeHugger Robot
ccfd708b87 Merge "Clean Safetyhub feature flag from Settings." into qt-dev 2019-05-02 08:44:39 +00:00
pastychang
de6ab19391 Update sub-text in skip lock screen dialog
Bug: 131634814
Test: Manual
Change-Id: Iaae7c6c6616bfb8448539e5e18dda68a4754d9be
2019-05-02 16:19:44 +08:00
Raff Tsai
8f205a66c0 Can't switch navigation mode from search results
3 Navigation modes are mutually exclusive, we can't set all often
them on. Therefore we will now show them as slices.

Fixes: 131713601
Test: robolectric, manual
Change-Id: I52e94dffe15ed20a23a5e4cea68a40b66158b3dd
2019-05-02 14:40:43 +08:00
timpeng
df2ab2663e [Fix] prevent Talkback from reading out Bluetooth ImageView ContentDescription
am: 0dde3a3b34

Change-Id: I4192c889d3d91a7ccc6e2dbad26aafd4e615bcea
2019-05-01 23:23:49 -07:00
lindatseng
edf63c2d66 Merge "Update Settings owners" into qt-dev
am: 0ea58e740d

Change-Id: I047f02e5bac82ea4806bceae8b7285f88e16f0c1
2019-05-01 23:19:14 -07:00
Lei Yu
cd6415d73d Merge "Update padding for panel" into qt-dev
am: 9a4fa9bf0d

Change-Id: Id77f2c8bebb369983358e49c4969efa9e1e54116
2019-05-01 23:09:19 -07:00
lindatseng
f51d1d234c Merge "Avoid NPE in app storage page" into qt-dev
am: 35efae7822

Change-Id: I09ab48b5d849e8c6c34551b1a8fabbe5530015b6
2019-05-01 22:49:08 -07:00
yuanjiahsu
1da7fbb09d Clean Safetyhub feature flag from Settings.
Clean all related code, need submit together.

Test: Manually
Bug: 118848485
Change-Id: Icaa0c0736dfa4a7d96aba396a884c9d3383a0f22
2019-05-02 12:45:53 +08:00
Michael Wachenschwanz
35eef604a3 Simplify user flow for setting default supervisor as PO
A follow up CL will clean up and separate the DeviceAdminAdd and
ProfileOwnerAdd logic (see b/131713071)

Bug: 124066840
Test: manual (overlay config_defaultSupervisionProfileOwnerComponent and
confirm only that component can be set as profile owner after setup is
complete)
Test: manual (install CtsVerifier, adb shell am start -n "com.android.cts.verifier/.admin.tapjacking.OverlayingActivity", user should not be able to click the "Allow" button)

Change-Id: Iccd931801145719110ce75421c35db80ea651779
2019-05-02 03:42:06 +00:00
timpeng
0dde3a3b34 [Fix] prevent Talkback from reading out Bluetooth ImageView ContentDescription
- set View.IMPORTANT_FOR_ACCESSIBILITY_NO to ImageView

Bug: 128396030
Test: RunSettingsRoboTests
Change-Id: I267921057ede734a3c9be7087f34c96631e04859
2019-05-02 02:05:00 +00:00
cosmohsieh
95176da5d2 [PasspointV2] Fix lint error
Lint error ... "Missing mandatory plural message forms: =1."
Add case one for plural string to prevent lint error, even though
this case should not happened.

Bug: 131688045
Test: manual
Change-Id: I1087b26495c71a6d167d7eaee1359d39c81cc59f
2019-05-02 09:51:42 +08:00
TreeHugger Robot
0ea58e740d Merge "Update Settings owners" into qt-dev 2019-05-02 01:44:49 +00:00
lindatseng
5eaa4a84bd Update Settings owners
Test: rebuild
Fixes: 131782410
Change-Id: I9f2b399efcd6b784325fcef66bde45a01417e5e8
2019-05-02 01:44:42 +00:00
Xiangyu/Malcolm Chen
ac800b27b2 [automerger skipped] Merge "Adding new strings needed for Enable MMS toggle." am: 3c6cb98ec0
am: bb95bb5f8b -s ours
am skip reason: change_id If2a5cc20260fd2d1ed000e5c5531c2c11ab58b3c with SHA1 3b5a28e2e9 is in history

Change-Id: I46da2ddc9e596575d5d7a012c9dab50fa3ee8cb1
2019-05-01 16:32:34 -07:00
Lei Yu
9a4fa9bf0d Merge "Update padding for panel" into qt-dev 2019-05-01 22:06:58 +00:00
Xiangyu/Malcolm Chen
bb95bb5f8b Merge "Adding new strings needed for Enable MMS toggle."
am: 3c6cb98ec0

Change-Id: I4c011e272fe7610b2751f5f49c0132ee497ff280
2019-05-01 14:58:44 -07:00
Julia Reynolds
176f142f74 Merge "Importance preference updates" into qt-dev
am: 1613d883e8

Change-Id: I4b1d004cf4ff88253a901942b70b312d8751d033
2019-05-01 13:55:20 -07:00
Xiangyu/Malcolm Chen
3c6cb98ec0 Merge "Adding new strings needed for Enable MMS toggle." 2019-05-01 20:49:35 +00:00
TreeHugger Robot
35efae7822 Merge "Avoid NPE in app storage page" into qt-dev 2019-05-01 20:19:42 +00:00
Beth Thibodeau
fe488a9ea4 Adding strings for themepicker suggestion
Bug: 126230901
Test: mp settingsg
Change-Id: I2c94c455fedb0503f3f8a3e93dcdbbedb927c69b
2019-05-01 16:08:57 -04:00
Lei Yu
4ed1fdf212 Update padding for panel
Reuse the slice style that is used by contextual homepage.

Fixes: 131253950
Test: Manual
Change-Id: Iec5fbaec7d992a3aa084f6bd7176ff2582f69757
2019-05-01 12:46:05 -07:00
Pengquan Meng
e324f00e81 Merge "Disable 'Enable DSDS' switch for always dsds mode" into qt-dev
am: 7707133ec6

Change-Id: Ia068770daad2f035578508e7718c6b50b6e9768d
2019-05-01 12:41:09 -07:00
Lei Yu
d9ecc3ae9a Update dialog text for untethered BT device
Fixes: 122672631
Test: RunSettingsRoboTests
Change-Id: I380308acbb7025461ef34aeec68e535189714bf3
2019-05-01 12:37:55 -07:00
Julia Reynolds
1613d883e8 Merge "Importance preference updates" into qt-dev 2019-05-01 19:17:13 +00:00
cosmohsieh
4f2a59802f Merge "Fix modification of WifiDialog doesn't take effect on details page" into qt-dev
am: 4653879a22

Change-Id: If9c026f8e34e6b326c4dda6743aa374d27eb9122
2019-05-01 11:54:28 -07:00