PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,421 Commits 1 Branch 0 Tags
ec6e1be6cd974cec2ff11a0eb1f4548005071c05
Commit Graph

82421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
c0d31a80d3 Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev 2021-05-14 12:59:11 +00:00
Arc Wang
20d45cc6f2 Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev 2021-05-14 12:58:36 +00:00
Jan Tomljanovic
e6070f9f0e Filter out SecuritySettings search results when alternative available. 
When alternative fragment is shown for the security settings page, we
don't want to show search results that would lead to an unused security
settings page.

Test: manual
Test: atest SettingsUnitTests
Test: make RunSettingsRoboTests -j
Bug: 184613149
Change-Id: I525bd87d1ac6a24a7a26f59ae917e35ac39732e3
 2021-05-14 11:52:12 +01:00
TreeHugger Robot
152f48f839 Merge "Apply transition on the back arrow on NotificationHistory page" into sc-dev am: 5af530a054 am: 918af6c6a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542668

Change-Id: Ic2bb5ab8562c6559effaebe1799354d7f46bf7ce
 2021-05-14 10:25:31 +00:00
YUKAI HUNG
3fecf1fb17 Merge "Export a method for app info page to get last 24 battery history data" into sc-dev am: abd364e1f3 am: e1d946b9ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542666

Change-Id: I15a3ec4a2341f1baf0b226ee09cf10ca2e116a11
 2021-05-14 10:25:21 +00:00
TreeHugger Robot
918af6c6a9 Merge "Apply transition on the back arrow on NotificationHistory page" into sc-dev am: 5af530a054 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542668

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

Change-Id: I8597c0a87704f4ffc5e6051d586cddc75356a12c
 2021-05-14 10:19:55 +00:00
TreeHugger Robot
5af530a054 Merge "Apply transition on the back arrow on NotificationHistory page" into sc-dev 2021-05-14 10:18:46 +00:00
YUKAI HUNG
abd364e1f3 Merge "Export a method for app info page to get last 24 battery history data" into sc-dev 2021-05-14 10:11:28 +00:00
TreeHugger Robot
c48f7caed4 Merge "[Rohan] Two battery level, but no charging status in Rohan Setting" into sc-dev am: 0174c4bad0 am: cb5bfc0d77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515925

Change-Id: Ie0f75865eff3429d97b8b407b528ca0e77e2a062
 2021-05-14 10:11:03 +00:00
TreeHugger Robot
431b7b06ad Merge "Fix foreground Service background launch restriction" into sc-dev am: 7c50995261 am: 99553c187e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542667

Change-Id: I661574b1c88e542877b670b97c0ff93b44c19afe
 2021-05-14 10:10:58 +00:00
TreeHugger Robot
cb5bfc0d77 Merge "[Rohan] Two battery level, but no charging status in Rohan Setting" into sc-dev am: 0174c4bad0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515925

Change-Id: Ic5ae7d5ed271cf6dbb2341be8a8fb1f38a858b43
 2021-05-14 10:05:24 +00:00
TreeHugger Robot
99553c187e Merge "Fix foreground Service background launch restriction" into sc-dev am: 7c50995261 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542667

Change-Id: I48ca62c820b0cd49b89a07a32c474007964a4671
 2021-05-14 10:05:02 +00:00
TreeHugger Robot
0b246618f0 Merge "Fix test case failed" into sc-dev am: 6cd4ad46d2 am: 7dada139f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542669

Change-Id: Id3e428722c57c5cc26a01b768c3165c1126c65ac
 2021-05-14 10:04:39 +00:00