Kevin Chyn
aa39e6a778
Merge "Update face settings to match mocks" into qt-dev
...
am: 27e0c844ae
2019-05-03 11:55:20 -07:00
Lei Yu
18952e522d
Merge "Update title for metered preference" into qt-dev
...
am: 6e55084e19
2019-05-03 11:52:40 -07:00
cosmohsieh
d58b9b10b7
Merge "[PasspointV2] Fix lint error" into qt-dev
...
am: 7cddfa8075
2019-05-03 11:49:47 -07:00
Felipe Leme
5ef6ee7301
Merge "Changed Content Capture title." into qt-dev
...
am: 78b74f434b
2019-05-03 11:44:58 -07:00
Jason Chiu
31401ac044
Merge "Update strings for Vibration" into qt-dev am: 56b88886a0
...
am: f742e5e0df
2019-05-03 08:41:36 -07:00
Jason Chiu
f742e5e0df
Merge "Update strings for Vibration" into qt-dev
...
am: 56b88886a0
2019-05-03 08:33:04 -07:00
Lei Yu
5efc949f49
Merge "Update dialog text for untethered BT device" into qt-dev am: 76a3e5bfac
...
am: 1b995f2a4c
2019-05-03 08:11:20 -07:00
Lei Yu
1b995f2a4c
Merge "Update dialog text for untethered BT device" into qt-dev
...
am: 76a3e5bfac
2019-05-03 08:03:50 -07:00
Michael Wachenschwanz
a759f72127
Merge "Simplify user flow for setting default supervisor as PO" into qt-dev am: 563b56af75
...
am: 57177733d4
2019-05-03 03:57:57 -07:00
Michael Wachenschwanz
57177733d4
Merge "Simplify user flow for setting default supervisor as PO" into qt-dev
...
am: 563b56af75
2019-05-03 03:35:00 -07:00
Pasty Chang
621a40a9ff
Merge "Update sub-text in skip lock screen dialog" into qt-dev am: 91acd50ef2
...
am: f2d6143474
2019-05-02 21:27:51 -07:00
Beth Thibodeau
89dfa94447
Merge "Adding strings for themepicker suggestion" into qt-dev am: 3562a41a42
...
am: 2226ae4144
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
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
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
Felipe Leme
78b74f434b
Merge "Changed Content Capture title." into qt-dev
2019-05-02 21:51:02 +00: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
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
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
2019-05-01 17:50:23 -07:00
Xiangyu/Malcolm Chen
bb95bb5f8b
Merge "Adding new strings needed for Enable MMS toggle."
...
am: 3c6cb98ec0
2019-05-01 14:58:44 -07:00
Julia Reynolds
176f142f74
Merge "Importance preference updates" into qt-dev
...
am: 1613d883e8
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
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
Mill Chen
1d7f051b41
Merge "Add synonym to "Add an account"" into qt-dev am: 5f45c17a60
...
am: f323f072de
2019-05-01 07:32:57 -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
2019-05-01 07:09:57 -07:00
Lifu Tang
1c0c74220d
Merge "Update location app stats" into qt-dev am: 5bfa4b24e2
...
am: 3ee7292958
2019-04-30 23:11:07 -07:00
Beverly
43c5b3755b
Merge "Update DND strings - use pull-down shade" into qt-dev am: 34fb0485fa
...
am: aa4adeda1c
2019-04-30 19:59:10 -07:00
TreeHugger Robot
5f45c17a60
Merge "Add synonym to "Add an account"" into qt-dev
2019-04-30 20:12:40 +00:00
Malcolm Chen
f3425dd778
Adding new strings needed for Enable MMS toggle. am: 3b5a28e2e9
...
am: 6baa0e1422
2019-04-30 11:55:11 -07:00
Mill Chen
fb4f7f8ab7
Add synonym to "Add an account"
...
To index the term "work profile" for "Add an account" setting, we added
a synonym to this setting.
Fixes: 111519999
Test: manual
Change-Id: Iabaac8d36433ef75790768fb46d14fe9b2553ad4
2019-04-30 17:31:43 +08:00
TreeHugger Robot
c962ea0978
Merge "Delete bad translation for a few strings" into qt-dev
2019-04-30 09:31:43 +00:00
Salvador Martinez
430814af13
Merge "Add keywords for battery saver schedule" into qt-dev am: 3825e09706
...
am: 958dea2303
2019-04-30 00:13:21 -07:00
TreeHugger Robot
5bfa4b24e2
Merge "Update location app stats" into qt-dev
2019-04-30 02:50:58 +00:00
Fan Zhang
d87f485a6f
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-04-29 16:17:11 -07:00
Malcolm Chen
8b2a07b877
Adding new strings needed for Enable MMS toggle.
...
Bug: 130222866
Test: build
Change-Id: If2a5cc20260fd2d1ed000e5c5531c2c11ab58b3c
Merged-In: If2a5cc20260fd2d1ed000e5c5531c2c11ab58b3c
2019-04-29 14:24:28 -07:00
TreeHugger Robot
34fb0485fa
Merge "Update DND strings - use pull-down shade" into qt-dev
2019-04-29 16:50:25 +00:00
