PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,556 Commits 1 Branch 0 Tags
a50c0b96367010b8b51fcc3b236fd1ad3b27de48
Commit Graph

119556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoey Chen
eef6d0cb24 Merge "[Settings] Update the title if launch the fragment from search app" 2022-12-07 08:43:10 +00:00
Zhenwei Chen
47fa893358 Merge "Fix batteryInfo unit test" into tm-qpr-dev 2022-12-07 08:31:44 +00:00
Chaohui Wang
eece0f702f Move config_isSafetyCenterLockScreenPendingIntentFixed 
To res-export folder.

This resource is not used by Settings, but is exported for external
usage by other apps.

Put it into res-export folder to prevent from accidentally clean ups.

Bug: 234570979
Test: make Settings
Change-Id: Iff2a204a3dc4e97c19ef92997489760c3ed1505a
 2022-12-07 15:37:53 +08:00
Zoey Chen
a3c97876bb [Settings] Update the title if launch the fragment from search app 
Bug: 245613972
Change-Id: I937a4acf0917a16660ff237d0511a5883864a1b9
Test: manual
Merged-In: I07bf9a8f59ea14fc8133e2473746a59a5c187d47
 2022-12-07 07:18:42 +00:00
Bonian Chen
854eb4947a [Settings] Code refactor for performance 
Perform query in the background thread to reduce the time required for
rendering UI.

Bug: 260540995
Test: local
Change-Id: I4286553b44b51752ae64a9bb2ce5656fe7e9b4e8
 2022-12-07 06:28:44 +00:00
Chaohui Wang
513827c5d5 Merge "Reduce flaky of whenCanDisplayLocalUi_displayed" 2022-12-07 06:14:48 +00:00
Chaohui Wang
4c11d02c10 Add back resources exported for external usage 2 
These resources are not used by Settings, but is exported for external
usage by other apps.

Put them into res-export folder and add a README to prevent from
accidentally clean ups.

Bug: 234570979
Test: make Settings
Change-Id: Ia72cbde0b073ccb7624abeecb66e48d9c646f401
 2022-12-07 14:09:57 +08:00
Zhenwei Chen
36c1e7dc20 Fix incorrect dock defender banner icon. 
Screenshots:
https://screenshot.googleplex.com/32YV7V6A6wxBPxc.png
https://screenshot.googleplex.com/77iMZ8CeuE5W8wE.png

Bug: 261156455
Test: Unit tests passed and manual test on the device
Merged-In: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Change-Id: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit 52323128dc)
 2022-12-07 05:46:57 +00:00
Chaohui Wang
b4a8e4b314 Reduce flaky of whenCanDisplayLocalUi_displayed 
Bug: 246877208
Test: Unit test
Change-Id: I0b2554521b55fcfacc24e59a81ddc08b2eb9d70c
 2022-12-07 12:03:47 +08:00
TreeHugger Robot
09d471132d Merge "Use PRIVACY_CONTROLS enum in PrivacyControlsFragment" 2022-12-07 03:45:44 +00:00
Tsung-Mao Fang
ff5bfb40c8 [DO NOT MERGE] FRP bypass defense in the settings app 
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
 2022-12-07 03:09:30 +00:00
Tsung-Mao Fang
b34ff2f272 [DO NOT MERGE] FRP bypass defense in the settings app 
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
 2022-12-07 03:08:58 +00:00
TreeHugger Robot
8318b2b7b6 Merge "[MTE] add more search terms for user toggle" 2022-12-06 23:54:27 +00:00
Nate Myren
8e3bc8c3ce Use PRIVACY_CONTROLS enum in PrivacyControlsFragment 
Fixes: 260055305
Test: build
Change-Id: Ic7fe61d50416608496d1f0dfbc34735e61461a37
 2022-12-06 14:25:29 -08:00
William Escande
4c47fe5a66 Merge "Update log for BluetoothPairingService" am: cfb4ed4b7f am: cf36286d05 am: 0adc966d8c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2328877

Change-Id: I4a829cd044d5b8dd51ea119068b578f84309ed7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 20:26:53 +00:00
TreeHugger Robot
c2cf680c0e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1c6313d8c0 -s ours am: 2f55f40ff3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f2b77d300dd7eb5317a243494c579956a0130d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 19:45:11 +00:00
Bill Yi
62874aa4e9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8433161d48 -s ours am: 73015c5fc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I58a585c8becafd36130e912d7e0a4db181aab264
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 19:44:50 +00:00
Florian Mayer
f593803c88 [MTE] add more search terms for user toggle 
some advanced users might be familiar with the technical terms

Bug: 245624194
Change-Id: I6cab375e78d9e613b33b85858aee94ec82e9986c
 2022-12-06 19:26:51 +00:00
Bonian Chen
0a3438c194 Merge "[Settings] Add BT and WiFi reset option" 2022-12-06 16:08:32 +00:00
Chaohui Wang
7786ca83ca Merge "Add back resources exported for external usage" 2022-12-06 15:39:31 +00:00
Anna Bauza
ec91ab2bec Merge "add settings log to user creation actions" 2022-12-06 15:25:51 +00:00
TreeHugger Robot
ccc77bf359 Merge "[Battery usage U] Show battery usage info immediately up till as close to the current moment as possible." 2022-12-06 14:56:29 +00:00
Vania Januar
33419410ea Merge "Toggle for disabling stylus buttons." 2022-12-06 14:24:06 +00:00
Santiago Seifert
e35774664f Remove redundant method in LocalMediaManager 
Test: atest LocalMediaManagerTest
Bug: 241888071
Bug: 235352899
Change-Id: I699572a97bbb92d52bc2948d955c4964883f2660
 2022-12-06 13:38:39 +00:00
Bonian Chen
dc6877f2ef [Settings] Add BT and WiFi reset option 
Add an BT and WiFi reset option into factory reset menu.

Bug: 260034791
Test: local
Change-Id: I9031765cd5a012e3216971a3302176a96c2fbd23
 2022-12-06 13:08:46 +00:00
Chaohui Wang
b62b890b71 Merge "Migrate AppPermissionSummaryTest to AndroidJUnit4" 2022-12-06 13:00:03 +00:00
Chaohui Wang
4c091fffcc Add back resources exported for external usage 
These resources are not used by Settings, but is exported for external
usage by other apps.

Put them into res-export folder and add a README to prevent from
accidentally clean ups.

Bug: 234570979
Test: make Settings
Change-Id: Ia46e94f4ece6a40edf95b47188f45659650d443c
 2022-12-06 20:57:01 +08:00
Wesley Wang
dbd95eb47b Merge "Fix incorrect dock defender banner icon." 2022-12-06 11:57:23 +00:00
Tsung-Mao Fang
1ebb665b71 [automerge] FRP bypass defense in the settings app 2p: 71f2d83688 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640996

Bug: 258422561
Bug: 202975040
Change-Id: I33d8635f6695619b415285f67001135f695a880c
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
 2022-12-06 11:45:18 +00:00
Tsung-Mao Fang
71f2d83688 FRP bypass defense in the settings app 
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
 2022-12-06 11:45:08 +00:00
Tsung-Mao Fang
22869d9019 FRP bypass defense in the settings app 
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
 2022-12-06 11:44:29 +00:00
William Escande
0adc966d8c Merge "Update log for BluetoothPairingService" am: cfb4ed4b7f am: cf36286d05 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2328877

Change-Id: I48c191048a87cf6dd4e3433d412836c25aae5bac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 09:51:34 +00:00
PETER LIANG
14f145181f Merge "Fix the preview should keep the same layer after font or display size change." 2022-12-06 09:47:59 +00:00
Zhenwei Chen
52323128dc Fix incorrect dock defender banner icon. 
Screenshots:
https://screenshot.googleplex.com/32YV7V6A6wxBPxc.png
https://screenshot.googleplex.com/77iMZ8CeuE5W8wE.png

Bug: 261156455
Test: Unit tests passed and manual test on the device
Change-Id: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
 2022-12-06 09:40:50 +00:00
Zaiyue Xue
3d7b8b3bfe [Battery usage U] Show battery usage info immediately up till as close to the current moment as possible. 
screen_record: https://drive.google.com/file/d/1Wdm8Wpn39k6E9Yo4bbTENf5VANP337QA/view?usp=share_link&resourcekey=0-1LNmaTaZI13DUmjNfkBehQ

Bug: 252407178
Fix: 252407178
Test: maunal
Change-Id: Ia08dea791bb72113719fd1316e8e9587a96eaef1
 2022-12-06 17:36:55 +08:00
Tsung-Mao Fang
1cf31d17aa FRP bypass defense in the settings app 
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
 2022-12-06 09:27:45 +00:00
William Escande
cf36286d05 Merge "Update log for BluetoothPairingService" am: cfb4ed4b7f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2328877

Change-Id: I1ce055ca532311ad813fdf5be80ee78e84c48d54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 09:13:43 +00:00
Bonian Chen
a1e8760494 Merge "[Settings] Code refactor - SIM slot UI preference key" 2022-12-06 08:30:50 +00:00
William Escande
cfb4ed4b7f Merge "Update log for BluetoothPairingService" 2022-12-06 08:30:23 +00:00
Betty Chang
6ef041d366 Merge "[LE Audio] Add broadcast icon when device is broadcasting but LE device is disconnected" 2022-12-06 08:03:59 +00:00
TreeHugger Robot
629f40c22b Merge "Support App and System tabs for battery usage breakdown." 2022-12-06 07:58:09 +00:00
jasonwshsu
99a7831255 [Hearing devices page] Add strings for hearing devices page for Android U 
Bug: 237625815
Test: build pass
Change-Id: Ica65ffaa9be57b3f3bd9ebe1d43cc929db6edaa9
 2022-12-06 15:38:21 +08:00
TreeHugger Robot
902cf1a8c4 Merge "[MTE] remove translatable=false from strings" 2022-12-06 07:22:11 +00:00
Zhenwei Chen
b41e06a5fb Fix batteryInfo unit test 
Bug:261139453
Test: Unit test passed
Merged-In: I8f94f984dc1bf833653ae49557fdd02f736b365c
Change-Id: I8f94f984dc1bf833653ae49557fdd02f736b365c
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit 54615b3bec)
 2022-12-06 06:22:38 +00:00
Chaohui Wang
681b519b80 Migrate AppPermissionSummaryTest to AndroidJUnit4 
Bug: 260441791
Test: Unit test
Change-Id: I72a63f9247ae370dbfcb0ff2babbfdfc95bd60a2
 2022-12-06 13:28:39 +08:00
Bonian Chen
09bd704c45 [Settings] Code refactor - SIM slot UI preference key 
Avoid from controlling Preference key separately in different places.

Bug: 261374879
Test: local & auto
Change-Id: I0a777c3f2511a25e8f619deba964bc343183c3cc
 2022-12-06 05:12:19 +00:00
TreeHugger Robot
2f55f40ff3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1c6313d8c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib266cb576c92d7f3d7da9831d3eed972bc8624e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 04:11:32 +00:00
Bill Yi
73015c5fc6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8433161d48 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc169ef3535ae6a6c8db983b49c5b45cc11e2584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 04:11:01 +00:00
TreeHugger Robot
1c6313d8c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-06 03:44:10 +00:00
Zaiyue Xue
00fb008e9c Support App and System tabs for battery usage breakdown. 
design_doc: go/usage-frontend-dd

screen_record: https://drive.google.com/file/d/1I8dnoMf7y9KUg0eVeqLJpHqGGOtaX6_0/view?usp=share_link&resourcekey=0-Mte0-LKN1LULRssg9t7zGg

Bug b/260786962 is also fixed in this cl.

Bug: 258123381
Bug: 260786962
Fix: 258123381
Fix: 260786962
Test: manual
Change-Id: Ifd337331d02dc10c3234c594b2e142bcd459c00f
 2022-12-06 11:23:27 +08:00