Commit Graph

18669 Commits

Author SHA1 Message Date
Lei Yu
991c51cb6b Merge "Update title for metered preference" into qt-dev am: 6e55084e19
am: 18952e522d

Change-Id: Ie2d85c66e781aa6a07532cc8cc3aab2e39540daf
2019-05-03 19:20:35 -07:00
cosmohsieh
27a26ed44b Merge "[PasspointV2] Fix lint error" into qt-dev am: 7cddfa8075
am: d58b9b10b7

Change-Id: Ibb2d194132fe7019a67ae3046c09848376f2ccef
2019-05-03 19:18:51 -07:00
Andrew Sapperstein
6ccce04326 Merge "Tint plus icon in mobile networks list." into qt-dev am: 8d4654682a
am: 78f1f66e1e

Change-Id: I71bc1ed6befd5c3f27dfca3308b8ce244ef883da
2019-05-03 19:18:01 -07:00
Julia Reynolds
ca10114750 Merge " Make the selected importance more prominent" into qt-dev
am: d4d240f313

Change-Id: I4c34eccdf43063fb8fb3d0234a0b2b8a922f4a14
2019-05-03 18:25:44 -07:00
Amin Shaikh
4f0d017808 Merge "Fix themed settings icons." into qt-dev
am: 1c3d7aa1f9

Change-Id: I79de8a93ff1b912525f760c6269f52f1b8897868
2019-05-03 17:29:13 -07:00
Felipe Leme
2f5033a05d Merge "Changed Content Capture title." into qt-dev am: 78b74f434b
am: 5ef6ee7301

Change-Id: Icffc3199a91b61261ab16520c8a518ee3c934d01
2019-05-03 16:49:42 -07:00
Beth Thibodeau
2c773e578e Merge "Add setting suggestion for style" into qt-dev
am: 1d1f1b321e

Change-Id: Ib7c8225c1887b239faf6a3952ddec383d266389f
2019-05-03 15:53:43 -07:00
TreeHugger Robot
d4d240f313 Merge " Make the selected importance more prominent" into qt-dev 2019-05-03 22:20:28 +00:00
TreeHugger Robot
1c3d7aa1f9 Merge "Fix themed settings icons." into qt-dev 2019-05-03 21:04:36 +00:00
Julia Reynolds
dc82f8e707 Update colors
am: fc5f111bb9

Change-Id: I780fbf7a8ace1f76c6300b2c9d37dfe1a833de5b
2019-05-03 13:35:35 -07:00
Julia Reynolds
c3f7ba9167 Make the selected importance more prominent
Fixes: 129507563
Test: manual
Change-Id: Ic8280eb369d687385cff3a7122ce91d7051fa76c
2019-05-03 19:31:19 +00:00
Kevin Chyn
aa39e6a778 Merge "Update face settings to match mocks" into qt-dev
am: 27e0c844ae

Change-Id: I46e533c8e0195ee0a9dcf4b308ea42f75b4ea2cf
2019-05-03 11:55:20 -07:00
Lei Yu
18952e522d Merge "Update title for metered preference" into qt-dev
am: 6e55084e19

Change-Id: Iccb7cd5b3de6c6c4702d9236446d556eafc0fb5c
2019-05-03 11:52:40 -07:00
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
Amin Shaikh
3f1de20c7e Fix themed settings icons.
- Added android prefix for homeAsUpIndicator attribute
- Override ic_arrow_down_24dp from androidx
- Remove ic_lock drawable overlay
- Update date and time icon
- Dedupe ic_menu_add and ic_add_24dp

Bug: 131346125
Test: mp settings;
Change-Id: I7223249f2adccc5569a37e8b68cae5499e7c7620
2019-05-03 17:02:46 +00:00
Beth Thibodeau
1d1f1b321e Merge "Add setting suggestion for style" into qt-dev 2019-05-03 16:54:54 +00:00
Jason Chiu
31401ac044 Merge "Update strings for Vibration" into qt-dev am: 56b88886a0
am: f742e5e0df

Change-Id: I7285141c445379ca38823b90eda672c3e28f3dc4
2019-05-03 08:41:36 -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
5efc949f49 Merge "Update dialog text for untethered BT device" into qt-dev am: 76a3e5bfac
am: 1b995f2a4c

Change-Id: Id99385b551bfd96bfea4d92ce6b66d3af2f0c416
2019-05-03 08:11:20 -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
Julia Reynolds
fc5f111bb9 Update colors
For night mode and a11y

Test: manual
Fixes: 129507563
Change-Id: Ic675cbe0aaf0ccbb18d57729c26b5b55ca907910
2019-05-03 13:33:54 +00:00
Michael Wachenschwanz
a759f72127 Merge "Simplify user flow for setting default supervisor as PO" into qt-dev am: 563b56af75
am: 57177733d4

Change-Id: Ic60f453acd6741f5af79ce3f0ceb1ddd68a04e51
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

Change-Id: I33c49b2aa091d8f97ff0f209903d5a0cdbfda877
2019-05-03 03:35:00 -07:00
Stanley Wang
109dc516b2 Fix no touch feedback present on the settings suggestion card.
Add selectableItemBackground attribut to conditional card layout,
and add new background for contextual half card.

Fixes: 129357518
Test:  manual
Change-Id: I726acfa3a55560d9b34f973b141e4a89cc8e8b68
2019-05-03 13:14:52 +08:00
Pasty Chang
621a40a9ff Merge "Update sub-text in skip lock screen dialog" into qt-dev am: 91acd50ef2
am: f2d6143474

Change-Id: I6dae20b61a2152563eaa01bab41a2136bda08bbb
2019-05-02 21:27:51 -07:00
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