PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,608 Commits 1 Branch 0 Tags
d084c192beacf85daf4a080a9aeac34bde1f5bf3
Commit Graph

122608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
d084c192be Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev am: b7b444896e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157345

Change-Id: Ibe181103445c0952373064952dd15d34d37ade9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 02:09:25 +00:00
TreeHugger Robot
b7b444896e Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev 2023-05-12 01:34:00 +00:00
Tetiana Meronyk
43835107e7 Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656

Change-Id: I816af33e0e4e6006234f76e58a1dbcf287a45606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 00:21:52 +00:00
Tetiana Meronyk
66dba214e6 Merge "Make user creation flow in a single dialog" into udc-dev 2023-05-11 23:43:05 +00:00
Hao Dong
dd373e10e5 Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: Ie5214e9c1dafbbc9fbadcf1cbbdb653a43afc581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:52:55 +00:00
Hao Dong
1eb3724e1f Merge "Hide description text view if there is overlap." into udc-dev 2023-05-11 22:10:55 +00:00
Yuxin Hu
968a865d75 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I50d5b266a28908e44dfc6671d21764be968c09fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:49:21 +00:00
Yuxin Hu
6e3aba5366 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev 2023-05-11 20:48:57 +00:00
Treehugger Robot
ff50032a80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5851dbbfd91b13e24970394f62365881a41dba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:00:42 +00:00
Treehugger Robot
58c8fae9db Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: If3c8f54780ccd351f3096d65e2e08c04ac2e575f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:00:14 +00:00
Bill Yi
40d95455c0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09e9852e5d5019401c4b9d17aa1b1ad7fff4eb59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:00:06 +00:00
Treehugger Robot
0b57a35470 Merge "Fix string" into udc-dev am: 81ac516705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: Ia806f9235c495cd7d97953b5c07b2a66c454a358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:59:03 +00:00
Treehugger Robot
e7d695f07a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8b6175859af028f1341d807fa08567b5dfae1f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:56:48 +00:00
Treehugger Robot
a5af82be11 Merge changes from topic "tc_change_2305100725_23" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d
  Import translations. DO NOT MERGE ANYWHERE
 2023-05-11 19:28:21 +00:00
Treehugger Robot
b570c10767 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-11 19:28:21 +00:00
Treehugger Robot
81ac516705 Merge "Fix string" into udc-dev 2023-05-11 19:21:54 +00:00
Yuxin Hu
715a70603c Add AndroidJUnitTest for developer option switch 
Bug: b/270994705
Test: m -j45
atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest

Change-Id: Idbb93458a64894c3eba78a8f9373c40e3ddf35c5
 2023-05-11 17:59:21 +00:00
Hao Dong
51554eb9a1 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: I0fe97397b725927263ef4bf4e550199911c64217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:57:59 +00:00
Becca Hughes
f7c4d9c903 Fix string 
Test: make
Bug: 281047738
Change-Id: I7f65749cbdee95ab9447dc0b055d66fd962547dc
 2023-05-11 17:45:30 +00:00
Hao Dong
cddf296c82 Hide description text view if there is overlap. 
1. Includes udfps enroll view in xml files and cleans up FingerprintEnrollEnrolling adding udfps enroll view code.
2. Clean up SETTINGS_SHOW_UDFPS_ENROLL_IN_SETTINGS flag.
3. If description text view has overlap with udfps progress view, hide the description text view.

Test: atest FingerprintEnrollEnrollingTest
Test: manually test by setting both display and text largest size and
start enrolling fingerprint; the description is hidden if it's too long.
Bug: 260970216
Change-Id: I085dc62993ffa22d018dd57517c96d69e9d9cbcb
 2023-05-11 17:34:07 +00:00
Hao Dong
c753221adf Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev 2023-05-11 17:17:06 +00:00
Treehugger Robot
9799b0bfdb Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I6ca26dce7454098b492e6016936c6091e89106f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:07:08 +00:00
Treehugger Robot
59ec10b05a Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev 2023-05-11 14:52:04 +00:00
Treehugger Robot
0acfbaefbd Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: Ia20f150e902d55ca403c1d2a5ff424f17e69cb70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 14:48:46 +00:00
TreeHugger Robot
d1235d8e76 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: I820b9037229c62403f275e5ab0ca35142f57c22b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 14:48:25 +00:00
Treehugger Robot
643b51c42e Merge "[Settings] Remove redundant code." into udc-dev 2023-05-11 14:28:30 +00:00
Weng Su
e485615662 Fix failing test cases in MobileNetworkSummaryControllerTest 
- Remove obsolete test items

- Update the new callback interface

Bug: 280044539
Bug: 280044731
Test: Manual test
atest -c MobileNetworkSummaryControllerTest

Change-Id: I8460c620c62981dd5ee3b280c1a7467c43dbceb1
 2023-05-11 14:15:07 +00:00
TreeHugger Robot
c271732a85 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev 2023-05-11 14:01:25 +00:00
tom hsu
75b24e421e [Settings] Remove redundant code. 
Bug: 280236099
Test: make passed
Change-Id: I34e0632887ac38658761abd7d6a7e9f1e0f84bf1
 2023-05-11 21:12:29 +08:00
Treehugger Robot
921b1f6a6f Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: I8157b50b4b0a3a202502bb92f8f6c4818a0f2b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 13:02:01 +00:00
Jason Hsu
884bc10f9b Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: I717d5d434cef75149c3c110cb9e80835af15be0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 13:01:39 +00:00
Treehugger Robot
86f145d22a Merge "Avoid showing "0 minute" in the charge time label" into udc-dev 2023-05-11 12:54:55 +00:00
tom hsu
50dc4e857b Ordering the SIM display name by slot ID to the preference summary. 
Bug: 271975836
Test: Manual Test
Change-Id: Ib28062c8d0f1299cf30d494561c161fc4532dbc9
 2023-05-11 20:48:09 +08:00
Weng Su
571d9b1f37 Fix failing test case in AllInOneTetherSettingsTest 
- Add the necessary mock classes

Bug: 280067520
Test: Manual test
atest -c AllInOneTetherSettingsTest

Change-Id: I6576c6997b43103ea810008b7a1a245e3e42015c
 2023-05-11 20:43:34 +08:00
Jason Hsu
f7f38b2d66 Merge "Update hearing aids to hearing devices" into udc-dev 2023-05-11 12:15:02 +00:00
Treehugger Robot
8bf8d0b1eb Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522

Change-Id: I019a6b64bd482cbdfc15648a1dcdfd3648708519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 11:37:52 +00:00
ykhung
7fdd0e9ef9 Avoid showing "0 minute" in the charge time label 
Remove the charge to full time label if its value is invalid
https://screenshot.googleplex.com/5psbvFpcm2CFdRB

Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Fix: 278740808
Change-Id: I765cdcdee8525adb2583d5950bc646c604c744de
 2023-05-11 19:13:38 +08:00
Treehugger Robot
1b91f61633 Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev 2023-05-11 10:54:55 +00:00
Treehugger Robot
da48c087e0 Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081

Change-Id: I51b54455d5c2dd73c380fac22b345bc83570397f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:09:51 +00:00
Treehugger Robot
59fa9de0cf Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev 2023-05-11 09:42:23 +00:00
TreeHugger Robot
520927752a Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: Ibb95d6559eccf81d77ebd9299359d3b93a3c784c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:44:17 +00:00
jasonwshsu
7eeed19d28 Update hearing aids to hearing devices 
* We change the string 'hearing aids' to 'hearing devices', here are
  some left strings need to be updated.

Bug: 281782174
Test: flash rom and check UI
Change-Id: I0e3395c91d42b037158d135d1cbe519acac50aa0
 2023-05-11 16:41:54 +08:00
Angela Wang
fb0d23955d Fix non-hearing devices show in pair new hearing devices page 
Non-hearing devices are listed in "pair new hearing devices page" if we click the "See more devices" button and go back from "general pair new devices page".

Root cause:
Two types of Bluetooth scanning happen simultaneously and the scanning results of different scanning methods are handled in the same place. Currently the BLE scanning callback “onScanResult()” directly calls “onDeviceAdded()” method to handle the new scanned devices. This method is mainly called when receiving a broadcast of a new device found in Bluetooth classic scanning. The general pair new devices page uses Bluetooth classic scanning and the pair new hearing devices page uses Bluetooth LE scanning. The life cycle ordering when going back from general pair new devices page to pair new hearing devices page will be "pair new hearing devices page".onStart() -> "general pair new devices page".onStop(). It means the classic scanning is not stopped while the BLE scanning starts and this causes the scanning results from classic scanning unexpectedly added to the list which should only show the scanning results from BLE scanning.

Solution:
Separates the handling part of two scanning methods. Leaves "onDeviceAdded" handling Bluetooth classic scanning results only, and handles BLE scanning results in the “onScanResult” callback directly.

Bug: 279374435
Test: checks the result by switching back from "general pair new devices page" to "pair new hearing devices page"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DeviceListPreferenceFragmentTest
Change-Id: Iebdde401ffb3dc0569478730a140a5dd7add115b
 2023-05-11 08:28:12 +00:00
TreeHugger Robot
d2e8495f4c Merge "Remove search entries from old pages when SC is on." into udc-dev 2023-05-11 08:14:04 +00:00
SongFerng Wang
343602fd5e Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: Ifd85fa0461be871e9bdc52977f1e5b91a8fa1aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 07:44:20 +00:00
SongFerng Wang
c487d5a10c Merge "Update the wording for LE Audio" into udc-dev 2023-05-11 07:11:11 +00:00
TreeHugger Robot
728b1b8337 Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605

Change-Id: I9e96a83571c105b8858dc4bdc4f578dc6720f652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:12:49 +00:00
Tom Hsu
4d3264553c Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: Ibff6a407d7211597f6f8cf97c4ddf7403f11330c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:12:12 +00:00
TreeHugger Robot
1742524dd3 Merge "Show disable dialog box when none is selected" into udc-dev 2023-05-11 05:02:34 +00:00
SongFerngWang
f4c5c8ef5e Update the wording for LE Audio 
Add the summary for LE Audio toggle
Bug: 280000165
Test: build pass

Change-Id: Ic1eee71d6ff70d01e9a37ab0ec06cfaf639fe963
 2023-05-11 12:30:59 +08:00