Commit Graph

84901 Commits

Author SHA1 Message Date
Chloris Kuo
4ded87ebb3 Merge "Fix NAS dialog string" into sc-dev am: 074eee332a am: 0e30c2599f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14607898

Change-Id: Icbfd2ef1b819af211bb0fbc791ea9041417dd16d
2021-05-20 01:55:00 +00:00
YUKAI HUNG
bcadb99952 Merge "Align system time 12-24 hour format in the time slot information" into sc-dev am: 80f2f43d59 am: bf06c3c5f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609994

Change-Id: I2db00287ba2d4799ac6d20786f0cf90588fa282d
2021-05-20 01:54:55 +00:00
TreeHugger Robot
f392526fb5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7659a826c3 -s ours am: 1aed128b64 -s ours am: 3ea9148b47 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7480540a37e1072722e308338847e774a6a7a6b7
2021-05-20 01:54:50 +00:00
Bill Yi
1fa3df8016 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9afa4248cc -s ours am: 0ee82f4c33 -s ours am: e8d6f07126 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f34fa65c91f96daf0dde3a4e0804a0fac8197b9
2021-05-20 01:54:45 +00:00
TreeHugger Robot
6bd4b4ccd9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6ab5e4327c -s ours am: 6ac3c7186a -s ours am: f68e687f10 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idae0e11457d7bef101c2cb3ea8235010f24a7e6d
2021-05-20 01:54:41 +00:00
Bill Yi
dd85c7526c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cecd68c0c -s ours am: 712b1d5b4a -s ours am: 5bf187ec27 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia8c841545f74717cec9ecfb63680a5d479058edc
2021-05-20 01:54:36 +00:00
TreeHugger Robot
bfdc8c1295 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0af7445e78 -s ours am: f075886ddf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia82321996bf2dddd2ddc969e40a59f8c74e09002
2021-05-20 01:54:32 +00:00
TreeHugger Robot
8310f88f31 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 583c25da1f -s ours am: a82ce0e247 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I103b9138478a7bda81ddacd9505ccbc32a855111
2021-05-20 01:54:27 +00:00
TreeHugger Robot
914136591b Merge "Update style name" into sc-dev am: db6c7211e4 am: fe9d014c8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547063

Change-Id: Ia9356b4823ce829eb93e8899646caab7451e2045
2021-05-20 01:53:42 +00:00
Arc Wang
5e9b6c85e0 Merge "Add "This device" string for default internal storage" into sc-dev am: 7c3adee295 am: cf32a78aa9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609995

Change-Id: I72a0c63ed6de2f3f6aab973e948ed716b38c20a8
2021-05-20 01:51:20 +00:00
Betty Chang
180d113e43 Merge "[GAR] Change the text color for Private DNS Summary to follow the GAR" into sc-dev am: 78031d82b7 am: 597d2a157c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609992

Change-Id: I7d30bfa4b435cf2e767b9dd2f033e1971eab9f5b
2021-05-20 01:51:13 +00:00
Betty Chang
93d44674ad Merge "[GAR] Set selectable attribute to W+ network preference" into sc-dev am: 2d3487f704 am: 0853f28f5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609990

Change-Id: I9d9454e38e1af3749d2b78a715a8f627cf631477
2021-05-20 01:51:07 +00:00
ykhung
f22ae10b9b Add metric for battery defender am: 6590b368f2 am: 7acf3fc852
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554360

Change-Id: I7271cb28f899eaa816d1243795dde3e8d91766b5
2021-05-20 01:51:00 +00:00
Menghan Li
7bc8f4101c Merge "Fix flake issue on SettingsRoboTests" into sc-dev am: cadd868911 am: 47dc191940
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609993

Change-Id: Ic79a2434024351288534e0faa2c2dcffaae525d1
2021-05-20 01:50:54 +00:00
TreeHugger Robot
06e5421dbe Merge "Fix search highlight issues" into sc-dev am: 03099c04bd am: 66675b3e50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519527

Change-Id: I30cd01bcd5bfde167a7a495b89e8293db642cd0a
2021-05-20 01:50:48 +00:00
Evan Severson
a988c56a25 Merge "Update the settings privacy page to the latest mocks" into sc-dev am: 39e7cb2721 am: 1f2542e62c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215739

Change-Id: I2b55b8e2be72c50fb51c9f97fb6cab0c3e7c0584
2021-05-20 01:50:42 +00:00
TreeHugger Robot
58b7334199 Merge "Expose Lock screen settings page." into sc-dev am: cbb2bd6d13 am: 80b90cfadf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14544233

Change-Id: Ifbfb627d760c7f4aeb0e6e692443f8df7a54830c
2021-05-20 01:50:35 +00:00
YUKAI HUNG
4ee71b0d29 Merge "Fix legacy failed unit test for BatteryInfoLoader" into sc-dev am: 10559fb9de am: c0ab21eaa3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554353

Change-Id: I411b4a3f82ba8e0db4df8380a7de74a588af1294
2021-05-20 01:50:28 +00:00
Menghan Li
de8f4193a0 Merge "Remove above divider of main switch" into sc-dev am: c6e056b7f4 am: d5c5b6606d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554350

Change-Id: I891834adc7438bc7f752c6666ae15927a47dfd06
2021-05-20 01:50:21 +00:00
Menghan Li
728dfaceb2 Merge "Fix “Learn more” link not working on Magnification shortcut page from Vision Settings" into sc-dev am: 94ac5181ba am: b11c11196c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554349

Change-Id: I4cc27a0e25897dc6e77a8dc0e3f47b36f76a5ce1
2021-05-20 01:50:15 +00:00
Arc Wang
0052f7f46a Rename audios to audio am: 6062b6491d am: 9c191a1018
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518465

Change-Id: I274afecba4917ab6cc52274943f7132b7fa44e5c
2021-05-20 01:50:08 +00:00
Arc Wang
f11ab2eed1 Storage Settings shift profile selection tab position am: c0b5ba5225 am: 44bc515588
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441414

Change-Id: I757e81ee5eff34596b850fe8d2d6a73168d823db
2021-05-20 01:50:03 +00:00
Treehugger Robot
51f86d8efd Merge "Settings: remove Bluetooth related text from DNS-dialog" am: ca3051403f am: a786f86808 am: 21c08903e2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708562

Change-Id: Ia9bf1c6e6bdcd6a39a94f8ebef91d35dc2799566
2021-05-20 01:49:56 +00:00
Kevin Chyn
3746d75582 Merge "Fingerprint image is not important for a11y announcements" into sc-dev am: 15d75cf59a am: 98eacdad6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14537692

Change-Id: I77b629d77d8a0a077a268d50809f687fbdcf3b9d
2021-05-20 01:49:49 +00:00
TreeHugger Robot
fa20b6ff80 Merge "Filter out SecuritySettings search results when alternative available." into sc-dev am: 8355121c28 am: 817d610c4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14548182

Change-Id: Id3a6a28a0043560a1312b50ecc73f3cc90b5ade4
2021-05-20 01:49:42 +00:00
Yanting Yang
61068fbc9e Merge "Remove silky flag from homepage for official release" into sc-dev am: 89cd044bd7 am: a91d30fd51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502202

Change-Id: Ic83b503a8c1ff9cdc012d743bd923e501693ccc9
2021-05-20 01:49:36 +00:00
YUKAI HUNG
30749233a6 Merge "Add battery usage metric" into sc-dev am: d2d7d89de6 am: 0ef403044f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547065

Change-Id: I710f0b3061dd7c9f4132b449e55a06d599496d7d
2021-05-20 01:49:29 +00:00
Abel Tesfaye
da9cc9cff9 Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev am: c077b490f4 am: 069ec27db1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504137

Change-Id: I98cb6c02d11b7f127f691fb2cbb89be041e4e35a
2021-05-20 01:49:23 +00:00
Arc Wang
8dc46453ea Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev am: c0d31a80d3 am: 6ea0e686ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540525

Change-Id: I89af2a56e738de9d0deff2d8f53597b5d6512113
2021-05-20 01:49:16 +00:00
Arc Wang
04783b4afa Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev am: 20d45cc6f2 am: 2ff4ef036d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519528

Change-Id: I81bfdc407ca82bbbe76e002a4e2d69d1e690c59d
2021-05-20 01:49:10 +00:00
TreeHugger Robot
aa626fe7b2 Merge "Apply transition on the back arrow on NotificationHistory page" into sc-dev am: 5af530a054 am: 60f5f85774
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542668

Change-Id: I2c951f67f478a137997533bf905e970bd00c9a84
2021-05-20 01:49:03 +00:00
YUKAI HUNG
344e2fb978 Merge "Export a method for app info page to get last 24 battery history data" into sc-dev am: abd364e1f3 am: c5f6e92939
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542666

Change-Id: Id962b73d2da6841f02b36ca9161363ac736c1bb7
2021-05-20 01:48:57 +00:00
TreeHugger Robot
f03e134797 Merge "[Rohan] Two battery level, but no charging status in Rohan Setting" into sc-dev am: 0174c4bad0 am: f23409f7e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515925

Change-Id: I2b91663735969eca164bef8b390196b6df5b7a79
2021-05-20 01:48:50 +00:00
TreeHugger Robot
4f29131664 Merge "Fix foreground Service background launch restriction" into sc-dev am: 7c50995261 am: 66fa924dfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542667

Change-Id: I49aa4908c9fe121caefd785ba06d531c1bdccc43
2021-05-20 01:48:43 +00:00
TreeHugger Robot
caa900ce15 Merge "Fix test case failed" into sc-dev am: 6cd4ad46d2 am: 98c966412b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542669

Change-Id: I792db201cf9850969f6e32a4bba4fb4cc2784c96
2021-05-20 01:48:37 +00:00
Chiachang Wang
dcd3347a9c Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev am: 5613be1465 am: 2f17b57a66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518468

Change-Id: I78561a40e8887e4cc41a57622b49bc63e1ac0fde
2021-05-20 01:48:30 +00:00
TreeHugger Robot
7ccfa943b3 Merge "Wrap generating battery history keys into another method" into sc-dev am: 5c2a472b39 am: 2ba9a9df13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542665

Change-Id: I715f48e18261fc5c00f7e023619f24177bc30e77
2021-05-20 01:48:23 +00:00
Stanley Wang
22e3ba30a6 Merge "Guard the NPE on StartNow slice" into sc-dev am: f7cb316cd2 am: 977150fcbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515932

Change-Id: If9f3e974949407cf61f286e7b3e034f971042661
2021-05-20 01:48:17 +00:00
TreeHugger Robot
e186ad89ac Merge "Add divider below ActionButtonPreference in BluetoothDetailFragment" into sc-dev am: f6712e330a am: 92587df7cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439452

Change-Id: Icb2a8b4f07652c9036060507939f41a341e5fd89
2021-05-20 01:48:09 +00:00
Treehugger Robot
3e1d48c151 Merge "Device picker: add title to fix offset in progressbar" am: a3da419c8d am: a2dc65e71e am: 68b3473610 am: d70199e634 am: 9969d158a6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1622889

Change-Id: I9cb86e22243f59e4f04352e1e10fd53ac799bd94
2021-05-20 01:48:03 +00:00
TreeHugger Robot
2f91749129 Merge "Account settings: Fix duplicate title and extra padding." into sc-dev am: 52f627f9ef am: cef1f2c20c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14488985

Change-Id: Ic720900b22829ec14ab73d9a380ba4eb2ade66f0
2021-05-20 01:47:55 +00:00
TreeHugger Robot
a460177d1a Merge "Fixed extra padding in "Open by default" page" into sc-dev am: 8b9f1d4f9e am: ac21d38d3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540523

Change-Id: I5ac3ce87a4a8d6c7e885d60d04ff5fe39e4e4fb3
2021-05-20 01:47:48 +00:00
TreeHugger Robot
881c62cb6b Merge "Fix work profile picker user icon didn't follow UX guideline" into sc-dev am: c3dfd37df6 am: b970beb0c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540524

Change-Id: I838b272eba2e294cdd388d31b4de476887353746
2021-05-20 01:47:42 +00:00
TreeHugger Robot
db35f04680 Merge "Remove the divider above footer in Gesture Navigation Settings" into sc-dev am: e01099b245 am: 66ad8fd2c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515939

Change-Id: I81882fd1f84d6fd95ce912676c06fd6b9c5bceed
2021-05-20 01:47:35 +00:00
Yanting Yang
5f4660920a Merge "Move DWB to the fifth position from the bottom on the homepage" into sc-dev am: 542ba7477e am: 7d3c434500
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519526

Change-Id: I6b95bbdbff46d0a0309b5dd2ea51c407ed3a1b92
2021-05-20 01:47:29 +00:00
YUKAI HUNG
f76e1a38c8 Merge "Make chart time slot not clickable when accessibility servie is enabled" into sc-dev am: f70cb82b0c am: a9bdd91f19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515927

Change-Id: Icde6fb6c271c769bd6148d55b1d9406b7718d306
2021-05-20 01:47:23 +00:00
Tiffany Nguyen
843a8190b8 Merge "Redirect battery-level settings preference clicks if needed" into sc-dev am: df8537269f am: fbcb0afdff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486116

Change-Id: I7b9d854d6686003ae6b44352586b00c7df889dfe
2021-05-20 01:47:15 +00:00
Kevin Chyn
beb5a10043 Merge changes I9dea35a7,Iddcc0a65 into sc-dev am: bcc288e801 am: ecef0cd069
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14531459

Change-Id: I14aef39f5b12ab671e29c9d51eb7b36d53ce650d
2021-05-20 01:47:08 +00:00
Julia Reynolds
3b9579dc4d Merge "Fix vertical alignment in history" into sc-dev am: 14f204af54 am: b1d00f88f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14532408

Change-Id: Iea8189a7f6b8fe13859afe92769afa227c2151af
2021-05-20 01:47:02 +00:00
Julia Reynolds
8bc9539a40 Use | not , am: 78c4e70cf6 am: afb60352f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14534046

Change-Id: Ibd92d987dcea51d5447c78628bac068bfa052b52
2021-05-20 01:46:55 +00:00