Commit Graph

19292 Commits

Author SHA1 Message Date
Beth Thibodeau
89dfa94447 Merge "Adding strings for themepicker suggestion" into qt-dev am: 3562a41a42
am: 2226ae4144

Change-Id: I74d2eed2c14d27db390971b71536bc65a3b57c1f
2019-05-02 21:17:35 -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
Kevin Chyn
27e0c844ae Merge "Update face settings to match mocks" into qt-dev 2019-05-03 03:21:58 +00: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
6e55084e19 Merge "Update title for metered preference" into qt-dev 2019-05-03 01:52:56 +00:00
Kevin Chyn
0c4bf9b2bc Update face settings to match mocks
Test: Builds

Fixes: 131660440
Change-Id: Ie75b67428be1e0504e3121bccb68f61e1fdbdb44
2019-05-02 16:59:12 -07:00
TreeHugger Robot
7cddfa8075 Merge "[PasspointV2] Fix lint error" into qt-dev 2019-05-02 23:52:35 +00:00
Lei Yu
06a309cf1c Update title for metered preference
Fixes: 111859056
Test: Manual
Change-Id: I7cecb6fee3963607e33a8fd24d53e98c209f1495
2019-05-02 16:09:18 -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
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
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
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
Beth Thibodeau
bf63dde205 Add setting suggestion for style
Also added extra to the existing wallpaper suggestion so it opens
directly to that tab instead of the style tab

Test: atest com.android.settings.wallpaper.StyleSuggestionActivityTest
Fixes: 126230901

Change-Id: I50ca588627063194900dca8a9273baff4a44ca67
2019-05-02 10:58:22 -04: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
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
Lei Yu
add94d15ff Merge "Update padding for panel" into qt-dev am: 9a4fa9bf0d
am: cd6415d73d

Change-Id: Ibd5521e6cd152447b846e8a1b5ce13a090105067
2019-05-02 00:55:03 -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
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
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
Julia Reynolds
57746eed0b Merge "Importance preference updates" into qt-dev am: 1613d883e8
am: 176f142f74

Change-Id: I245505a348a449beed5666c58cb0eb0cc6b13638
2019-05-01 17:50:23 -07:00
Amin Shaikh
e2f2b15837 Merge "Update settings gesture icon." into qt-dev am: d07911b0ca
am: b5f9c7c3a2

Change-Id: I90dd24bdc995f0f90fdeabeeaacba626d454a855
2019-05-01 15:55:28 -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
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
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
Fan Zhang
856e8a4503 Delete bad translation for a few strings
- wifi_calling_mode_choices
- wifi_calling_mode_choices_without_wifi_only

Fixes: 130333622
Test: rebuild
Change-Id: Ie879f914b4c720842115e2d266eb7c44f358c36a
2019-05-01 11:47:50 -07:00
Amin Shaikh
b5f9c7c3a2 Merge "Update settings gesture icon." into qt-dev
am: d07911b0ca

Change-Id: I2e0abd0b733e15f05d489d12d0aaa47ea5f820f8
2019-05-01 10:52:43 -07:00
Mill Chen
1d7f051b41 Merge "Add synonym to "Add an account"" into qt-dev am: 5f45c17a60
am: f323f072de

Change-Id: I52e8f260aa4118c96376d32637ec6d774e22d9db
2019-05-01 07:32:57 -07:00
Antony Sargent
d4f37bb46e Merge "Add 'Erase SIM' to mobile network details page" into qt-dev am: 2740c4a052
am: 4e1273c53f

Change-Id: Ia925f6646eeb49564750dad9a055898ddbdd650f
2019-05-01 07:19:34 -07:00
Sunny Shao
fbe30c5bf7 Merge "Show mobile data slice in Search even no SIM card" into qt-dev am: 8b285f2355
am: 6fba302a0d

Change-Id: I917e58a68eecac6c28500eefab8ad4cc31f2087e
2019-05-01 07:18:45 -07:00
Julia Reynolds
090e67d938 Importance preference updates
- Use show on lockscreen setting
- Match design to notification shade guts

Test: robotests
Bug: 131290247
Bug: 128445911
Change-Id: I645b35191c8f22e751c264fd8ca13560f50b7582
2019-05-01 10:14:05 -04:00
Mill Chen
f323f072de Merge "Add synonym to "Add an account"" into qt-dev
am: 5f45c17a60

Change-Id: Iaf7353b0c761cc5a05422e9f054cf087765eb98c
2019-05-01 07:09:57 -07:00
Antony Sargent
4e1273c53f Merge "Add 'Erase SIM' to mobile network details page" into qt-dev
am: 2740c4a052

Change-Id: I7fe388644b137549807d74b0a7888fdd9d7eab74
2019-05-01 07:08:19 -07:00
Sunny Shao
6fba302a0d Merge "Show mobile data slice in Search even no SIM card" into qt-dev
am: 8b285f2355

Change-Id: Ibb7ab1b8b0425938092b27dad980ef0c11ee2b66
2019-05-01 07:07:32 -07:00
Lifu Tang
1c0c74220d Merge "Update location app stats" into qt-dev am: 5bfa4b24e2
am: 3ee7292958

Change-Id: Icb598b8930394d65012bf4e7a82b7be2e80db19a
2019-04-30 23:11:07 -07:00
Lifu Tang
3ee7292958 Merge "Update location app stats" into qt-dev
am: 5bfa4b24e2

Change-Id: Ida6d56aa38861ae76654f7a01e2a0921bd1b5e6f
2019-04-30 21:57:34 -07:00
Beverly
43c5b3755b Merge "Update DND strings - use pull-down shade" into qt-dev am: 34fb0485fa
am: aa4adeda1c

Change-Id: I4f3d5b6c3453e71d7bfa65ac8e0c8da573fbac48
2019-04-30 19:59:10 -07:00
Leon Liao
458f15a1da Merge "Replace the placeholder animation." into qt-dev
am: fc20597133

Change-Id: I00743475bc757c197a1b53f8f3af90ab01c3eb82
2019-04-30 17:28:03 -07:00
Beverly
aa4adeda1c Merge "Update DND strings - use pull-down shade" into qt-dev
am: 34fb0485fa

Change-Id: If173adf304c1ac232f34bc852df93873fd06f25b
2019-04-30 17:24:26 -07:00
TreeHugger Robot
d07911b0ca Merge "Update settings gesture icon." into qt-dev 2019-04-30 23:24:25 +00:00
Amin Shaikh
e360f9f037 Update settings gesture icon.
Fixes: 130148532
Test: visual
Change-Id: Ic5fe6dbd5ae726edcd9ad27e512c627aebf554a9
2019-04-30 17:29:04 -04:00
Fan Zhang
c34d9c9b48 Merge "Tweak paddings for apps filter in app info screen" into qt-dev am: 2da861cd52
am: abdcf0038d

Change-Id: I06af4ae8b331706ce5916cc7b4c3d58e05976541
2019-04-30 13:35:55 -07:00
Pasty Chang
8b6857951c Merge "Set QR scan activity to light theme in setup flow" into qt-dev am: 54cddc70e5
am: 9f8406d876

Change-Id: I4ca7732c16bfaf11b5ede3763a3b20e1bd9c74ae
2019-04-30 13:34:49 -07:00