PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,238 Commits 1 Branch 0 Tags
c60a7e6109c49c144abe8141bd37ff53bd40db1c
Commit Graph

103238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tsung-Mao Fang
c60a7e6109 Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333 am: 7e6dd3f4b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967

Change-Id: I94f2e3ede5caf0bc20e8033b30c4501e1f005c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:26:56 +00:00
Bonian Chen
68f0010133 Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450 am: 7dcd7194b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985

Change-Id: I749c9c8a14ee401af175a8c4fad295acf0a8ecfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:26:48 +00:00
TreeHugger Robot
2c5f09d6b6 Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: 24a2986cfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995

Change-Id: I18b23c26645609745f5e155371ddab31fbc7f7ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:26:43 +00:00
SongFerng Wang
a3a3842259 Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 2c7794515d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422

Change-Id: Ib3980b61daeb8054a73dbcf94b5084a4e8a7206e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:26:09 +00:00
Chaohui Wang
2d2833cf9b Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220 am: d6a9c62ff9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874

Change-Id: I387254e861d77a5986238956ae17dbd9bfd620c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:25:32 +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
Bill Yi
9825da46ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7ada1a1b2e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1bfdae40e320f140b44a8a3879d64aed5a377de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:15:33 +00:00
Bill Yi
b781b9c38d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 196ff79720 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae86de36449cf9df242d79cec297cdab3d0596e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:15:18 +00:00
Bill Yi
059234f150 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5898a6df49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb037cd0b42f56367d8d909e7d8ebb39adeef567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:14:59 +00:00
Bill Yi
72fbe398ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4c7931e46 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83543ee334f01915c02477444bc2222059f73df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:14:46 +00:00
TreeHugger Robot
97b69588df Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 0c8f044705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I2c1a1466175300be585c3920c6f9e43e63012a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:05:19 +00:00
Bill Yi
1fcabe2452 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: d4631b0d42 -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: I54bc21e568474fa36f7537c5b4c31707ac7cad0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:05:07 +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
Bonian Chen
7dcd7194b4 Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985

Change-Id: Ie03543a38e7aee8b78e888ff842b1e807e953c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:26:18 +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
Chaohui Wang
d6a9c62ff9 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: Idbe08655bb07d19a2d9a0ee86845241d0c6659c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:25:36 +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
TreeHugger Robot
3dcb2b65f7 Merge "Cancel bonding upon back gesture." into tm-dev 2022-05-10 06:31:28 +00:00
SongFerng Wang
b1613b210d Merge "Reuse the active esim slot" into tm-dev 2022-05-10 06:25:07 +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
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
TreeHugger Robot
0c8f044705 Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I53c6086ae26936f7e182b692cb51d958d5e566a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 05:12:33 +00:00
Bill Yi
d4631b0d42 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -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: I75fd6f3a5a0ce5180a987110c5c5e33eb54515b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 05:12:14 +00:00
Bonian Chen
d2c9581b44 [Settings] Broken test fix - SimStatusDialogControllerTest 
Avoid from test broken - SimStatusDialogControllerTest

Bug: 232040460
Test: unit test
Change-Id: Id5cedd92f008df232234a19d9894e6eb8d39959d
 2022-05-10 12:20:50 +08:00
Chaohui Wang
1107c1c220 Merge "Fix Voice Access scroll down in the Add network" into tm-dev 2022-05-10 04:15:07 +00: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
TreeHugger Robot
f1167898b7 Merge changes from topic "tc_change_20" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979
  Import translations. DO NOT MERGE ANYWHERE
 2022-05-09 23:02:43 +00:00
TreeHugger Robot
d5ab43596e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-09 21:35:14 +00:00
TreeHugger Robot
8ec0fc0931 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-09 21:35:14 +00:00
Julia Reynolds
f0ed87645c Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: c80fc1ba4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: Id34ab31feb04fb25e7103623387b873906a94838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:21:09 +00:00
Qasim Javed
78765b0b26 Cancel bonding upon back gesture. 
When pairing dialog is dismissed using the back gesture, we do not call
cancelBondProcess() for the remote device. Since bonding is not
cancelled and the dialog is dismissed, when the user tries to pair again
and scans for devices, nothing shows up. This is because in case of a
pending bond or pending SDP, the request to search for new devices is
queued.

The correct behavior is to cancel bonding if the pairing dialog is
dismissed using the back gesture. This is similar to what
happens when the pairing dialog is dismissed using the cancel button.

Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog

Change-Id: Ia790e345be811be1b60762ff819544d03c5a18fd
Merged-In: Ia790e345be811be1b60762ff819544d03c5a18fd
 2022-05-09 13:55:52 -07:00
Julia Reynolds
c80fc1ba4d Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: I08f148210ade5545c070a88656909d4acb7becb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:40:45 +00:00
Julia Reynolds
23a85a1f96 Merge "Remove notification permission feature flag" into tm-dev 2022-05-09 20:16:09 +00:00
Raphael Kim
f14c2ff2da Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 am: a36c5894ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

Change-Id: I05d4cdd4ab311f09a73222496ad2ad52e4eaebb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:50:13 +00:00
Raphael Kim
a36c5894ba Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

Change-Id: I4cabf15ab73a28f4c154a1ebe0b7383b5658c3ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 18:49:37 +00:00
Raphael Kim
c6f7599158 Merge "Extract app label from component name in notification access confirmation UI" into tm-dev 2022-05-09 17:55:06 +00:00
Bonian Chen
e0f1081739 [Settings] IMS feature checking before accessing VT IMS API 
Check IMS feature before accessing VT IMS API.o

Bug: 231248315
Test: local
Change-Id: I01b438cc79bb91ca05ba6bf57c7e38eb06e51a98
 2022-05-10 01:32:31 +08:00
SongFerngWang
42aa247383 Reuse the active esim slot 
If there is the active esim slot in SS mode, the settings should
reuse it and does not change the sim slot mapping.

Bug: 229803628
Test: manually test.
Change-Id: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
 2022-05-10 01:04:20 +08:00
Yuri Lin
3bb0f67d1f Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a am: e010ba619e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363

Change-Id: Iad024c7dd4d83546ba13727aaf17f28f01693ba5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 15:39:59 +00:00
Chaohui Wang
b215b96dfc Merge "Fix the device admin apps status not refreshed" into tm-dev am: 870dcb6949 am: e33539d629 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220099

Change-Id: I932507daf32712323cd4108081aacea9c83f092c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 15:38:54 +00:00
Jason Chiu
99e01325bf Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20 am: 399093f82a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097

Change-Id: I2bd9f24f858a74a1f311681f522e12bd1c7fb0db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 15:33:27 +00:00