Curtis Belmonte
|
47eb328ee9
|
Merge "Consolidate face enroll intro/consent screens" into sc-dev am: 5ed928f626 am: f88242c07c am: 9331f6d774
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14510896
Change-Id: Ia259bb1e140545020d2738c9acbaaef85580aa71
|
2021-05-18 17:34:52 +00:00 |
|
Jason Chiu
|
19f46f20c3
|
Merge "Redesign homepage IA icon" into sc-dev am: cb88a7e24d am: de90a36450 am: f1be36eeec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187779
Change-Id: Ia49048de7c462069cfe9a6082d811da6e188c227
|
2021-05-18 17:34:23 +00:00 |
|
TreeHugger Robot
|
fcf2255371
|
Merge "Fix task affinity for NotificationAccessConfirmationActivity" into sc-dev am: e5052a7b52 am: 809335aaa6 am: 8fe97b906e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14522955
Change-Id: Idd68b7246562b479312a215717c04478d34c75c1
|
2021-05-18 17:34:16 +00:00 |
|
Jakub Pawlowski
|
a2d5f3e0b1
|
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -s ours am: 8ae86914d6 -s ours am: aab008b6be -s ours am: 50b308df2e -s ours am: c19ad05b02 -s ours am: 5801d2af17 -s ours am: 0470fbade0 -s ours
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 9d99e0b3ff is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: I5c965ead2a1a1438511e237541687f7b6c573da8
|
2021-05-18 17:34:10 +00:00 |
|
Jakub Pawlowski
|
4f8896196f
|
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 123cb13df8 am: ed9a891fa1 am: 355dcf3757 am: 9e52c1621b am: 6949e55ce1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: I7e48e1c16cf16736d2562dddcddc3af4c230a6fd
|
2021-05-18 17:33:52 +00:00 |
|
Jakub Pawlowski
|
10bbc1879d
|
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -s ours am: 8ae86914d6 -s ours am: 694f25b2c7 -s ours am: b0da292758 -s ours am: d62548790b -s ours am: d2bc02746e -s ours
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 9d99e0b3ff is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: Idc7633514f21e5153dba0dab3aa47feed0c979de
|
2021-05-18 17:33:42 +00:00 |
|
Jakub Pawlowski
|
fe3a9d184d
|
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 72cda9d96c am: bb78247cf0 am: b96d8078b7 am: c7621e5c88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: Ieb19e83a1a3a9814860d985b3dccbb2c123e7667
|
2021-05-18 17:11:48 +00:00 |
|
Abel Tesfaye
|
c8dc2fdee8
|
Merge "Add warning message when power save mode is enabled for attention settings fragment" into sc-dev am: 989570a9b6 am: bc59298a10 am: 55b1368af8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441367
Change-Id: Ied7f89d1da1e53edbb5b37882e0f0fce7ceb6769
|
2021-05-18 17:11:39 +00:00 |
|
Abel Tesfaye
|
754fa5e436
|
Merge "Add warning message when power save mode is enabled for smart auto rotate settings fragment" into sc-dev am: 43905b3459 am: 0ce0ea15a7 am: b6c37a595d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14430041
Change-Id: I4ba344b5b401563a7d61dcc62abdf9af4dc350eb
|
2021-05-18 17:11:36 +00:00 |
|
Lucas Lin
|
cb56181fc3
|
[automerger skipped] Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3 am: aa307b03a9 am: b6e2b4239c -s ours am: e5fcc54bfc -s ours am: 209df66539 -s ours am: 0fa0429eb2 -s ours
am skip reason: Merged-In I47706efe9c53a00438fdec97fda244638cecb3dc with SHA-1 188d66a709 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1675475
Change-Id: Ia1a2a8d44c1e43d71bebf0bd413020022da7185f
|
2021-05-18 15:22:49 +00:00 |
|
TreeHugger Robot
|
82ef0b4f14
|
Merge "Import translations. DO NOT MERGE ANYWHERE"
|
2021-05-18 15:04:13 +00:00 |
|
TreeHugger Robot
|
4e82b1ee17
|
Merge "Import translations. DO NOT MERGE ANYWHERE"
|
2021-05-18 14:52:13 +00:00 |
|
Kevin Chyn
|
177825203b
|
Merge "Update fingerprint introduction "Keep in mind" section" into sc-dev am: cbf7e63d11 am: cd9ea26bbe am: 304d0c6c7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14506399
Change-Id: Id103248bd16f153edbdf78465792773ad8976e4f
|
2021-05-18 12:47:35 +00:00 |
|
Simon Wingrove
|
1e84653129
|
Merge "Allow security controllers to be used in other fragments." into sc-dev am: 47b5eadc5e am: 1cc723877c am: 748d1d1cea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14485179
Change-Id: Iab4d6548772eaddc38928bc22c1fc14885d46b42
|
2021-05-18 12:47:30 +00:00 |
|
YUKAI HUNG
|
1cc3d2b8fe
|
Merge "Fix GAR issue for battery chart description and the contrast ratio" into sc-dev am: 0d765c45a4 am: 3c56056709 am: 09a87e1530
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514139
Change-Id: I05b19e675c99a157049f2ee5c9908d8807fd2943
|
2021-05-18 12:47:24 +00:00 |
|
TreeHugger Robot
|
3a137693dc
|
Merge "[Provider Model] Show "!" icon when Wi-Fi is not validated (panel)" into sc-dev am: 839207436b am: 30a1d20c84 am: 0bfadc10d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14489518
Change-Id: I6b2c8164d920c712e1b6392432d87c48eea76544
|
2021-05-18 12:47:19 +00:00 |
|
Wesley Wang
|
c75cddf480
|
Merge "Update battery charging status string" into sc-dev am: 0f8673407a am: 0f693af408 am: 0a5b46b87c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514133
Change-Id: Ic69613e57e4b6dc289fb35aa94af2846fbcaea02
|
2021-05-18 12:47:13 +00:00 |
|
TreeHugger Robot
|
afd7be5d4d
|
Merge "Fix NPE on guest user" into sc-dev am: 1f9e88377c am: 5e1febaf38 am: 37bcbac813
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14505816
Change-Id: Id3fc03e09a444ecf69c59a5a218728c8fac6e414
|
2021-05-18 12:47:08 +00:00 |
|
TreeHugger Robot
|
f94466b727
|
Merge "Don't show DND access settings in managed users" into sc-dev am: 4784df542d am: 2b431505d9 am: e052b98f0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470058
Change-Id: Id97a72a37f5fa487ea2991837c755c8b952b498a
|
2021-05-18 12:47:02 +00:00 |
|
Wesley Wang
|
741071e8c8
|
Merge "Update battery state string" into sc-dev am: e966debfd5 am: ac62a0a172 am: 0c60387b00
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14495886
Change-Id: Ia78bb6321da72057ef0465bbbf11f2b6fd2169d8
|
2021-05-18 12:46:56 +00:00 |
|
Betty Chang
|
d72f80b91b
|
Merge "[GAR] Change the text color for "Airplane mode is on" message to follow the GAR" into sc-dev am: 8081c1fbdc am: bc3f743d58 am: d60c4f44cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14501879
Change-Id: I141fa2aa8bc0f3cc824935d34f599f84bddca0a2
|
2021-05-18 12:46:51 +00:00 |
|
YUKAI HUNG
|
e38fce2adc
|
Merge "Clear static icon and label cache if ui mode is changed" into sc-dev am: d78cd7272d am: becb4874d0 am: 4c366be30c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514123
Change-Id: I2444900a452bfeb9943d327c05d21e983f7f832a
|
2021-05-18 12:46:46 +00:00 |
|
Menghan Li
|
a2d39994c2
|
Merge "Fix style in "Vision Settings" is inconsistent" into sc-dev am: fd05966f4f am: e2fd5336fa am: ab21467a53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493677
Change-Id: Ie7fc71db28948e2da433c86a19392cb949a290da
|
2021-05-18 12:46:40 +00:00 |
|
Menghan Li
|
07b8f57ea3
|
Merge "[Material Next] Support "Learn more" for help link" into sc-dev am: 7bdf791e6c am: 5d16f0016e am: a8a43a11d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486196
Change-Id: I3727ea4ac8adc9fe7b7fed40dfa94444337e92c5
|
2021-05-18 12:46:35 +00:00 |
|
TreeHugger Robot
|
3559623fb9
|
[automerger skipped] Merge "Implements profile selection tab in Storage Settings" into sc-dev am: 0b43270035 am: c2937740e6 am: 01393e73f4 -s ours
am skip reason: Merged-In I8361c29bc240c519c7261b19522c41439479c1c2 with SHA-1 543068210f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352146
Change-Id: Ibb4daa95477a76c3f863e099ec17d7e932191b46
|
2021-05-18 12:46:29 +00:00 |
|
Betty Chang
|
e6fb585031
|
Merge "[GAR] Remove the registerForContextMenu for getting the correct TalkBack feedback" into sc-dev am: d3cbec6488 am: d76d734a91 am: 2663e3073a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493684
Change-Id: I063f6eaf330a02f61168085f61c247e0df910067
|
2021-05-18 12:46:23 +00:00 |
|
TreeHugger Robot
|
7abb007847
|
Merge "[Provider Model] Show searching sub-title only when the Wi-Fi network is empty" into sc-dev am: a1bfc7daeb am: 3509ae87e4 am: f042835757
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14511218
Change-Id: I69f332396eaaf5ed0e58776fc7f49ac34671f474
|
2021-05-18 12:46:18 +00:00 |
|
YUKAI HUNG
|
a1b9646619
|
Merge "Should not show internal package entry in the usage list" into sc-dev am: 0d00ace0d2 am: 25ec1568ab am: 0374df764a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14511219
Change-Id: I61a0fa3c0ed86292deeca0f8e510ac93691d3f4c
|
2021-05-18 12:46:13 +00:00 |
|
Kevin Han
|
2272356b6d
|
Merge "Fix "X unused apps" string to match w/ unused apps" into sc-dev am: 421c4e3efc am: db595f288e am: 8c32458b24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14471254
Change-Id: Ia0cb65a3a060b1ad3b45c8f7647e5f97e5f12ca4
|
2021-05-18 12:46:07 +00:00 |
|
YUKAI HUNG
|
b381fd2b22
|
Merge "Remove unnecessary converting us to ms" into sc-dev am: 899845b1ee am: b239ded129 am: e19967797b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503323
Change-Id: Id08b53bd59e3b20659f5ba7a98591a6f609c57be
|
2021-05-18 12:46:02 +00:00 |
|
TreeHugger Robot
|
741b0ed071
|
Merge "Add tests for guest user events" into sc-dev am: abd44a8a2e am: 20b1faef62 am: 36f714cbaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491474
Change-Id: I02b5e352e424d22ba44ff14ee298630ea1482576
|
2021-05-18 12:45:56 +00:00 |
|
TreeHugger Robot
|
09f891452b
|
Merge "Fix color contrast problem for VPN page" into sc-dev am: bc4f3817da am: 32bc62503c am: 8d4c4dc514
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14468618
Change-Id: I31b2ec5b1e42977e6a866e3452c1c4d08e98e0c7
|
2021-05-18 12:45:50 +00:00 |
|
ykhung
|
90569d5411
|
Keep selected time slot and expand state when device is rotate am: 9ef9e1ee0c am: 503d21a786 am: dd35264f21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503317
Change-Id: I9176d2141cde0b50d619723d68fbf97778b9eeb4
|
2021-05-18 12:45:44 +00:00 |
|
TreeHugger Robot
|
db3182ce29
|
Merge "Set storage volume spinner not clickable when only 1 volume" into sc-dev am: 2853e766f5 am: 92bf5c4876 am: a6ff8a73c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14495884
Change-Id: Ie306125e228265b8f70781d8100c8c9f7ca921f7
|
2021-05-18 12:38:28 +00:00 |
|
TreeHugger Robot
|
90a25734ee
|
Merge "Disable the info icon" into sc-dev am: 0fa1e491f8 am: 54d5defb28 am: e77b5a8f0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493678
Change-Id: If5d96ba8eec7fe19ee2fb14a631245761dfd6e58
|
2021-05-18 12:38:16 +00:00 |
|
PETER LIANG
|
0ee03de1aa
|
Merge "Provide a way to Accessibility button settings via intent." into sc-dev am: f2d70ab320 am: 9c8507fe11 am: 4077915d0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14008225
Change-Id: I5eb1eb073c26ac54144c4896ad7413151ba7a056
|
2021-05-18 12:35:17 +00:00 |
|
Menghan Li
|
4374a94f7d
|
Merge "[Material Next] Move “main switch” right below illustration" into sc-dev am: 16e8c767f1 am: 6476b523ef am: b984a552b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486917
Change-Id: Id025cac2f241c6f7098445520d7e19c20436f3d0
|
2021-05-18 12:34:46 +00:00 |
|
Joe Bolinger
|
52ef97b2f0
|
Merge "Add userId parameter to all uses of challenge in settings." into sc-dev am: 93f6a257e9 am: 5ab48dc412 am: 525bc0c4b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14472474
Change-Id: Ic835c32ac41464b2c77f53dd627b11bf35fc4cdf
|
2021-05-18 12:32:00 +00:00 |
|
Hai Zhang
|
a980af7e16
|
Merge "Don't add SettingsLib to static_libs in Settings unit test." into sc-dev am: 8a7f55246f am: e3f92d924d am: 23055a10a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491512
Change-Id: I3a040001f5475769f67d31c1c19540d01fccd539
|
2021-05-18 12:11:48 +00:00 |
|
TreeHugger Robot
|
d6353d830c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9d3c9dd867 -s ours am: cefbb1d83a -s ours am: 82c1e0ae12 -s ours am: 9b2cecdd05 -s ours am: 05c76c0e44 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491515
Change-Id: I4e95f0150d88eee1904d3e37825255772dce304c
|
2021-05-18 12:11:36 +00:00 |
|
TreeHugger Robot
|
91c5792d37
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 842c67d794 -s ours am: 84ed78af0a -s ours am: d1625e0793 -s ours am: c664eb135c -s ours am: a0f2972d87 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498657
Change-Id: I3454f08372d37daab97f550a269f3c29bf17aa6c
|
2021-05-18 12:11:30 +00:00 |
|
TreeHugger Robot
|
dcfff10976
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e81db4e2f0 -s ours am: 647e0ee2ad -s ours am: 3ac61d217a -s ours am: 6b9a23b8f3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491513
Change-Id: I33f2199a5ad2af3a6ac0d79e962edd4b138d4f19
|
2021-05-18 12:11:24 +00:00 |
|
TreeHugger Robot
|
875a750724
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 860318bab8 -s ours am: 2231cba3d1 -s ours am: ea888d7275 -s ours am: 8dbdb07e04 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491514
Change-Id: I6eb3632eb1d4a519bd0733f46d3c2e69cc3ad455
|
2021-05-18 12:11:18 +00:00 |
|
TreeHugger Robot
|
4e7f07f576
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3772f9137a -s ours am: 2da86a6163 -s ours am: 5625e4b302 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14498659
Change-Id: I91e9a29d6a132e8a0e9556b71f2c0ad49b07fc68
|
2021-05-18 12:10:49 +00:00 |
|
TreeHugger Robot
|
1d520c8b16
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 126fc5b912 -s ours am: 4e5a16a7d3 -s ours am: ed056a81f1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14500796
Change-Id: I422da904eb56c46d78739ca3b9e55d8df19afec5
|
2021-05-18 12:10:43 +00:00 |
|
ykhung
|
1e70aac70a
|
Refine graph top margin and expand/collapse icon theme color am: 525659c291 am: 8febb17220 am: 1422ab8a4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493692
Change-Id: I142cc4100e4566f88e5135f6dd85baa8548deeaf
|
2021-05-18 12:10:38 +00:00 |
|
TreeHugger Robot
|
ce9ab153e0
|
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da am: fc721d09cb am: 94e5b18951 am: 045aa65893 am: 9ebe07d216 am: 63cc6f167a am: d31c3649ba am: 758ec3b5eb am: 5234e8c98d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I8cb628a2f0d9900bc381143f0ab2e95d1095f2b3
|
2021-05-18 12:10:32 +00:00 |
|
Hugh Chen
|
cba1cbe691
|
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours am: 53ff99b8b4 -s ours am: 9bbcb55a23 am: fe87f1ac34 -s ours am: 8dbc94fcbe am: e90fdbf747 am: 445869a724 -s ours am: 0f74d4831c am: f489fd641f am: f06c856b22 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I08c50fe3c014da1c20d85f08d21825d094ed5c09
|
2021-05-18 12:10:31 +00:00 |
|
TreeHugger Robot
|
b54693da3b
|
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 am: 24ef90eaaa am: e5e19dd41a am: 0e37bc27a2 am: a6f32496f2 am: 9ff09ba818 am: 3a8360b8a8 am: cf63cfe7da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I4589c4564015dae49f871df585f6ea7174b1b761
|
2021-05-18 12:10:18 +00:00 |
|
Hugh Chen
|
561775ed61
|
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours am: 392fb7a4f7 am: 425430345d am: 47666c2d15 -s ours am: 33228acc37 am: f6a5b5fc7e am: 3d67afa264 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: Iaf7b815c8d92bd902a68d196fd4cc7657ada1bc5
|
2021-05-18 12:10:17 +00:00 |
|