PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,290 Commits 1 Branch 0 Tags
dfa0fe0212d4522ed6450486e48ce6ea08a8969f
Commit Graph

85290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
3a0cb3f14b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fb47f1e143 -s ours am: bf0ef5b73a -s ours am: 3693498d2b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I203b65d8d8e04a468a5e9745cf5a1fd70f8ef5ae
 2021-05-15 04:58:12 +00:00
Bill Yi
ec6e1be6cd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6bb78b6d1b -s ours am: ff5e910f46 -s ours am: c55ee5997c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90efca069329e865bda097854bb1bd1823e75611
 2021-05-15 04:58:08 +00:00
TreeHugger Robot
08bb852a30 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6c7771a521 -s ours am: fa0c8a8ce8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0c8962df2043f08a9afdfda8a169905d2a4474c
 2021-05-15 04:57:51 +00:00
TreeHugger Robot
b558344188 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 041b99ccd5 -s ours am: dad62285d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie62f9b64f4770c7a982eddfba00f89f9706586c1
 2021-05-15 04:57:47 +00:00
Menghan Li
4b5dc6d262 Merge "Improve search by adding the settings keywords for supported framework feautres" into sc-dev am: 1576980095 am: 3eabde60b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299189

Change-Id: I0823499310f9ee17edf5d818db7e0a6e13a3f8d6
 2021-05-15 04:57:41 +00:00
Almaz Mingaleev
d8069cd1c1 Merge "Place GeoTZ toggle under auto time zone toggle." into sc-dev am: c51cefb2b9 am: 74d2521f17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353668

Change-Id: I04ed64bf974ec7492c6d72a53794d1bd13f538c3
 2021-05-15 04:57:19 +00:00
Yi Jiang
f73eb64d59 Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: 16b0f660ae am: d6e7c97468 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14114425

Change-Id: Id6211516feaafd5214e35d3a08f50f1cf0b53598
 2021-05-15 04:57:14 +00:00
Amit Mahajan
b6f314f644 Merge "Fix incorrect logging." into sc-dev am: 6402ac45e6 am: a0726c49f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330728

Change-Id: I4435d1179679477159aba6a0b7187e1d223ca8b8
 2021-05-15 04:57:10 +00:00
Matt Pietal
85d62cac73 Merge "SUW - Apply theme to FRP PIN pages" into sc-dev am: 0ddacf1152 am: fb9f7f8684 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339991

Change-Id: I2584f9cf212a58d160ac7afb87dc2a9ebc4526d2
 2021-05-15 04:57:05 +00:00
Tom Hsu
9466addf62 Merge "[ApnEditor] Create another string id for translation" into sc-dev am: 58fb70f8d6 am: c86c00f6b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327014

Change-Id: I4262eb46525d3c776526a23f13a2a0eca276de89
 2021-05-15 04:57:01 +00:00
Wesley Wang
ee87ae9754 Merge "Make app usage page active time support time period" into sc-dev am: 04e14e41f0 am: 7e29471cd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297857

Change-Id: Ibf9032b177ec506cbc9b07e24699543e3dd52206
 2021-05-15 04:56:56 +00:00
Tsung-Mao Fang
8b8290a8e5 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 697a73dfdf -s ours am: c12e5f2455 -s ours am: ea699a1d2c -s ours am: a68dc4738b -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 80c3f6d4d8 is already in history

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

Change-Id: I5dd4e0300bd8a6bf53858ae2938e826d9a91e339
 2021-05-15 04:56:52 +00:00
Tsung-Mao Fang
500651cbb6 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 656dcf8334 -s ours am: 5fb1fd0ca8 -s ours am: 72072cff42 -s ours 
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 80c3f6d4d8 is already in history

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

Change-Id: I27c37a2484d90d876f1dddff3e9263c60b91c6ef
 2021-05-15 04:56:36 +00:00
PETER LIANG
93351d6b0a Merge "Update the BC style for the vision settings in SuW." into sc-dev am: 9246f6f8b0 am: 6f438ebd9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319864

Change-Id: I6c61f94b1d12411451e5265fac51b8a0d58c6c39
 2021-05-15 04:56:22 +00:00
TreeHugger Robot
a91920fefa Merge "Settings: Turn Privacy hub on by default." into sc-dev am: 7bdbe80abe am: 1b08a11dfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339809

Change-Id: Ia8bfbb1d78bfc1de899a11f15acc94ad55034f85
 2021-05-15 04:56:17 +00:00
TreeHugger Robot
3b780d0618 Merge "Fix several challenge paths" into sc-dev am: fcb325c562 am: 1a10e00c54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14342148

Change-Id: I544ec89f2b6e0340685d407420b707cde8a14e87
 2021-05-15 04:56:13 +00:00
TreeHugger Robot
0650af4347 Merge "Remove icons of Location Services and App location permissions" into sc-dev am: 3eb980d41b am: e1e738b86f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14341501

Change-Id: I25091ee1e7f9eee0517fe3e0f54fe2973848bd5e
 2021-05-15 04:56:04 +00:00
Kevin Chyn
f7c0b05375 Merge "Fingerprint image is not important for a11y announcements" into sc-dev am: 15d75cf59a am: 3d69810107 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14537692

Change-Id: Ia701cb3005629ae43bce408433bbf8ad9f15d1ba
 2021-05-14 21:41:13 +00:00
Kevin Chyn
3d69810107 Merge "Fingerprint image is not important for a11y announcements" into sc-dev am: 15d75cf59a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14537692

Change-Id: Idacfc71f1e120f50f9f4846d5e5622da0754cbf4
 2021-05-14 21:28:17 +00:00
Kevin Chyn
243fac8b04 Merge "Fingerprint image is not important for a11y announcements" into sc-dev am: 15d75cf59a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14537692

Change-Id: I6d41209657083dfec0f6d98666589a11ce2552c7
 2021-05-14 21:26:24 +00:00
Kevin Chyn
98eacdad6a Merge "Fingerprint image is not important for a11y announcements" into sc-dev am: 15d75cf59a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14537692

Change-Id: Id4426940f847b987ad9139b06261ac8bbffc5a98
 2021-05-14 21:26:01 +00:00
Kevin Chyn
15d75cf59a Merge "Fingerprint image is not important for a11y announcements" into sc-dev 2021-05-14 21:06:11 +00:00
TreeHugger Robot
2aef91719b Merge "Filter out SecuritySettings search results when alternative available." into sc-dev am: 8355121c28 am: 5f6f2a4b58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14548182

Change-Id: Ie84e42dcbd76ae53a73a72a3fc39b3f22f2e06c4
 2021-05-14 20:05:16 +00:00
TreeHugger Robot
5f6f2a4b58 Merge "Filter out SecuritySettings search results when alternative available." into sc-dev am: 8355121c28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14548182

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

Change-Id: I62ae074dcd414e0fdfb75aea0a231f147675359b
 2021-05-14 19:51:08 +00:00
TreeHugger Robot
148bdb9e65 Merge "Filter out SecuritySettings search results when alternative available." into sc-dev am: 8355121c28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14548182

Change-Id: I060170b10d230cd153d678b1e9c26c6ef56124d1
 2021-05-14 19:50:34 +00:00
TreeHugger Robot
8355121c28 Merge "Filter out SecuritySettings search results when alternative available." into sc-dev 2021-05-14 19:33:01 +00:00
Yanting Yang
03a9543682 Merge "Remove silky flag from homepage for official release" into sc-dev am: 89cd044bd7 am: 29080c68b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502202

Change-Id: I403cba576a5096c9ded80b08e4b13b1d570033e5
 2021-05-14 18:50:46 +00:00
Yanting Yang
29080c68b3 Merge "Remove silky flag from homepage for official release" into sc-dev am: 89cd044bd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502202

Change-Id: I8ef251f1c9222ad7f8d4e9dd30a7f3f51b8da26a
 2021-05-14 18:36:37 +00:00
Yanting Yang
a91d30fd51 Merge "Remove silky flag from homepage for official release" into sc-dev am: 89cd044bd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502202

Change-Id: I46a23fe36b72d0846bc65e1ef113be44ade43fd3
 2021-05-14 18:34:41 +00:00
Yanting Yang
802af0f016 Merge "Remove silky flag from homepage for official release" into sc-dev am: 89cd044bd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502202

Change-Id: Ic18f30f5f10d2e75d3f9aab119666ecc82091383
 2021-05-14 18:34:37 +00:00
YUKAI HUNG
70f34c947e Merge "Add battery usage metric" into sc-dev am: d2d7d89de6 am: 8bfc40046e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547065

Change-Id: If86edd6d47b199e001ee0bb672f96f3075983fc2
 2021-05-14 18:17:56 +00:00
Yanting Yang
89cd044bd7 Merge "Remove silky flag from homepage for official release" into sc-dev 2021-05-14 18:13:29 +00:00
YUKAI HUNG
8bfc40046e Merge "Add battery usage metric" into sc-dev am: d2d7d89de6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547065

Change-Id: I92fcdbabb74151b33dd71aacafddb81cff3fccda
 2021-05-14 17:57:07 +00:00
YUKAI HUNG
0ef403044f Merge "Add battery usage metric" into sc-dev am: d2d7d89de6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547065

Change-Id: Iad2ff218185ead6d3c7ce24372f70b409a6e2f2d
 2021-05-14 17:47:45 +00:00
YUKAI HUNG
65b5d9706e Merge "Add battery usage metric" into sc-dev am: d2d7d89de6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547065

Change-Id: I4a45edac90e4291bf32656f0944b5fa6a63fb3fd
 2021-05-14 17:47:09 +00:00
YUKAI HUNG
d2d7d89de6 Merge "Add battery usage metric" into sc-dev 2021-05-14 17:22:10 +00:00
Abel Tesfaye
8a8ad35cd0 Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev am: c077b490f4 am: 29a695b0c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504137

Change-Id: Ida4f97953c22b8ea942f94557c95efb24e6f88db
 2021-05-14 16:35:07 +00:00
Abel Tesfaye
29a695b0c7 Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev am: c077b490f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504137

Change-Id: I1f2cbcfe67614dbf8a9dba475f9a126cd25626b0
 2021-05-14 16:14:03 +00:00
Abel Tesfaye
c045fb64e6 Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev am: c077b490f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504137

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

Change-Id: I0b1735f1393da95df9576db11ecb22086b0d08ed
 2021-05-14 16:12:21 +00:00
Abel Tesfaye
c077b490f4 Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev 2021-05-14 15:55:01 +00:00
ykhung
1ec8f04feb Add battery usage metric 
Bug: 188046672
Test: make SettingsRoboTests
Change-Id: I1716913eee7c93cafd622052dcbca940c9726a17
 2021-05-14 14:18:55 +00:00
Arc Wang
a3c6cd1cdd Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev am: c0d31a80d3 am: 5e0461e3a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540525

Change-Id: Ic1e1cb8d350b6f09cf5a50781177311c08107740
 2021-05-14 13:28:35 +00:00
Arc Wang
5bbdc3b5b9 Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev am: 20d45cc6f2 am: 4418d9a31a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519528

Change-Id: I99d381076cdcec75f1a5f35f79374e3222af4b1c
 2021-05-14 13:28:22 +00:00
Arc Wang
5e0461e3a2 Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev am: c0d31a80d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540525

Change-Id: I51af4157dad68a5d2bcb4c5b521d59f9b0e3e265
 2021-05-14 13:15:33 +00:00
Arc Wang
4418d9a31a Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev am: 20d45cc6f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519528

Change-Id: I7acf8e2ae01291aab9ab5b603a608a70e9635010
 2021-05-14 13:15:29 +00:00
Arc Wang
a486f770a6 Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev am: c0d31a80d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540525

Change-Id: I0665220f32173de9c21b1a3c79d20d60b48a85a7
 2021-05-14 13:13:42 +00:00
Arc Wang
17b52da448 Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev am: 20d45cc6f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519528

Change-Id: I52c854da8e487abb439d242730dd81994f94a16a
 2021-05-14 13:13:34 +00:00
Arc Wang
6ea0e686ea Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev am: c0d31a80d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540525

Change-Id: Id63db4ce7e78e1ad807b6851a7e4876f22794303
 2021-05-14 13:11:25 +00:00