Reema Bajwa
dbd9904c0a
Calling isServiceEnabled with the context in credential manager settings
...
Test: Built and deployed locally
Change-Id: I22d3fe863fa31c2601cedbde10907c79469a75f4
2022-12-21 07:01:59 +00:00
Reema Bajwa
5ba7d67b42
Revert "Revert "Add Credential Manager settings""
...
This reverts commit 7a231eaba0
.
Reason for revert: Adding in fix for issue that caused initial revert
Change-Id: I395c13fb46fc570a6b8a663d4b4e5537866325ce
2022-12-20 22:14:05 +00:00
Jeremy Nei
bd89bc1edb
Merge "Report user selected resolution events to StatsLog"
2022-12-20 08:34:44 +00:00
Bill Yi
30f206d21a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0ce477d1b0
-s ours am: f1c44c2414
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20781598
Change-Id: I45b0d81d0f45700b3c0d10d9b6e7a4162c811e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 06:36:06 +00:00
Bill Yi
3a4e6fbb3c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e6d50beef
-s ours am: 99aef9fd27
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20781598
Change-Id: I10058af7bbb7742505b18ca5ccca252087d40f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 06:35:37 +00:00
TreeHugger Robot
36bdaaee26
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d7cc9378fe
-s ours am: 0abed076d2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20782929
Change-Id: I4272f17882de1e53b3a23e058afc8d0da485d27f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 06:21:14 +00:00
Bill Yi
4cb3e2640e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 481727404b
-s ours am: 94246084a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20782929
Change-Id: I817c1e928cb14b7081cb580f838c4af044a4b6b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 06:21:06 +00:00
TreeHugger Robot
6f45b149a0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: fb0ce4b83f
-s ours am: de200625dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20782928
Change-Id: I21fdfa5f1019211816c598f5ac9ca5d047ddceaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 06:20:52 +00:00
Bill Yi
21764eec5c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b24f771519
-s ours am: 37bae5ee08
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20782928
Change-Id: Ic4eb97fec1096912930b9dd5139fb9facf126e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 06:20:38 +00:00
Bill Yi
f1c44c2414
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0ce477d1b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20781598
Change-Id: I4169fea5c14a15bc2fba79dbeb4ee9872d613a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 06:14:52 +00:00
Bill Yi
99aef9fd27
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e6d50beef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20781598
Change-Id: I7fef6931550827ef6dcd57b79afa761e17191777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 06:14:05 +00:00
Bill Yi
0ce477d1b0
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-20 06:00:39 +00:00
TreeHugger Robot
b878053b92
Merge "use SettingsEnums instead of MetricsEvent in TapScreenGestureSettings"
2022-12-20 05:53:43 +00:00
TreeHugger Robot
3dca8e60d4
Merge "Add metric for About phone > Device name > confrim dialog"
2022-12-20 05:52:57 +00:00
TreeHugger Robot
0abed076d2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d7cc9378fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20782929
Change-Id: Ied799cc46bfe78038153363953e9768f9c7caf45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 05:45:43 +00:00
Bill Yi
94246084a3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 481727404b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20782929
Change-Id: I9dc85e04fa9f4fd6bba0479c4f5b2953c9093333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 05:45:32 +00:00
TreeHugger Robot
de200625dd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: fb0ce4b83f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20782928
Change-Id: Ie37f5ec1e0256c971162334e6fd0e7ea56348817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 05:45:21 +00:00
Bill Yi
37bae5ee08
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b24f771519
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20782928
Change-Id: Id81371006dc858e249351a05c41290ffef86e4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 05:45:02 +00:00
TreeHugger Robot
d7cc9378fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-20 04:59:24 +00:00
TreeHugger Robot
fb0ce4b83f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-20 04:59:24 +00:00
Zoey Chen
3bc1e1f126
Merge "[Settings] Provision status checking of eSIM in dialog fragment"
2022-12-20 03:47:31 +00:00
Kuan Wang
1e7181cfcc
Remove "Other Users" entry in app usage list.
...
Don't show the aggregated other user entry in the app usage list to keep
consistent with screen-on time data.
Bug: 260964903
Test: make RunSettingsRoboTests
Change-Id: Id611e7222602f5ad2ea0fe27fb3f9f62fed31ff9
2022-12-20 03:00:05 +00:00
Kuan Wang
97924455ff
Implement the app usage data loading from database function.
...
Bug: 260964903
Test: make RunSettingsRoboTests + manual
Change-Id: I459dbdebe53e6b7421642955f36976b3e7c95fcb
2022-12-20 02:31:50 +00:00
TreeHugger Robot
092d07fa60
Merge "[Settings] Extend CustomDialogPreferenceCompat class"
2022-12-19 18:10:20 +00:00
Zoey Chen
eeaf2a0125
[Settings] Provision status checking of eSIM in dialog fragment
...
Bug: 262679983
Bug: 257120311
Test: manual
Change-Id: Idc78741e445b5d6448e2288f2a1bc6c79e34bf4b
2022-12-19 18:08:15 +00:00
Dan Shi
c0f061a08d
Merge "Revert "Add Credential Manager settings""
2022-12-19 17:48:02 +00:00
Bonian Chen
47a8010a52
[Settings] Extend CustomDialogPreferenceCompat class
...
CustomDialogPreferenceCompat is an abstract class, which not allowing
creating a dialog directly.
This is a class to enable constructing it as a generic class.
Bug: 260540995
Test: presubmit build pass
Change-Id: I1353bb92b353d6d27206574fd8f5499742ad3994
2022-12-19 14:44:12 +00:00
Bonian Chen
c9db203edd
[Settings] Ignore some failure test cases
...
Ignore some failure test cases to improve presubmit time.
Bug: 260806431
Test: local run unit test
Change-Id: I0be69bd6c9ae64e880c264c09952f915329753da
2022-12-19 13:51:24 +00:00
Arc Wang
850f857ce5
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b946
-s ours am: cef3637f4c
-s ours am: 5772502644
-s ours am: 669dad7687
-s ours am: eb6daa6e20
-s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0f7f913281
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727213
Change-Id: I19a73c1738fc26bc429cc3b5feb80f2169159349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 11:11:10 +00:00
Arc Wang
8859506bbb
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: 960c96474d
-s ours am: e3a8b88137
-s ours am: 97bea8ce23
-s ours am: 9990b74f45
-s ours am: 5f5d3b2244
-s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 0498907322
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20690601
Change-Id: I9a4f42c77c0a4bf7892ec90f185b87470037aefa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 11:11:08 +00:00
Arc Wang
d8a79c4958
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 0f7f913281
am: dd4f2500b6
-s ours am: e7cf080484
-s ours am: 3e121b1f94
-s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 95ff075244
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727211
Change-Id: I1813b3ec8de0483e191d74d699223f2d2ad0d981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 11:10:44 +00:00
Arc Wang
1cd33e1fd1
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: dc5a992f49
-s ours am: 6d3f3af5d0
-s ours am: 13e169b972
-s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 f964b68fee
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20758918
Change-Id: I55c625f0b81c5c748687e849c58a144a2f9f164e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 11:05:08 +00:00
Arc Wang
eb6daa6e20
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b946
-s ours am: cef3637f4c
-s ours am: 5772502644
-s ours am: 669dad7687
-s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0f7f913281
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727213
Change-Id: Ic3f9b03f963d60a1c6fbc951ab52f0c6ac65a35b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 10:27:35 +00:00
Arc Wang
5f5d3b2244
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: 960c96474d
-s ours am: e3a8b88137
-s ours am: 97bea8ce23
-s ours am: 9990b74f45
-s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 0498907322
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20690601
Change-Id: Ie3b2f15238b19d0603c73f73afce9dd30e67ba14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 10:27:30 +00:00
Arc Wang
3e121b1f94
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 0f7f913281
am: dd4f2500b6
-s ours am: e7cf080484
-s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 95ff075244
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727211
Change-Id: I418242cedb602f305de2d38b031c7c3557f5c850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 10:27:21 +00:00
Arc Wang
13e169b972
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: dc5a992f49
-s ours am: 6d3f3af5d0
-s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 f964b68fee
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20758918
Change-Id: I0f1ed5ff1893fcf896c01f9af74fb9e4896ca937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 10:27:10 +00:00
Arc Wang
669dad7687
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b946
-s ours am: cef3637f4c
-s ours am: 5772502644
-s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0f7f913281
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727213
Change-Id: I81836e226545e8b69971030d88cf137b18617519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 09:44:34 +00:00
Arc Wang
9990b74f45
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: 960c96474d
-s ours am: e3a8b88137
-s ours am: 97bea8ce23
-s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 0498907322
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20690601
Change-Id: I2530d9f9ff67f5a40a29cf8d0f43537e120a3506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 09:44:32 +00:00
Arc Wang
e7cf080484
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 0f7f913281
am: dd4f2500b6
-s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 95ff075244
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727211
Change-Id: I90c89f36866a3c5ac44b4aa5f1bf7ca6562eeff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 09:44:26 +00:00
Arc Wang
6d3f3af5d0
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: dc5a992f49
-s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 f964b68fee
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20758918
Change-Id: Idf5810ea235deb0c090695525f635232bfafddbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 09:44:18 +00:00
Bill Yi
481727404b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6b1d66716be8ffc0eb82d1a335d2ba34c8b692d8
2022-12-19 01:19:11 -08:00
Bill Yi
9e6d50beef
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If0e669b10ec6165954a81fdd3e6917a8af5da2dc
2022-12-19 01:17:55 -08:00
Bill Yi
b24f771519
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia5ff9bb6e4a078f53e5494afaec5b14ef42a3812
2022-12-19 01:14:55 -08:00
Arc Wang
5772502644
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b946
-s ours am: cef3637f4c
-s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0f7f913281
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727213
Change-Id: Ie7ef5517d2e0da46d2f69a256b2758a106b74616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 09:09:13 +00:00
Arc Wang
97bea8ce23
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: 960c96474d
-s ours am: e3a8b88137
-s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 0498907322
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20690601
Change-Id: I7d65d39f1c2db0dbf2e289e49e1f8561ae97d563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 09:09:10 +00:00
Arc Wang
dd4f2500b6
Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 0f7f913281
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727211
Change-Id: I3d26e8d54ebf5ad307f58fb6119c89df33798356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 09:09:02 +00:00
Jeremy Nei
c98bff6d74
Report user selected resolution events to StatsLog
...
Report user selected resolution event.
Bug: 259797244
Test: Tested by tool statsd_testdrive
Change-Id: Ifb67de46562031b51d8d0695c789e1e15eea30bf
2022-12-19 08:40:42 +00:00
Zoey Chen
c865fd9ec1
Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev am: e99f20df58
am: c76250cd50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20747651
Change-Id: I8801847eaab9dd25c140d660ac66f0c20385eb2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 07:42:35 +00:00
Zoey Chen
c76250cd50
Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev am: e99f20df58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20747651
Change-Id: I2ea8ed881d1bcd91427f44b0fb866195fa289b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 07:04:37 +00:00
Dan Shi
7a231eaba0
Revert "Add Credential Manager settings"
...
This reverts commit 8c6f627a93
.
Reason for revert: possible cause of b/263060941
Change-Id: I8ce36da052ceb1f29372c307ae1c7a85cc932fe4
2022-12-19 06:48:52 +00:00