Commit Graph

84522 Commits

Author SHA1 Message Date
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
TreeHugger Robot
745e90dce2 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e am: 256de04464 am: 3942491a7f am: e492441e16 am: ef74576517 am: 41cda777ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I078510d2352d975ed1fbc50d452ecf777a1b119e
2021-05-18 12:10:05 +00:00
Hugh Chen
8448c5d1cc [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours am: effac8a0c1 am: 6fee770ea0 am: 8bf67a7f4b -s ours am: 0bc5e289a4 am: 399b1da869 am: 17d2fe6c04 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I53f8aa35d1dda979dd3478d8162c58543165c713
2021-05-18 12:10:03 +00:00
TreeHugger Robot
d8edf3cf90 Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: e790b378c3 am: 8be84e5e36 am: dff59b4188 am: 754b34800e am: 83e3b2c24c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: Ie67b63c6f0f0191d92d38642b3c1a4cfa76e8c4e
2021-05-18 12:09:52 +00:00
Hugh Chen
9971a40360 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 -s ours am: 933f807885 am: c740d7ad82 -s ours am: 5d7d1a6b38 am: 6b7bd492bb am: 458bd36eb1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: I1b1376d2a63937c7403ec00942912a83f4fc20c2
2021-05-18 12:09:50 +00:00
TreeHugger Robot
a4174e63b9 Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da am: fc721d09cb am: 94e5b18951 am: 045aa65893 am: 8b76d88e55 am: 2097ca6a73 am: 520cc8ef7d am: a35dca1c75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: I3aac3d6c2642e16b6309156c58770d464c203251
2021-05-18 12:09:41 +00:00
Hugh Chen
5453174bcc [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: 68f4157827 -s ours am: 628a92c252 am: dcb892788a am: 29bd970c73 -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: I1847019f1756498e1fb36df91c08c07677346b49
2021-05-18 12:09:40 +00:00
TreeHugger Robot
08d8301933 Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 am: 24ef90eaaa am: e5e19dd41a am: b2c3b4f4cb am: 8cea64eae5 am: eb47afb169 am: 5a357e22ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I90c731d88f6ff9fceb79b45329c2f41dc9321e4a
2021-05-18 12:09:27 +00:00
Hugh Chen
6060efb70f [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours am: 392fb7a4f7 am: 0248e7b7cf -s ours am: caf59cbbcf am: 73809561df am: 771651c2f6 -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: I68a775b4f0ce0ff4ee70664dcb1f983d424111e7
2021-05-18 12:09:26 +00:00
TreeHugger Robot
1ab5e32814 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e am: 85410254c7 am: 872093e29d am: cd1451ce53 am: 6e66ed699b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: Iafc35823337b79faa733f72584e841c031104942
2021-05-18 12:09:15 +00:00
Hugh Chen
acb13402ed [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours am: effac8a0c1 am: ac30bfef8c -s ours am: 7eeee9be6a am: adecb886fb am: 0922c78b70 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I56de9abeedb6a7f74e33e105610c0e8eec20ca28
2021-05-18 12:09:14 +00:00
TreeHugger Robot
a7f53a8d76 Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: cb2b575a9d am: a5d3b8a45c am: 78f4bcf7d8 am: 43e9c3e308
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: Ie6037068284f376fe362617cb1076453a3fe1071
2021-05-18 12:09:03 +00:00
Hugh Chen
b14b3512b8 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 am: e914289a2c -s ours am: 810abfc77b am: c6a9224864 am: 412678bf13 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: I10ea8bbd3b31efa53b9d5228daffd544133d7630
2021-05-18 12:09:02 +00:00
Wesley.CW Wang
2ccba0d2ee Fix color check error am: 7a8d2f4486 am: 58c34f2ce3 am: d8c7606faf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493679

Change-Id: Id6368f516758673e0b73cd91c0174c841d1137d6
2021-05-18 12:08:52 +00:00
YUKAI HUNG
e2e61089cc Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev am: 7a678f29b2 am: 16fe59dab7 am: 91d9b370e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486919

Change-Id: Iaa0b8796f9dbe05f2900064125f1d50a326d574f
2021-05-18 12:08:44 +00:00
Jason Chiu
fb62c8622b Merge "Apply the new search bar background color" into sc-dev am: 0c2fa9cd69 am: ad838712ed am: b22d9bdb0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441412

Change-Id: Ic4d5376b837af1e4b3f602fd19efcc4341b16cb7
2021-05-18 12:08:32 +00:00
Wesley Wang
99dbb64fab Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev am: e19d238d18 am: c06523741c am: 3d615d4e16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486918

Change-Id: Ic28195a4e2f7703683a77e329f9c8ba56a9cde4e
2021-05-18 12:04:08 +00:00
Wesley Wang
7a244f3e1b Merge "Update battery usage summary" into sc-dev am: 56488ef84b am: d591642bb7 am: 2e663eb5e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486916

Change-Id: Ibaf5842822302009180c65aebf099c2312b47c88
2021-05-18 12:04:01 +00:00
Julia Reynolds
f52645b236 Merge "Handle NLS metadata when provided as strings" into sc-dev am: 333b68d059 am: 9936e10d1e am: aef5f6adce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470497

Change-Id: I595e0cd87c2cfc6a744aa274691a2b003178993e
2021-05-18 09:47:01 +00:00
TreeHugger Robot
d1ad7d93a0 Merge "Fix work profile setting appearing too often" into sc-dev am: 9cb5ab3860 am: 82ddd0b57e am: fcfd177aad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470515

Change-Id: I42badfa84e8ee57f15062ae9563b4f93f8f97da7
2021-05-18 09:41:32 +00:00
Wesley.CW Wang
2041212a4f Update battery status good icon color am: 021e6b131f am: 91062b1af8 am: 59b3f3e129
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456012

Change-Id: I402f58965a73886aa89ddb2751cff2190a0db0dd
2021-05-18 09:41:25 +00:00
Tom Hsu
192891ba4b Merge "Show W+ when connected to Carrier Wi-Fi Network" into sc-dev am: fa024d6fc8 am: 444fef8f4c am: 17ebc62223
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456005

Change-Id: I5142ad7d76d00e31a088453c2a81a7d5f5bdd77a
2021-05-18 09:41:20 +00:00
Ryan Lin
bca6d4e781 Merge "Fix Punctuation inconsistency in the Magnification shortcut pop up" into sc-dev am: 4523f9200f am: cb1cb02224 am: 1580cd21ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456010

Change-Id: I7333709ffae0a0bc7e380ef1b97ce014b33308a7
2021-05-18 09:41:15 +00:00
Syaoran Kuo
dc01d06a10 Merge "Add more log for debugging resource id issue." into sc-dev am: e37d12e5c4 am: 37ab5dbc8f am: a0e43be923
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456004

Change-Id: I61e6bc71a073970cb3e3db4238352e24e4b6f86e
2021-05-18 09:41:07 +00:00
TreeHugger Robot
f58985d493 Merge "Merge existing bundle with ActivityOptions" into sc-dev am: 57d8d38a3c am: 0819ab21c5 am: fabd6033e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455998

Change-Id: I59d11f8cb927c0b710b2f7283eeb7e43cd2d4401
2021-05-18 09:35:47 +00:00
Weng Su
ea7fb69a41 Merge "[Provider Model] Add progress bar to internet panel" into sc-dev am: 72c3debb0b am: 1ab5ed70af am: 5302ff6475
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442219

Change-Id: I49f4219106d693a8003078ceca614786c79bcd10
2021-05-18 09:35:38 +00:00