PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
118,196 Commits 1 Branch 0 Tags
edfed449c3292d79e7ea826e7db0788c7f5dafd2
Commit Graph

118196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Liang
edfed449c3 Fix the preview couldn't be scrolled up and down when showing the scroll bar. 
Actions:
1) Add the specific attribute to disallow parent view intercept the touch event of child view to avoid conflicting with the nested scroll view.
2) Add the scroll view into the page of the mail content preview.

Bug: 220078816
Test: manual test
Change-Id: I7f3b2afdf76e501386d9080e7a0eed8b92e28d3b
 2022-12-12 19:32:52 +08:00
TreeHugger Robot
2c2a826c3f Merge "Explain why keywords_memtag is not translatable." 2022-12-10 02:16:23 +00:00
TreeHugger Robot
aa156582ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d4d011a97b -s ours am: e33c25fdfb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I20c171a1090e2d7df4aa23fa9c40eb71b23d77d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-10 00:16:44 +00:00
Bill Yi
add5d48bb9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afd2a8e009 -s ours am: e7a29cb4de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0eb816e31baa992f30891741a72e11987474979e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-10 00:16:19 +00:00
TreeHugger Robot
e33c25fdfb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d4d011a97b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2cd665e51597b3175ca4f463234c60d547c0fdc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 23:44:43 +00:00
Bill Yi
e7a29cb4de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afd2a8e009 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I32f4f86b3c67f0f70090a60988493305b65565e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 23:44:07 +00:00
TreeHugger Robot
d4d011a97b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-09 23:17:52 +00:00
Darrell Shi
139cc47747 Merge "Update screensaver preference summary when on." 2022-12-09 21:16:35 +00:00
Darrell Shi
adb864a784 Update screensaver preference summary when on. 
The summary for screensaver preference is updated to, e.g. "On / Art
gallery".

Bug: 261907383
Test: 'make -j64 RunSettingsRoboTests \
ROBOTEST_FILTER="com.android.settings.dream.DreamSettingsTest"'

Change-Id: I40483f266c42a6e49e513208ba513d469d67f85a
 2022-12-09 17:33:47 +00:00
Zoey Chen
9ca3255c2d [Settings] Fix crash and UI error when turn ON/OFF SIM 
1. Should update the UI when turn off SIM
2. Fix ConcurrentModificationException

Bug: 259487637
Test: manual
Change-Id: If30a6b6323ac0237c92dc210bf3953ce86a199ae
 2022-12-09 15:04:59 +00:00
Rupesh Bansal
9d0a16aab3 Merge "Remove VR features from apps" 2022-12-09 13:35:14 +00:00
Bonian Chen
13cb087774 Merge "[Settings] Code refactor for device without SIM" 2022-12-09 09:25:17 +00:00
TreeHugger Robot
160dacf9ad [automerger skipped] Merge "Check multiple security types for Wi-Fi NetworkRequest" into tm-qpr-dev am: 47d87cb48d am: 2bd5b1c75f -s ours 
am skip reason: Merged-In I8848ccd1cb0589284a48ddaa77591f5bf3b41932 with SHA-1 a88c064842 is already in history

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

Change-Id: Ib7912f1ef2d076d120abe5f1d135019a64851654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 06:18:31 +00:00
TreeHugger Robot
2bd5b1c75f Merge "Check multiple security types for Wi-Fi NetworkRequest" into tm-qpr-dev am: 47d87cb48d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20666966

Change-Id: I745c07401d1130ad320c476928f21d68c388f600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 05:55:31 +00:00
TreeHugger Robot
47d87cb48d Merge "Check multiple security types for Wi-Fi NetworkRequest" into tm-qpr-dev 2022-12-09 05:26:26 +00:00
Bonian Chen
ca5ef817ff Merge "[Settings] Code refactor" 2022-12-09 05:23:55 +00:00
Zaiyue Xue
691c39b862 Merge "[Battery usage U] Calculate each item pertage for App tab and System tab separately." 2022-12-09 02:40:33 +00:00
TreeHugger Robot
fe3250007b Merge "[Battery usage U] For system comsumed power, use device comsumed power directly instead of removing app comsumed power from it." 2022-12-09 02:32:55 +00:00
Florian Mayer
8be8275a92 Explain why keywords_memtag is not translatable. 
Bug: 245624194
Change-Id: Ifa02a0fc82b43ad2ba90e84020e881014d85acec
 2022-12-08 22:10:45 +00:00
Zaiyue Xue
5474c1849b [Battery usage U] For system comsumed power, use device comsumed power directly instead of removing app comsumed power from it. 
Bug: 261826748
Fix: 261826748
Test: manual
Change-Id: Iab6eed4339fabe342835a020cadae11e6256be20
 2022-12-08 19:03:27 +08:00
Zoey Chen
f172189e8e [Settings] eSIM transfer: MobileNetworkSummaryController 
1. MobileNetworkSummaryController

 - No matter single SIM or multiple SIMs, always launch MobileNetworkListFragment
 - Remove the + and |

APM off: https://screenshot.googleplex.com/7M8qzsXFesy3nDi.png
APM on: https://screenshot.googleplex.com/C4ZnbpgUTPzTijL.png

2. Fix the APM mode

Bug: 244786012
Bug: 261810065
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSummaryControllerTest
Change-Id: I8e5c9b8a58ef13b6deaea284e9793077b2da58f6
 2022-12-08 10:29:08 +00:00
Zaiyue Xue
131958c8bc [Battery usage U] Calculate each item pertage for App tab and System tab separately. 
Bug: 261820602
Fix: 261820602
Test: manual
Change-Id: Iaab63bd5c6459486645987524d61b69dfca20fd6
 2022-12-08 18:07:47 +08:00
Bill Yi
afd2a8e009 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibb23f9583f98c120733cc0ba1ca621d39855d960
 2022-12-08 01:19:59 -08:00
Bonian Chen
09b0edbdee [Settings] Code refactor 
1. Adjust test case for improving testing performance
2. Some code refactor for avoiding from NullPointerException

Bug: 260540995
Test: auto and local
Change-Id: I18bd474304194137166c3c03ff828abdcd58473e
 2022-12-08 07:17:13 +00:00
Bonian Chen
f19e92cc2c [Settings] Code refactor for device without SIM 
Code refactor to hide some UI entries, since there's a BluetoothWiFiPreferenceController
covers some of the work for device without SIM.

Bug: 259611847
Test: local & auto
Change-Id: Ia221663e180c8dabed2a25a927643c992ef8ac89
 2022-12-08 05:24:01 +00:00
Zhenwei Chen
b04d06a470 [automerger skipped] Merge "Fix incorrect dock defender banner icon." into tm-qpr-dev am: 72490ec149 am: a08c9db9f2 -s ours 
am skip reason: Merged-In I084c9cd52a408efa3b9aeee96a0af0cae481ec79 with SHA-1 52323128dc is already in history

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

Change-Id: Id63c2d0186818f460deefad81c3e4b0d91b3febd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 04:14:07 +00:00
Zhenwei Chen
a08c9db9f2 Merge "Fix incorrect dock defender banner icon." into tm-qpr-dev am: 72490ec149 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640198

Change-Id: Ia70a664a5fecab8090739fb632987965d7eb1161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 03:48:16 +00:00
Zhenwei Chen
72490ec149 Merge "Fix incorrect dock defender banner icon." into tm-qpr-dev 2022-12-08 03:33:57 +00:00
TreeHugger Robot
2825910515 Merge "Clear unused field mPowerUsageFeatureProvider in PowerUsageAdvanced." 2022-12-08 02:18:15 +00:00
Bonian Chen
ccf119a283 Merge "[Settings] BT and WiFi reset menu might covers VPN" 2022-12-08 00:50:08 +00:00
Weng Su
c4d0597373 Check multiple security types for Wi-Fi NetworkRequest 
- The WifiEntry already support multiple security types simultaneously from framework

- For backward compatibility, WifiEntry supports both getSecurity and getSecurityTypes methods

- However, the getSecurity method can only return one type of security, causing NetworkRequest to fail to match another type of security
  - WifiEntry:      getSecurity:WPA2   // getSecurityTypes:{WPA2, WPA3}
  - ReqeustNetwork: getSecurity:WPA3

- Need to use getSecurityTypes to check for matching WifiEntry

Bug: 205943818
Bug: 249713442
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkRequestDialogFragmentTest

Merged-In: I8848ccd1cb0589284a48ddaa77591f5bf3b41932
Change-Id: I8848ccd1cb0589284a48ddaa77591f5bf3b41932
(cherry picked from commit a88c064842)
 2022-12-07 18:15:44 +00:00
TreeHugger Robot
642a0a74a4 Merge "Check multiple security types for Wi-Fi NetworkRequest" 2022-12-07 14:25:58 +00:00
Jason Hsu
631427bb08 Merge "[Audio routing] Add strings for audio routing page for Android U" 2022-12-07 14:23:33 +00:00
Jason Hsu
478b6f3d89 Merge "[Hearing devices page] Add strings for hearing devices page for Android U" 2022-12-07 14:23:00 +00:00
João Victor Mendes Freire
16a10ba0a1 Merge "Fix user avatar not being set on rotation" 2022-12-07 13:49:32 +00:00
João Victor Mendes Freire
d97f27b816 Merge "Fix user not being redirect to user details page" 2022-12-07 13:49:21 +00:00
João Victor Mendes Freire
6754d52673 Merge "Fix settings crash on users page on config change" 2022-12-07 13:49:08 +00:00
Bonian Chen
7b06d5f0e1 [Settings] BT and WiFi reset menu might covers VPN 
VPN would be reset by BT and WiFi reset menu under device without a SIM
available.

Bug: 260034791
Test: local and auto
Change-Id: I3c66cd629977cc11172758ebbe314167b5220419
 2022-12-07 13:45:51 +00:00
Zaiyue Xue
4b14c49dfb Clear unused field mPowerUsageFeatureProvider in PowerUsageAdvanced. 
Bug: 256123455
Test: presubmit
Change-Id: Ia22eb8d11836b9b0d8ab74f4760e81966040a947
 2022-12-07 20:47:44 +08:00
Rupesh Bansal
bc255db77a Remove VR features from apps 
Bug: 260555143
Test: atest com.android.server.power
Change-Id: I7d1938363dacb06f93cea69672a710ccbb76012e
 2022-12-07 12:30:30 +00:00
Weng Su
a88c064842 Check multiple security types for Wi-Fi NetworkRequest 
- The WifiEntry already support multiple security types simultaneously from framework

- For backward compatibility, WifiEntry supports both getSecurity and getSecurityTypes methods

- However, the getSecurity method can only return one type of security, causing NetworkRequest to fail to match another type of security
  - WifiEntry:      getSecurity:WPA2   // getSecurityTypes:{WPA2, WPA3}
  - ReqeustNetwork: getSecurity:WPA3

- Need to use getSecurityTypes to check for matching WifiEntry

Bug: 205943818
Bug: 249713442
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkRequestDialogFragmentTest

Change-Id: I8848ccd1cb0589284a48ddaa77591f5bf3b41932
 2022-12-07 20:09:28 +08:00
TreeHugger Robot
f17d3c4697 Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed" 2022-12-07 11:47:43 +00:00
TreeHugger Robot
2e8dc1c49f Merge "Fix b/261390301: NullPointerException at BatteryChartPreferenceController.addAllPreferences()" 2022-12-07 11:24:15 +00:00
Bonian Chen
d73c751f3d Merge "[Settings] Code refactor for performance" 2022-12-07 10:25:49 +00:00
Zoey Chen
a8f0151a1b [automerger skipped] Merge "[Settings] Update the title if launch the fragment from search app" am: eef6d0cb24 am: 8b0070a509 am: 45c646d6cb -s ours 
am skip reason: Merged-In I07bf9a8f59ea14fc8133e2473746a59a5c187d47 with SHA-1 3eaadf598f is already in history

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

Change-Id: If2c47c775d58c40c23655e50020ec0c258052038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-07 10:17:20 +00:00
Zhenwei Chen
6e73954181 [automerger skipped] Merge "Fix batteryInfo unit test" into tm-qpr-dev am: 47fa893358 am: 89ad53e3cb -s ours 
am skip reason: Merged-In I8f94f984dc1bf833653ae49557fdd02f736b365c with SHA-1 54615b3bec is already in history

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

Change-Id: Ia90bd98be91c7471af6efee7a9d6d4f36de4e08d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-07 10:16:35 +00:00
Zoey Chen
45c646d6cb Merge "[Settings] Update the title if launch the fragment from search app" am: eef6d0cb24 am: 8b0070a509 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2331882

Change-Id: Iffed6efb8542259ae3f1ca22c198cc768a4ad126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-07 10:13:35 +00:00
TreeHugger Robot
8dd0992634 Merge "Add back resources exported for external usage 2" 2022-12-07 09:44:50 +00:00
Zoey Chen
8b0070a509 Merge "[Settings] Update the title if launch the fragment from search app" am: eef6d0cb24 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2331882

Change-Id: Ic4f9bb2f9fb07e9243dbb327f2ce0a41eeb9da0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-07 09:29:48 +00:00
Zhenwei Chen
89ad53e3cb Merge "Fix batteryInfo unit test" into tm-qpr-dev am: 47fa893358 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20638347

Change-Id: I8d1993dea1435d4f6679e682be99025a9a0daa30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-07 09:29:07 +00:00