Lifu Tang
495e34da2b
Merge "Cache summary text to avoid flickering" into tm-dev am: bd4b23ba0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18328550
Change-Id: I1c24084eae77b415834ec4d5bbc4121124a3df39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 15:00:40 +00:00
Tom Hsu
fff1b02f3d
Merge "[Panlingual] Fix shall not show app with empty LocaleConfig." into tm-dev am: 7f3f9666ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281656
Change-Id: I3af9e58d05b8afefac75969f41fd081367025295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 15:00:17 +00:00
Lifu Tang
bd4b23ba0d
Merge "Cache summary text to avoid flickering" into tm-dev
2022-05-12 14:57:31 +00:00
Tom Hsu
7f3f9666ee
Merge "[Panlingual] Fix shall not show app with empty LocaleConfig." into tm-dev
2022-05-12 14:38:37 +00:00
Jason Hsu
18bd8436be
Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev am: 76ae78452d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332039
Change-Id: I45e07bb1c1c74f1fe4c04f5fa04cd41f425168f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 13:33:32 +00:00
Jason Hsu
76ae78452d
Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev
2022-05-12 13:14:46 +00:00
Julia Reynolds
38addd9f8d
Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425
Change-Id: Ief0ddf880d27a11b693bd01a1a6f7c033b8b4cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 12:26:54 +00:00
Julia Reynolds
9372f3b4e3
Merge "Use NMS calculation of fixed importance" into tm-dev
2022-05-12 11:55:40 +00:00
jasonwshsu
87e0b3c7e5
Correct Magnification shortcut title in edit shortcut dialog
...
Root Cause: Magnification has its own edit shortcut dialog, but we did not
update correct title with getShortcutTitle()
Solution: set dialog title to getShortcutTitle()
Bug: 231531313
Test: manual test
Change-Id: I0679be2807a4b1f8b8a733604e16a35b0a1258c3
2022-05-12 17:33:07 +08:00
Arc Wang
0bfff4cabb
Merge "Storage Settings crash" into tm-dev am: 241238c6df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988
Change-Id: I477bd0fb6501ebc0162135d2802d3761ce1507ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 03:45:50 +00:00
Milton Wu
41a960559d
Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev am: bd31deb476
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309251
Change-Id: Ifb12559e1e0a29e7f9fe5d1ec727a23ddb243b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 03:45:40 +00:00
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
Arc Wang
241238c6df
Merge "Storage Settings crash" into tm-dev
2022-05-12 03:39:58 +00:00
Milton Wu
bd31deb476
Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev
2022-05-12 03:26:09 +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
Lifu Tang
f29a071fca
Cache summary text to avoid flickering
...
Bug: 231927706
Test: build, flash, run unit test, then test manually.
Change-Id: Ia0585302c5cf86cd6035315fa750c71b9df55237
2022-05-11 15:52:23 -07: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
tom hsu
89f48dce82
[Panlingual] Fix shall not show app with empty LocaleConfig.
...
Bug: b/231990625
Test: local
Change-Id: Ia4747b777ee5228b57c0293d366c77e91ae5bee0
2022-05-12 01:50:13 +08:00
Julia Reynolds
2011588b16
Use NMS calculation of fixed importance
...
Rather than recalculating it again. Also align logic on
listing and details pages.
Test: NotificationBackendTest, NotificationPreferenceControllerTest
Bug: 231662091
Fixes: 231815850
Change-Id: If9572766666620008afb839ecb0828ace8d6073d
2022-05-11 16:38:04 +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
Milton Wu
23b95b4147
Recreate fingerprint setup if degree 0 to 180
...
Recreate animation on fingerprint setup page when screen orientation is
changed from 0 to 180, or 180 to 0.
Bug: 232187001
Test: Manually rotate screen for 4 orientation, and make sure animation
orientation is correct
Change-Id: I75687bc8500cf5a48be6da6ef4245b12b63e774e
2022-05-11 08:30:31 +00: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
Arc Wang
87212cf504
Storage Settings crash
...
Storage settings will crash because there is no emulated primary volume found after private internal volume is Ejected.
Below change in Settings impacted Storage dashboard screen behavior as
it Query storage size instead of calculate size of installed APP. Due to
this design change now MediaProvider is queried for file sizes, but due
to unmounting of primary emulated volume it crashes.
We should not show Eject option for private Internal volume.
Author: ramneek.kalra@mediatek.com
Bug: 230689829
Test: atest com.android.settings.deviceinfo.VolumeOptionMenuControllerTest
manual
1. Insert sdcard or generate virtual disk using command : adb shell "sm set-virtual-disk true"
2. Go to Settings -> Storage -> Sdcard/virtual disk -> Format as Internal -> do migrate data
3. After above process completed, go to Settings-> Storage -> sd card/virtual disk and chose Eject menu option.
4. Eject page gets open, Click on Eject button.
Change-Id: I98d09f75ee7c2cd5aae10808bd0e0cdf10da7582
2022-05-11 13:57:33 +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