Yanting Yang
f79c8af9dc
Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb am: 7031c01a9c am: 604c3c3f22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983
Change-Id: Ibc647906b3961bd9c3d703de990c08266dba5f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:20:23 +00:00
Martijn Coenen
c696bdbaa4
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290 am: cf79b0fcf0 am: ffef837a93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004
Change-Id: I2bfcae49748ec67f73e1582cbd94a81a36e599db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:20:17 +00:00
Tsung-Mao Fang
984cbd60ba
Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333 am: 4e09433546 am: 551d742d83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967
Change-Id: Ia7c2fa6739d2b424601ef0f9d637095af7c91836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:19:26 +00:00
TreeHugger Robot
22e20f3d18
Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: 31b30c123c am: 241baf7389
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995
Change-Id: I62261e6f9143b1de9d2c2f5181fda2447a4b226f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:18:49 +00:00
SongFerng Wang
0331308709
Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 992e20d2af am: 4f0d8249a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422
Change-Id: I8aa5478ca624312e5857be3623f13cc70d87b6e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:18:34 +00:00
Chaohui Wang
bf652e736b
Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 61161eab14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715
Change-Id: Id7a976c328f4d18b0e1c55509e18d7275959b894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:17:41 +00:00
Bonian Chen
129c031930
Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: b0e2411297
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632
Change-Id: I78c11555c80bd7ead868925dc598640af78d6d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:17:29 +00:00
TreeHugger Robot
2d72c0e67e
Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: 3433f8a9b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508
Change-Id: I0a3fce15a10b5d7ee2ab2cc1efd98fc02b6c695c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:17:24 +00:00
TreeHugger Robot
435a8ae837
Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe am: ccd8147776
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990
Change-Id: Iaa804c69d8744a07de575fd57c57eede2ca6a7b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:06:33 +00:00
Bonian Chen
c8433b8435
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467 am: 33bc83f19e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805
Change-Id: I979f44db2bc52cdef0b1e48a88457856a10cfda5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:06:04 +00:00
Yanting Yang
604c3c3f22
Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb am: 7031c01a9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983
Change-Id: Ib554be5157dd5cb5d39902eb75b71fa2490d62df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:04:09 +00:00
Martijn Coenen
ffef837a93
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290 am: cf79b0fcf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004
Change-Id: Id7e7b020df7b7ba22e82bf80ac1b541d915ca48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:03:14 +00:00
Tsung-Mao Fang
551d742d83
Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333 am: 4e09433546
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967
Change-Id: Id8befe820b0df6bf057e952f56cc66a3d52ae4f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:01:50 +00:00
TreeHugger Robot
241baf7389
Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: 31b30c123c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995
Change-Id: Iceff0b60a1a44cee4c18bc8145f69ee98877a979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:01:30 +00:00
SongFerng Wang
4f0d8249a9
Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 992e20d2af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422
Change-Id: Ic6fe5a86bf53a1dc67100152dd30199d4d2b97df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:01:15 +00:00
TreeHugger Robot
7e3c63dcd5
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: I550583e2fa4ba4c113760ca41caee4f499d76929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:33:52 +00:00
Bonian Chen
2a1040e1e2
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: I1a7d0cd2e38b39da2b1873b2cb6161d5a50abb45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:33:40 +00:00
Yanting Yang
799f7218cd
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: I4875344328bc68d8ca069ed15f71aa8ce4abef8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:33:30 +00:00
Martijn Coenen
d77f3426a2
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: I6e942c241c734314246623b7521af6ebf9d2896c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:33:13 +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
7e6dd3f4b7
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: I97fb5d351bea43b6e7210bb856cd5c89d4ddc3af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:26:40 +00:00
TreeHugger Robot
24a2986cfa
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: I8cebf257ad475a63577b0adae5e23c89b65bfe2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:26:10 +00:00
SongFerng Wang
2c7794515d
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: I4be1c5c74c1a64b17e8fb6903ccc3aee0e962c81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:25:43 +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
Chaohui Wang
02ddd9a642
Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 80e74b7f0f am: 22bdda8861
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715
Change-Id: I6bfd3464f77a215a541aeb64526f614b5088dbfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 12:50:58 +00:00
Bonian Chen
09efd55ebb
Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: 4c3dda2bbd am: 91a2f3c2a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632
Change-Id: I4fabf12c79d4ef7ed3ce927a75d50739b97eb20a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 12:50:43 +00: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
TreeHugger Robot
357a85747b
Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: baba62294b am: 36d2c74941
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508
Change-Id: I9fe675528076ee90f1b20874b2d45cefd1c7091d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 11:44:30 +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
Chaohui Wang
22bdda8861
Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 80e74b7f0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715
Change-Id: I8e30238449dca001ccc6ac707fca89f55f1a4790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 09:46:13 +00:00
Bonian Chen
91a2f3c2a3
Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: 4c3dda2bbd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632
Change-Id: I4238d8b00cfc59739ad22875621ae9e198310a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 09:46:00 +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
TreeHugger Robot
36d2c74941
Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: baba62294b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508
Change-Id: If4e36f14157ffab5a5b77c3f428998c15b19bb55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 09:15:55 +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