Yi-Ling Chuang
ccc866a16f
Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655
Change-Id: I4d5346f3cc0764cb94aad41a19ccf52a6b0b0831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 03:45:30 +00:00
Yi-Ling Chuang
f6c416054e
Merge "Make the force stop dialog work properly in split screen" into tm-dev
2022-05-12 03:23:11 +00:00
James Lin
97cfcae36d
Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654
Change-Id: Ic5e68e6647e6476d12b711e211a7d93fba92e083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 02:30:14 +00:00
James Lin
14c7ce7ccb
Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev
2022-05-12 01:26:34 +00:00
Ayush Sharma
02d58f0109
Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844
Change-Id: I0e71a2917ae7b26073d9de217e7909c729084613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 20:28:24 +00:00
SongFerng Wang
bde99c02cc
Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803
Change-Id: Id6017f330b9c7071e0df48d48ca2319b0b865365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 20:27:36 +00:00
Tom Hsu
b903b4a057
Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987
Change-Id: Ib2e09e95c6dbef9b54a8e1182e5f3b57ed0d0a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 20:19:02 +00:00
Ayush Sharma
695a47e469
Merge "Fix issue no action on clicking link in footer" into tm-dev
2022-05-11 12:56:44 +00:00
SongFerng Wang
55ded566e3
Merge "stop show preferred SIM card dialog during sim switch" into tm-dev
2022-05-11 11:17:28 +00:00
Yi-Ling Chuang
2754a20c72
Make the force stop dialog work properly in split screen
...
When it's in a multi-window mode, force stopping an app will lead to an
activity recreate, and the dialog fragment will also be recreated.
That's why the dialog still shows after the button is clicked.
Hence, dismiss the dialog before stopping the app to fix it.
Fixes: 231529730
Test: robotest
Change-Id: I75d27624f0c60bb617e7d1a92ffe01d3c0fbf7be
2022-05-11 17:07:38 +08:00
James.cf Lin
85db3167e2
[Panlingual] Remove the warning message from AppLocaleDetails
...
Since opt-in is enabled and it will only display locales that are available or downloadable, there is no longer a need to display the warning message to users.
Bug: 228923650
Test: manual test
Change-Id: Ibd98f3a292eb09c921f4bf00dbf448c976927e5d
2022-05-11 15:20:52 +08:00
Tom Hsu
d375456251
Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev
2022-05-11 05:51:00 +00:00
TreeHugger Robot
ebd46572c4
Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991
Change-Id: I1d4d1936e6b5c5d556db078d2481c772826d1135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 03:37:25 +00:00
TreeHugger Robot
f39872bc18
Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev
2022-05-11 03:02:52 +00:00
Jack He
272eedba22
Merge "Only cancel bonding if pair button is not pressed" am: 33a080ad7a am: 55da62f36e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093951
Change-Id: Ie406b8c9f37091934ad1641524ec40492b654113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 23:16:45 +00:00
Treehugger Robot
9bd8bec2df
Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb am: 4a0d0f29f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2076379
Change-Id: I5314d3f9e5201402a377cf7e61e36994a933f5bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 23:16:36 +00:00
Jack He
55da62f36e
Merge "Only cancel bonding if pair button is not pressed" am: 33a080ad7a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093951
Change-Id: I9d47c60b9588236b7923a33b3c1183b60896f0e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 22:56:57 +00:00
Treehugger Robot
4a0d0f29f3
Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2076379
Change-Id: I5bb8460443557bdca8d23bae54353c4b1dee548d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 22:56:40 +00:00
Jack He
56b5fa0fb1
Merge "Cancel bonding upon back gesture." am: 3671fb8438
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093046
Change-Id: I234953b29f4fb02af845243cce3131267acbf6a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 22:56:31 +00:00
Jack He
33a080ad7a
Merge "Only cancel bonding if pair button is not pressed"
2022-05-10 21:47:29 +00:00
TreeHugger Robot
ccd8147776
Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990
Change-Id: Iba2eb763ef4599ad0073c024828a5ecffdfee8ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:31:31 +00:00
Bonian Chen
33bc83f19e
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805
Change-Id: I44235c6398195e24682857ccf5b292b4947e4b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:31:23 +00:00
Yanting Yang
7031c01a9c
Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983
Change-Id: I63a74eece6489253bc76c2578c125f1f6e2451fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:31:16 +00:00
Martijn Coenen
cf79b0fcf0
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004
Change-Id: I033f09aaf7800e383de7a769b2e269b3ecf1c8a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:31:08 +00:00
Tsung-Mao Fang
4e09433546
Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967
Change-Id: I81bf6663ec88a1de1578a38317031cdec9b912ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:24:05 +00:00
TreeHugger Robot
31b30c123c
Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995
Change-Id: I21114cb9c3a52a23854f836a120b812f94c923ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:23:18 +00:00
SongFerng Wang
992e20d2af
Merge "Reuse the active esim slot" into tm-dev am: b1613b210d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422
Change-Id: I64749537cb7fa639c7ce6dd1ed76e15a0a969cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:22:41 +00:00
Qasim Javed
29b7f1d5fa
Only cancel bonding if pair button is not pressed
...
aosp/2093046 cancels bonding unconditionally in onDestroy(), this
results in the user not being able to pair when the pair button is
pressed because onDestroy() is also called in that case.
Only cancel bonding if the user did not press the pair button.
Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog
and is also able to pair when the pair button is pressed
Change-Id: I868af9b795f1bb0766656e4619bd06dc8028008a
Merged-In: I868af9b795f1bb0766656e4619bd06dc8028008a
2022-05-10 12:03:33 -07:00
Qasim Javed
419b7fa289
Only cancel bonding if pair button is not pressed
...
aosp/2093046 cancels bonding unconditionally in onDestroy(), this
results in the user not being able to pair when the pair button is
pressed because onDestroy() is also called in that case.
Only cancel bonding if the user did not press the pair button.
Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog
and is also able to pair when the pair button is pressed
Change-Id: I868af9b795f1bb0766656e4619bd06dc8028008a
2022-05-10 11:29:28 -07:00
TreeHugger Robot
10190793fe
Merge "Hide running time for "Android System" in the optimization page" into tm-dev
2022-05-10 13:41:55 +00:00
Ayush Sharma
d67cd2320e
Fix issue no action on clicking link in footer
...
Links are not allowed in footer preference title now, so splitting the
string in to title text and learn more text for set a separate work
lock message
Bug: 206083998
Bug: 231296099
Test: NA
Change-Id: Ic19b4b7a9c8239726b1d53cecad1e341458610cb
2022-05-10 13:51:31 +01:00
Bonian Chen
812de51467
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev
2022-05-10 12:35:30 +00:00
Yanting Yang
51204e3deb
Merge "Fix reset app preferences for work profile apps" into tm-dev
2022-05-10 12:25:59 +00:00
ykhung
7015cd0dd9
Hide running time for "Android System" in the optimization page
...
Hide the running time information for "Android System" entry, since this
entry will combine multiple system components together. It will provide
incorrect running time information. The getRealUid() method maps many
UIDs to Process.SYSTEM_UID(1000), which results in combining all of
those UIDs into one "Android System" entry. This is the expected behavior.
Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I9d44fe8490ad5c684419b8ebf8d7d5576a42788a
2022-05-10 18:47:44 +08:00
Hugh Chen
205752dcf2
Make bluetooth not discoverable via SliceDeepLinkTrampoline
...
- Don't let device be discovered when the user launch "Connected Devices
settings" through SliceDeepLinkTrampoline.
Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
2022-05-10 09:47:19 +00:00
Martijn Coenen
63db54c290
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev
2022-05-10 09:18:52 +00:00
Mattias Nilsson
36c71e9d47
Disable "SIM card lock" when the SIM card is PUK-blocked
...
For an inserted PUK-blocked SIM card we should not allow
to open lock settings. Add a check for SIM_STATE_PERM_DISABLED
and disable "SIM card lock".
Test: Insert a PUK blocked card and check SIM card lock
Bug: 230370597
Change-Id: I8b468cefe95fb8bd66ab91d6c4569ddb01473fbe
2022-05-10 10:46:56 +02:00
tom hsu
420404f9e3
[Panlingual][Settings] Fix when tap search bar, will leave a big blank.
...
- Close blank layout after title disappear when search bar is expanded.
Bug: b/227287277
Test: local, see b/227287277#6
Change-Id: I1a61bab9a046aa52e22c4ef2292c7ae703deab1e
2022-05-10 08:30:18 +00:00
Tsung-Mao Fang
ca72e5c333
Merge "Disable setting items in App details page" into tm-dev
2022-05-10 08:17:57 +00:00
TreeHugger Robot
3dcb2b65f7
Merge "Cancel bonding upon back gesture." into tm-dev
2022-05-10 06:31:28 +00:00
Chaohui Wang
80e74b7f0f
Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715
Change-Id: I1348ca8869c1238a44f9a06dc278a6fae905d277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 06:26:08 +00:00
SongFerng Wang
b1613b210d
Merge "Reuse the active esim slot" into tm-dev
2022-05-10 06:25:07 +00:00
Bonian Chen
4c3dda2bbd
Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632
Change-Id: If7ce59c6a1557243d4e5f23fa3c1452ae7cb98e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 05:37:28 +00:00
TreeHugger Robot
baba62294b
Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508
Change-Id: I95787dcf320489fa8b8b42b985c6a81a71eba27d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 05:37:17 +00:00
SongFerngWang
c389149ff3
stop show preferred SIM card dialog during sim switch
...
Bug: 227169390
Test: manually test
Change-Id: I242402e49b267c8cd61a85a46367c778d2d8bbf8
2022-05-10 11:54:44 +08:00
Chaohui Wang
9b28ecf9de
Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev
2022-05-10 02:44:47 +00:00
Bonian Chen
bd971968e9
Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev
2022-05-10 02:25:51 +00:00
TreeHugger Robot
cb38753530
Merge "Fix More details not work on fingerprint" into tm-dev
2022-05-10 02:09:51 +00:00
Bonian Chen
8b06c96fe9
[Settings] Hide some Preference entries when no mobile data support
...
Hide some Preference which requires mobile data on device didn't support
it.
Bug: 221999174
Test: local
Change-Id: I7dd6e13aea0ed4467c7c7edeada564e42ea78349
2022-05-10 01:12:23 +00:00
Jack He
3671fb8438
Merge "Cancel bonding upon back gesture."
2022-05-10 00:09:48 +00:00