Commit Graph

84692 Commits

Author SHA1 Message Date
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
YUKAI HUNG
a8afbb35b0 Merge "Support old pixel devices to adopt non-clickable chart design" into sc-dev am: 48535ffd29 am: 27449fb2a7 am: 9733bfa405
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456009

Change-Id: I89dfa5018f459971575952e49f45cf8908b4cba3
2021-05-18 09:35:32 +00:00
TreeHugger Robot
c2dc065b8c Merge "Commit changes only when activity is closed" into sc-dev am: 257b3ec584 am: d0c043b0a9 am: afbb8905b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14463203

Change-Id: If88632148570857e99f29e7f8f5128261c30d292
2021-05-18 09:35:26 +00:00
TreeHugger Robot
d56cf3038f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5c29b05ab3 -s ours am: 1b3330409b -s ours am: 32829de55e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifdabe514057da6aa4b2e3eb0f6d19a385c26ebb1
2021-05-18 09:34:55 +00:00
TreeHugger Robot
dd9b373d1a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e1aa1f04c0 -s ours am: 5d6b03e51c -s ours am: 823de830a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0a20a5a2f3fb8c17fe1f5e7878fe74a77327ccce
2021-05-18 09:34:49 +00:00
ykhung
50ed9d347f Build a bridge to control whether the graph is clickable or not am: d8d5335096 am: fd541575ea am: f0d1544bd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456008

Change-Id: I6b80789d77047044e1b1eaead64a1aa0814359e7
2021-05-18 09:34:43 +00:00
ykhung
ab962d82f4 Fix UI flashes issue when entering to the app in the cold start am: 5b27fd923a am: a4641ab27d am: a2cfc39b0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456007

Change-Id: I018fdf0ed0cefc6b55b0d2cd3ca85fe5db50acf5
2021-05-18 09:34:32 +00:00
Treehugger Robot
aedb67657d [automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00 am: 8c84477a04 -s ours am: d13156d85a -s ours am: e704cef070 -s ours am: e9bedba498 -s ours am: ee4eccf5a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbcb2e39c3075a06dd2dba3e88e327528b773de2
2021-05-18 09:23:59 +00:00
Xin Li
c855e173e4 [automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f am: c41debcf7f -s ours am: 06e9e8b3a9 -s ours am: ff21be103b -s ours am: 16f8c68d8c -s ours am: 6d919bb2c8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I40adac37dfd0f2f8d09a45933dad15a18a8808e0
2021-05-18 09:23:52 +00:00
Yu-Han Yang
98631111ad Merge "Revert "Remove dynamic location settings footer"" into sc-dev am: f730edaaac am: a5464f4438 am: fc0eebc86e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443640

Change-Id: I15ba4b2bbe92f1abbd101b69f48e96c9eeedcab1
2021-05-18 09:02:26 +00:00
Curtis Belmonte
ecca38184f Merge "Revert "Turn on the transition flag"" into sc-dev am: 5ece4babd3 am: 1906ce95ab am: 5b14a163cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14471733

Change-Id: Ia56420e53b77bf1131f9f67fd1f268baaca661dd
2021-05-18 09:02:14 +00:00
Edgar Wang
61644aaad1 Merge "Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib" into sc-dev am: 9da824db15 am: 1f8a8893ae am: 65f4386b05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456003

Change-Id: Ie60fcd5b523e20b95dfcea958c88a2d0cb4f26e1
2021-05-18 09:01:04 +00:00
Bill Yi
411d863218 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I12473116e2531669ff9a7e59882604e10f2dcf6e
2021-05-18 07:55:11 +00:00
Bill Yi
cbb164a016 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I11dfca6cfe1eaeeb5739a670223ffe3bb96aa756
2021-05-18 07:48:44 +00:00
ykhung
7acf3fc852 Add metric for battery defender am: 6590b368f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554360

Change-Id: I95b8e2f1595f675c48b4f06d051b3360befc7a91
2021-05-18 05:35:59 +00:00
ykhung
6590b368f2 Add metric for battery defender
Bug: 188384887
Test: make SettingsRoboTests
Change-Id: Ida96deb6efe94a98cf6837b9f82758467a4d1300
2021-05-18 05:19:45 +00:00
Menghan Li
47dc191940 Merge "Fix flake issue on SettingsRoboTests" into sc-dev am: cadd868911
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609993

Change-Id: I8e781159356f15c907fd3565232bffab37a09ce9
2021-05-18 05:00:16 +00:00
Menghan Li
cadd868911 Merge "Fix flake issue on SettingsRoboTests" into sc-dev 2021-05-18 04:36:32 +00:00
TreeHugger Robot
66675b3e50 Merge "Fix search highlight issues" into sc-dev am: 03099c04bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519527

Change-Id: I1b2044b4911dbf2557a19759740ada19f84760a3
2021-05-18 03:53:42 +00:00
TreeHugger Robot
03099c04bd Merge "Fix search highlight issues" into sc-dev 2021-05-18 03:24:17 +00:00
menghanli
4a12cd51a6 Fix flake issue on SettingsRoboTests
Root cause: SpannableStringBuilder cannot handle the preference title is
empty caes.
Solution: Assign default value in test case setup.

Bug: 188448957
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityButtonFooterPreferenceControllerTest
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityControlTimeoutFooterPreferenceControllerTest
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=CaptionFooterPreferenceControllerTest
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=ToggleAutoclickFooterPreferenceControllerTest
Change-Id: Ia95a6ecba824d81e0ccf649975517231ecf475b3
2021-05-18 10:44:04 +08:00
Evan Severson
1f2542e62c Merge "Update the settings privacy page to the latest mocks" into sc-dev am: 39e7cb2721
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215739

Change-Id: I0501ac361ec29b4064d8a8b5bc80f58492d58e7d
2021-05-18 00:37:24 +00:00
Evan Severson
39e7cb2721 Merge "Update the settings privacy page to the latest mocks" into sc-dev 2021-05-18 00:23:22 +00:00
Evan Severson
175ca1c4b0 Update the settings privacy page to the latest mocks
Add the mic and camera toggles to the page. Also create an helper class
to keep binder calls to the system_server at a minimum.

Test: make RunSettingsRoboTests
Test: atest SettingsUnitTests
Test: Manual
Bug: 183985427
Change-Id: Iff6ee1c9a2c30095307f636decbcfcf298ed31b0
2021-05-17 22:49:28 +00:00
TreeHugger Robot
80b90cfadf Merge "Expose Lock screen settings page." into sc-dev am: cbb2bd6d13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14544233

Change-Id: I04f0f22462f07dda215e04325adc7cde2562a7d8
2021-05-17 17:55:13 +00:00
TreeHugger Robot
cbb2bd6d13 Merge "Expose Lock screen settings page." into sc-dev 2021-05-17 17:48:18 +00:00