PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,038 Commits 1 Branch 0 Tags
37bae5ee088cc33cf9c84d7332985f18a4461bf9
Commit Graph

111038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
William Escande
cfb4ed4b7f Merge "Update log for BluetoothPairingService" 2022-12-06 08:30:23 +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
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
William Escande
cd231dc047 Update log for BluetoothPairingService 
ACTION_PAIRING_CANCEL does not contain an EXTRA_BOND_STATE

Test: Log change is no-op
Bug: 253775131
Change-Id: Ida67374e9369991d7e016b38df9c17a8fa5418cc
 2022-12-05 15:30:51 -08:00
Ale Nijamkin
092de727b9 Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev am: 674bb29538 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20623875

Change-Id: Ib2cfda862a53c9093db4b21de3c4ebbf32d33a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 20:00:02 +00:00
Ale Nijamkin
674bb29538 Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev 2022-12-05 19:38:16 +00:00
Bill Yi
e4cea181d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1c80356b98 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08a087d268c1267da267161d52962de22ab574d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 19:06:00 +00:00
Bill Yi
e5cc812e6d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38cec4fba6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0e7ac80475aed3dffc036592b273e1aaf64b424d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 19:05:57 +00:00
Bill Yi
62a4b0a359 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6ef73d18e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93671bd7a40c2f11b47f6ff1a90d25df6ddf4c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 19:05:55 +00:00
Bill Yi
49fdb5dc4a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aeba23203 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4dcb605d252bfa22203d675d3d11726bc1f1cb67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 19:05:43 +00:00
Bill Yi
3663fc792a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3408280369 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie507c358a3a33f75f9a46f2ffda37a6f22d861c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 19:05:31 +00:00
Bill Yi
ba1266b431 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4076fea0ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41f2f812405ae6d63c1392662689c98f3ba31939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 19:05:17 +00:00
Bill Yi
1c80356b98 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-12-05 18:22:29 +00:00
Bill Yi
6ef73d18e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-12-05 18:22:29 +00:00
Bill Yi
3408280369 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-12-05 18:22:29 +00:00
Edgar Wang
f39285a722 Merge "Avoid media transcode can be bypass guard of developer options" into tm-qpr-dev am: cb27771fd5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20608287

Change-Id: I541d2fd5f50812fbd675e7ba9466a15558bb6ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 03:47:35 +00:00
Arc Wang
da847e7f00 Fix SettingsHomepageActivity crash during configuration change 
Attempt to remove the animator to avoid a RecyclerView crash.

Bug: 260208703
Test: compile
Change-Id: I568cf964107f832fde4d82306fc84772bb208e20
 2022-12-05 11:35:15 +08:00
Edgar Wang
cb27771fd5 Merge "Avoid media transcode can be bypass guard of developer options" into tm-qpr-dev 2022-12-05 03:02:59 +00:00
Treehugger Robot
82dd9c34cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 939f6eed12 -s ours am: 8667f5efee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72150161019572481547375a88fd73d9e1e70e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 19:35:15 +00:00
Bill Yi
54e98aa86e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eee9788bd -s ours am: 3a9e2e401d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61f1583cdf06f489a89b110324f4d932238daa3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 19:34:58 +00:00
Treehugger Robot
e92ac63e41 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db2fea9847 -s ours am: 41f417f87b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c8f91fd8dd93cb1aeeb43d9728e55500da6e477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 19:34:41 +00:00
Bill Yi
976ce75e87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77827ac6f9 -s ours am: fa8111eca1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iecd6456a5d1ffb4233abd2e53951bd4ee129c695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 19:34:28 +00:00
Treehugger Robot
1539b81ad4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e1c63ece9a -s ours am: 891c3ab05a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibab1bf0a44759ae952722c2e95ade28d4d5ec93e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 19:20:39 +00:00
Bill Yi
deec7d5a91 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a702ea7b1 -s ours am: 14e15aaaa1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia8737c4f76c3ee0cdcf19b27e5f47e9f444c6916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 19:20:34 +00:00
Treehugger Robot
8667f5efee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 939f6eed12 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07e5c3448aec9e82e9742aa2b94de373dd46556e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 18:49:12 +00:00
Bill Yi
3a9e2e401d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eee9788bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd2dd91b94e3dd1e59030db9bdc5f176097c8f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 18:49:01 +00:00
Treehugger Robot
41f417f87b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db2fea9847 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0a7bfc3f350cb049e821416ec1f80ace595c8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 18:48:46 +00:00
Bill Yi
fa8111eca1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77827ac6f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie432f5295ba262e7caf41fcc33da65d77e9a7395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 18:48:12 +00:00
Treehugger Robot
891c3ab05a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e1c63ece9a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81ea24c30ed1c174c965e8fde4b3da633eb802e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 18:24:56 +00:00
Bill Yi
14e15aaaa1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a702ea7b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93b034a8d56b908a412475771db25f4bf81dd2c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-04 18:24:40 +00:00
Treehugger Robot
939f6eed12 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-12-04 17:53:51 +00:00
Treehugger Robot
db2fea9847 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-12-04 17:53:51 +00:00
Treehugger Robot
e1c63ece9a Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-12-04 17:51:55 +00:00
Bill Yi
8433161d48 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie497d67fdc9024e2e54f7580b4fa83778c26e3f3
 2022-12-04 00:42:56 -08:00
Bill Yi
38cec4fba6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifd07a3fec3a401205811b8c013590b519469b78b
 2022-12-03 12:00:12 -08:00
Bill Yi
0aeba23203 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I18da1a6fe2a305975c3960be278c69466fbd1e4a
 2022-12-03 11:58:48 -08:00