Commit Graph

82554 Commits

Author SHA1 Message Date
ykhung
d4a51f750e Keep selected time slot and expand state when device is rotate am: 9ef9e1ee0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503317

Change-Id: If79b26014af46db41b26a92235e099061ad43183
2021-05-12 04:26:31 +00:00
ykhung
9ef9e1ee0c Keep selected time slot and expand state when device is rotate
Bug: 187772493
Test: make SettingsRoboTests
Change-Id: If70abf06825a88f0ad0add37ef8d4f46a0aad1e9
2021-05-12 03:28:59 +00:00
TreeHugger Robot
1036b2d281 Merge "Set storage volume spinner not clickable when only 1 volume" into sc-dev am: 2853e766f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14495884

Change-Id: I70fe0badecddd5f278eedbbef1dd015d4262422d
2021-05-12 03:26:09 +00:00
TreeHugger Robot
f2a7c865eb Merge "Disable the info icon" into sc-dev am: 0fa1e491f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493678

Change-Id: Id8da3881874ee6cf38d7f39047daf67b0b1968e4
2021-05-12 03:25:57 +00:00
PETER LIANG
4523f9d04b Merge "Provide a way to Accessibility button settings via intent." into sc-dev am: f2d70ab320
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14008225

Change-Id: I10aa8bd95792425a712d23837476c4e6baa7c944
2021-05-12 03:24:51 +00:00
TreeHugger Robot
2853e766f5 Merge "Set storage volume spinner not clickable when only 1 volume" into sc-dev 2021-05-12 03:10:53 +00:00
TreeHugger Robot
0fa1e491f8 Merge "Disable the info icon" into sc-dev 2021-05-12 03:10:36 +00:00
PETER LIANG
f2d70ab320 Merge "Provide a way to Accessibility button settings via intent." into sc-dev 2021-05-12 02:59:10 +00:00
Menghan Li
2b30d7202d Merge "[Material Next] Move “main switch” right below illustration" into sc-dev am: 16e8c767f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486917

Change-Id: Id3202eaa113c9596c966ae22c0d3a1657fe70221
2021-05-12 02:44:43 +00:00
Menghan Li
16e8c767f1 Merge "[Material Next] Move “main switch” right below illustration" into sc-dev 2021-05-12 02:28:25 +00:00
Joe Bolinger
efa6c8c940 Merge "Add userId parameter to all uses of challenge in settings." into sc-dev am: 93f6a257e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14472474

Change-Id: Ida521b3a3ccde9ba6d3524e174c392f1ab249d0b
2021-05-12 01:30:29 +00:00
Joe Bolinger
93f6a257e9 Merge "Add userId parameter to all uses of challenge in settings." into sc-dev 2021-05-12 01:25:39 +00:00
menghanli
1949a5d69f [Material Next] Move “main switch” right below illustration
Bug: 187688296
Test: Manual testing
Change-Id: Ic36b6deaad410fce49dcc19861a11307fb479f55
2021-05-12 00:56:50 +00:00
Hai Zhang
b65e2e6bed Merge "Don't add SettingsLib to static_libs in Settings unit test." into sc-dev am: 8a7f55246f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491512

Change-Id: Icd22baa7d575b32b1aa7adbcc2f55b4ee5ac9297
2021-05-11 22:48:56 +00:00
Hai Zhang
8a7f55246f Merge "Don't add SettingsLib to static_libs in Settings unit test." into sc-dev 2021-05-11 22:44:09 +00:00
TreeHugger Robot
44811a1021 [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 skip reason: subject contains skip directive

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

Change-Id: Iaf9544b4ed4da990b7583a0668865af5b21d6c1b
2021-05-11 16:37:02 +00:00
TreeHugger Robot
d890e42ee0 [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 skip reason: subject contains skip directive

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

Change-Id: Icdb8d887988e25ca30effc87789a0688204a709d
2021-05-11 16:36:58 +00:00
TreeHugger Robot
b801911c43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e81db4e2f0 -s ours am: 647e0ee2ad -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: I928cd70da93c3e27f8cd0093680261ee147db8b0
2021-05-11 16:36:54 +00:00
TreeHugger Robot
0fb191316e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 860318bab8 -s ours am: 2231cba3d1 -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: Ib40f87132819eaccf7fd1952c6e6c09d5aa42177
2021-05-11 16:36:50 +00:00
TreeHugger Robot
83d38a6e5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3772f9137a -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: I5dc2b00f2be3cadc44181875b1c7af437cf8af64
2021-05-11 16:36:31 +00:00
TreeHugger Robot
d48c64d321 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 126fc5b912 -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: I2c9bdf3f771fd4fa5411c9e17266ae4f56a029e9
2021-05-11 16:36:24 +00:00
ykhung
c17823dacf Refine graph top margin and expand/collapse icon theme color am: 525659c291
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493692

Change-Id: Ibc62ebdd10b69cd562c6f9bf1a418a2e82218fbb
2021-05-11 16:35:50 +00:00
TreeHugger Robot
6d1e8eed2f Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da am: fc721d09cb am: 94e5b18951 am: 045aa65893 am: 9ebe07d216 am: 63cc6f167a am: d31c3649ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: I2ceb77a463d8ca4e50735e67dc949d4f4889e5cf
2021-05-11 16:35:25 +00:00
Hugh Chen
aa53cfb0c1 [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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: I95f8f22595071978512a4927148d335319dc54ab
2021-05-11 16:35:24 +00:00
TreeHugger Robot
7291e2a3c9 Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 am: 24ef90eaaa am: e5e19dd41a am: 0e37bc27a2 am: a6f32496f2 am: 9ff09ba818
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: Ia2844169fb8a2b00e53d8705de0bd4371d395ef8
2021-05-11 16:35:12 +00:00
Hugh Chen
b3aeb23b44 [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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: If90b2a6871b677f48d33714192b2094c41b6afa8
2021-05-11 16:35:11 +00:00
TreeHugger Robot
3e7351d04c Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e am: 256de04464 am: 3942491a7f am: e492441e16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I5daa78c57f704a9bfde1eead77e28399cfee17f7
2021-05-11 16:34:47 +00:00
Hugh Chen
a9859b72a1 [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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: Iee3dca2a82c4535ba09d609c8f2b34df2f9f599a
2021-05-11 16:34:46 +00:00
TreeHugger Robot
5c1f453b99 Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: e790b378c3 am: 8be84e5e36 am: dff59b4188
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: I5cb56398144e030b1ff5fa6919bea379f907efb2
2021-05-11 16:34:00 +00:00
Hugh Chen
e56793efa0 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 -s ours am: 933f807885 am: c740d7ad82 -s ours am: 5d7d1a6b38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: I3d9f80c84fa609af5937c1b4644d3fd4a4506b0d
2021-05-11 16:33:59 +00:00
TreeHugger Robot
36e37d5449 Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da am: fc721d09cb am: 94e5b18951 am: 045aa65893 am: 8b76d88e55 am: 2097ca6a73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: I3c42913de28dc228f48cefe99cc7f7ba408fb20f
2021-05-11 16:33:40 +00:00
Hugh Chen
af5664bea5 [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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: I1cdeaf4e1eb26d762a7ddf31b497acc52c3b4514
2021-05-11 16:33:39 +00:00
TreeHugger Robot
66811dc96c Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 am: 24ef90eaaa am: e5e19dd41a am: b2c3b4f4cb am: 8cea64eae5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I90f2c5137abe91c684abe34f7572d27412d9c3e5
2021-05-11 16:30:17 +00:00
Hugh Chen
05209c1536 [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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I77673b7b7af144027faab91aa590dcdfe5ab4861
2021-05-11 16:30:16 +00:00
TreeHugger Robot
798b9051e7 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e am: 85410254c7 am: 872093e29d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: Ib9826bbf56e14d28a938a2170497feed7ac08f15
2021-05-11 16:29:48 +00:00
Hugh Chen
6beba0198b [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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I800b3bfbb89d069fbbc41f86513e4645edbbd3cd
2021-05-11 16:29:46 +00:00
TreeHugger Robot
57ced04e30 Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: cb2b575a9d am: a5d3b8a45c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: I2657fd8f2674763a59a18c3182cdd8a13d16deae
2021-05-11 16:29:06 +00:00
Hugh Chen
6340f5023a [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 am: e914289a2c -s ours am: 810abfc77b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: Ie849ad46c439d1b5456c21a4aa62a746f2eb65fa
2021-05-11 16:29:05 +00:00
Wesley.CW Wang
00d3eadbe4 Fix color check error am: 7a8d2f4486
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493679

Change-Id: I828664032fb2cdeac4edc2aa2024d55662ae6f79
2021-05-11 16:28:33 +00:00
YUKAI HUNG
ad76d9971e Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev am: 7a678f29b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486919

Change-Id: I32e8ffaf706a393d8b0a7ea8b023a4f62da57c05
2021-05-11 16:27:59 +00:00
Jason Chiu
4765dd2849 Merge "Apply the new search bar background color" into sc-dev am: 0c2fa9cd69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441412

Change-Id: I00b258a624caa218ea71732a3d3209624dc3cbf3
2021-05-11 16:27:47 +00:00
Wesley Wang
2c3ba9e13c Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev am: e19d238d18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486918

Change-Id: Ic5f6d49324323bd06104edb984289bf599ac2072
2021-05-11 16:27:04 +00:00
Wesley Wang
3152423de2 Merge "Update battery usage summary" into sc-dev am: 56488ef84b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486916

Change-Id: I4ff4ac9bc77826e57b0c5f751bc8fbdb2d9539dd
2021-05-11 15:48:23 +00:00
Julia Reynolds
1d90527fbe Merge "Handle NLS metadata when provided as strings" into sc-dev am: 333b68d059
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470497

Change-Id: I3fd8fa7f47be72c54d140ed987f0226f483d0ffc
2021-05-11 15:21:54 +00:00
TreeHugger Robot
57d2131a8a Merge "Fix work profile setting appearing too often" into sc-dev am: 9cb5ab3860
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470515

Change-Id: I3a983a334a4d0b998eaa6244a89a2f2f3890d96f
2021-05-11 15:15:47 +00:00
Wesley.CW Wang
b9599ae39a Update battery status good icon color am: 021e6b131f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456012

Change-Id: I8beecf2237ea359ab8bf4cf981527463c47b589c
2021-05-11 15:15:42 +00:00
Tom Hsu
e6615a63db Merge "Show W+ when connected to Carrier Wi-Fi Network" into sc-dev am: fa024d6fc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456005

Change-Id: I23343902a67a9b8c2473349bbf9348fd18adb999
2021-05-11 15:15:38 +00:00
Ryan Lin
a02e977d36 Merge "Fix Punctuation inconsistency in the Magnification shortcut pop up" into sc-dev am: 4523f9200f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456010

Change-Id: I7c63e0c8f623d687be25aa97e4123dcf99c50618
2021-05-11 15:15:32 +00:00
Syaoran Kuo
2cfe02b17b Merge "Add more log for debugging resource id issue." into sc-dev am: e37d12e5c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456004

Change-Id: I339c77e534e8693c94c0957e9e320962901cbcc7
2021-05-11 15:15:27 +00:00
TreeHugger Robot
d0fdb0f74c Merge "Merge existing bundle with ActivityOptions" into sc-dev am: 57d8d38a3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455998

Change-Id: I5bbdde03e6f815ce126cda645c8075b0b6ef8e65
2021-05-11 15:15:11 +00:00