PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,642 Commits 1 Branch 0 Tags
382cb77635a5c41e2ecf3beea665158fe9a3461c
Commit Graph

107642 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chaohui Wang
b36e15c613 Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874

Change-Id: Icbc2a7520a49da31df63e0b73b8cb00c005cb1a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:22:29 +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
ab8bdb2bdb Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" 2022-05-10 17:16:13 +00:00
Chaohui Wang
afd6c366e8 Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 80e74b7f0f am: 22bdda8861 am: 02ddd9a642 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715

Change-Id: I92384109c34e736afd1c38847292ae70a6c9caf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 15:52:30 +00:00
Bonian Chen
f51b9cbf15 Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: 4c3dda2bbd am: 91a2f3c2a3 am: 09efd55ebb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632

Change-Id: Idd54facbef93cd808bac24f0962af85bd976bdc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 15:52:13 +00:00
TreeHugger Robot
b1d0706074 Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: baba62294b am: 36d2c74941 am: 357a85747b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508

Change-Id: Id1a5be54e2f35604936b5e45cf715ca2297b17fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 15:51:55 +00:00
TreeHugger Robot
098e4ca71f Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 12f552f22e am: 088de1fbac am: e8a6ae309c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I30f98a369370a61996541b34d858e7801ebc676b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 14:12:35 +00:00
Bill Yi
0c649f23d3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: 3abfb845b6 -s ours am: 7323d0e02e -s ours am: be4d2bb32a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86e087b2721b0eee701a0124640980cafa938647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 14:12:24 +00:00
TreeHugger Robot
fbbd1f1109 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-10 14:05:19 +00:00
TreeHugger Robot
3ffe35d0df Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-10 14:05:19 +00:00
TreeHugger Robot
1b42795ed4 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-10 14:05:19 +00:00
TreeHugger Robot
8e13f26686 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-10 14:05:19 +00: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
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
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
TreeHugger Robot
e8a6ae309c Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 12f552f22e am: 088de1fbac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I45ab8a4502b63f0d65e00f83538750f77b543214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 09:38:02 +00:00
Bill Yi
be4d2bb32a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: 3abfb845b6 -s ours am: 7323d0e02e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b3dc3d4b15d2e75157c2d927987f1fc083788a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 09:37:51 +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
Menghan Li
f7b967ffd4 Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev 2022-05-10 08:42:32 +00:00
menghanli
4a35bf929a Remove "Remove animation" assistive technologies in setup 
Turn on "Remove animation" will cause setup flow becomes slow in response. The educational videos and animations (such as the ones used in onboarding) should NOT adopt "remove animation". Will postpone this feature until Android U.

Bug: 227284067
Test: Manual testing
Change-Id: I57f2d4513372e8deeabcd784896dc0ffbea145c8
 2022-05-10 08:42:15 +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
Bonian Chen
2d72d9f450 Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev 2022-05-10 07:51:16 +00:00
Julia Reynolds
91efb0a49c Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: 8e41734caf am: c92e89217f am: 6d35c24218 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: I8a248fade556f72b8e66ad6f233fbb24e91f9fb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:50:28 +00:00
TreeHugger Robot
05b2bf0119 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d5ab43596e -s ours am: a0de6f937c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3e0ec82dd07260d2c3ad205df0f84eb07855568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:34:18 +00:00
Bill Yi
470db173d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 21ad396435 -s ours am: 2f6bf8d723 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieeb6c0e4c83bb8f1b1b88293162fb5161b5840c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:34:11 +00:00
TreeHugger Robot
efe91f77b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8ec0fc0931 -s ours am: 5b0dc86f8f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc4339cc6554761277edb5ef47b5eafd5f42aebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:33:56 +00:00
Bill Yi
29d1c84e45 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8de09b57 -s ours am: 605150d35d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib20de7c87e3aa8ffb3681ad496b7987c22b31a24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:33:45 +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
TreeHugger Robot
088de1fbac Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 12f552f22e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: Ib31cf6b2a286a1f783559b8b09da5ced249ee397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:11:06 +00:00
Bill Yi
7323d0e02e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: 3abfb845b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e5258a9114cc426d9bb0e2b80a1757cf2fcd50b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:10:55 +00:00
Chaohui Wang
61161eab14 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: I789d73993aee19eeff574cd6e5d99714f48742f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:06:25 +00:00
Bonian Chen
b0e2411297 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: I9c2056dfb62576bfc7dd87df6a1a58ef0aa7095e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 05:43:38 +00:00
TreeHugger Robot
3433f8a9b2 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: I8827eff74dc89e58ac1b8c0e41bc2b1a44c20505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 05:43:16 +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
Julia Reynolds
446f02863a Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: c80fc1ba4d am: f0ed87645c am: 0e3dbbef3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: I5795a7b5fe57f2cbe0b63e9325f2c54177cd968b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 05:23:46 +00:00
Bill Yi
7ada1a1b2e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-10 05:22:10 +00:00
Bill Yi
5898a6df49 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-10 05:22:10 +00:00
Bill Yi
dbe34c51ff Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-05-10 05:19:30 +00:00