Zoey Chen
7b4f5c8a50
Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017
Change-Id: I5ddea663b4ddb872a91e3e08bc29466fd48f3d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 03:57:18 +00:00
Yanting Yang
f2c5b7f2e7
Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084
Change-Id: Ia8fc7ff7f82323e2bd55ad023e90bf6e50431197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 03:57:04 +00:00
Zoey Chen
4d917d990f
Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev
2023-05-12 03:37:37 +00:00
Yanting Yang
f0e440109f
Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev
2023-05-12 03:20:14 +00:00
Chris Antol
8e93ac6670
Remove SPA gating from App Cloning click ingress
...
Bug: 277002988
Test: existing tests. flag on by default, no-op unless disabled, which now has access to this otherwise accessible feature
Change-Id: Ic37e4c76d379133f1dbda3c65930ae44afc24f70
2023-05-12 03:03:12 +00:00
Zoey Chen
fb6b6b0bcc
[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the
...
parent fragment and control the dialog.
Keep the dialog and the locale list after rotation
Bug: 279527362
Change-Id: I349fd9d0fea5b43a8bbb2a23fa60fc4c5436c5cf
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Test: atest LocaleDialogFragmentTest
2023-05-12 02:40:13 +00:00
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
b570c10767
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-05-11 19:28:21 +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
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
tom hsu
5e2862f2e3
[Settings] Avoid to unregister wrong observer
...
Bug: 262345047
Test: atest passed.
Change-Id: If324e8f35c15053b48320f86ff22759a6a68a62f
2023-05-12 01:10:19 +08: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
jasonwshsu
5656caecd0
Correct shortcut summary to have different software types of shortcut result
...
Root Cause: Did not consider different software types shortcut in AccessibilityShortcutPreferenceFragment
Solution: Add support for different software shortcut types
Bug: 263451053
Test: manual change shortcut type and check
Change-Id: Ic425fdab790d4bbf1de6418ada382e420a9860fc
2023-05-11 22:23:16 +08: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
Oli Thompson
08b4973f8e
Update Work profile settings
...
Change work apps toggle to a primary toggle
make Xprofile contact search toggle disable/enable when work profile is turned off
Add footer and change strings
Add tests
Test: atest ContactSearchPreferenceControllerTest, atest WorkModePreferenceControllerTest
Bug: 253009702 275538029
Change-Id: I3b2044a5fe3f2aff0748d66e701a3f0d7667ab7a
2023-05-11 14:02:27 +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
Mill Chen
f321799f43
Update string for touch sounds
...
Bug: 274081150
Test: visual verify
Change-Id: I953f108884cafc91e2a3a76bd1292ea30386d862
2023-05-11 17:24:32 +08:00