Treehugger Robot
5fa6d3b7dc
Merge "Restrict Printing Settings" into tm-qpr-dev
2023-05-26 16:28:03 +00:00
Julia Reynolds
bbef903b88
Revert "Update theme for ChannelPanelActivity"
...
This reverts commit 41eeb31b20
.
Reason for revert: b/284380876
Change-Id: Ia06bf047db187091753e560f70427abb5b26378a
2023-05-26 15:32:08 +00:00
Tom Hsu
2541b5f8c1
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
am: 15ea70cfa2
am: a035dfae6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I38017483d7f60a556e7de8116f9fb8e55c42d96b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 15:07:34 +00:00
Tom Hsu
70380963c7
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
am: 1b6b5ea7e7
am: ea6ee1b2e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I364f8a715deb1711df546d6e0ec3690408cfc847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 14:42:25 +00:00
Tom Hsu
2cfb9801e9
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
am: 15ea70cfa2
am: 9d3602a85f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: Ic3da3d66594414354f8d0af95495d7dad3134dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 14:42:03 +00:00
Tom Hsu
a035dfae6c
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
am: 15ea70cfa2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I9e25905caa56f3a1b6bd185dae8e4f3b8374708e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 14:19:53 +00:00
Tom Hsu
ea6ee1b2e1
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
am: 1b6b5ea7e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I63989542a5f8f0f39bc5aea7260a009f1e81c0e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 14:19:53 +00:00
Tom Hsu
9d3602a85f
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
am: 15ea70cfa2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I01944856d0e480838db534448404fff09685c7c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 14:17:36 +00:00
Tom Hsu
15ea70cfa2
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I4c8aed17f14a9a73d82ca7ad33f50cb471f86503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 12:53:13 +00:00
Tom Hsu
1b6b5ea7e7
Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460
Change-Id: I345ffb00c6685c86d17edc4de13d47815925239f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 12:48:57 +00:00
Tom Hsu
b1b4e25f33
Merge "[Settings] Add data roaming observer" into udc-dev
2023-05-26 11:56:20 +00:00
tom hsu
f2bf350303
[Settings] Remove redundant sort
...
- Use sql command to sort subscription info data instead of current.
Bug: 284306899
Test: Manual test
Change-Id: Ie0c5f5614a336771f865f02e7675b4e125ff15bb
2023-05-26 10:14:49 +00:00
Treehugger Robot
112c04d1aa
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
am: 105af133bc
am: 62a7d1f128
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: I274ac6518d5fc0ca80eecf53705a5f3ef6304526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 09:02:46 +00:00
Treehugger Robot
32cce10d7c
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
am: 624922703b
am: 3025827edc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: I54a05c371d8cbeadc1e898b0677873501657fa26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 09:02:29 +00:00
Treehugger Robot
0e10867d87
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
am: 624922703b
am: 3ac1f9ec66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: I62dca7749f85b75da0c8fa52622a638270560abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 08:41:30 +00:00
Treehugger Robot
62a7d1f128
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
am: 105af133bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: If7c476fcb858911cf5278751a224dc412ea39fbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 08:16:56 +00:00
Treehugger Robot
3ac1f9ec66
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
am: 624922703b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: I37634274b6f8b5f7f90ced16c3ac1e97102083f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 08:16:13 +00:00
tom hsu
499a2fa16d
[Settings] Add data roaming observer
...
- Data roaming can be controlled by SettingsProvider, it shall be
listen the change and set the change state to repository.
Bug: 278822324
Test: Manual test passed.
Test: atest passed
Change-Id: I6eb5330ba643c485c5d12eb879af1e0e8f7baed7
2023-05-26 16:13:09 +08:00
Treehugger Robot
3025827edc
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
am: 624922703b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: Iba9bf88e4c79d2dfb8ab8dcf0cd49372bb7f51cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 08:12:12 +00:00
Chaohui Wang
6a6e3b848b
Merge "Move unrestricted data summary to DataSaverController" into udc-qpr-dev am: 97963e8389
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442437
Change-Id: Ic6338fc2c629944f4c8baf560becec13e63db03f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 07:55:20 +00:00
TreeHugger Robot
436ddeec90
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
am: 89b497a051
am: bf08be55a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: Ide56b05d454e3c71709d14bc187cf410d7b61e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 07:54:57 +00:00
Chaohui Wang
97963e8389
Merge "Move unrestricted data summary to DataSaverController" into udc-qpr-dev
2023-05-26 07:50:45 +00:00
TreeHugger Robot
0d08080108
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
am: 3a5719aae0
am: 607547541a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: Ib65cc50da68a726cd8acd712453800be74cad7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 07:49:34 +00:00
TreeHugger Robot
0c0333b091
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
am: 89b497a051
am: b02de2eb5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: I0874437f53a0eea3b5c588f6e6c33b76dd3cbead
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 07:49:06 +00:00
Treehugger Robot
624922703b
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: I910a6b2976d8a5beeb5c2131a667446090ccc445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 07:31:06 +00:00
Treehugger Robot
105af133bc
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441
Change-Id: I0cad3e779c3087b0ff0a0466b2e6ca259e2e9d32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 07:26:47 +00:00
TreeHugger Robot
607547541a
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
am: 3a5719aae0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: I2685760376c98a438191ca4f5c051cfc24262f2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 07:10:19 +00:00
TreeHugger Robot
bf08be55a0
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
am: 89b497a051
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: I1c9beadacb0731dfb425932a077cb7354d924cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 07:09:34 +00:00
TreeHugger Robot
b02de2eb5c
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
am: 89b497a051
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: I11844659c7c294c3bcbb99df425c02db747a6df3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 07:05:26 +00:00
Treehugger Robot
d3b41aa905
Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev
2023-05-26 06:53:16 +00:00
TreeHugger Robot
89b497a051
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: I46d36e32cdb36b47eaa3c62005e65666c9fe94bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 06:26:29 +00:00
TreeHugger Robot
3a5719aae0
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: I9cd1fcc11e76da716b44faf5994b61eda78f0a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 06:22:10 +00:00
TreeHugger Robot
52d2daf3b3
Merge "Fixed unable to enable hotspot with Security None" into udc-dev
2023-05-26 05:43:02 +00:00
tom hsu
d75bd52982
[Settings] After APM on, do not show the page result in Settings search
...
Bug: 249520846
Test: Manual test
Change-Id: I51df50f244649a406449449a0b2d39164ad5e218
2023-05-26 13:42:39 +08:00
Chaohui Wang
3e35cff7ba
Move unrestricted data summary to DataSaverController
...
DataSaverController currently used in 2 pages,
- Network & internet > Data Saver
- Apps > Special app access
This helps unify the logic, and instead of showing on "Special app
access", this summary shows on "Unrestricted data" is make more sense.
Bug: 280280596
Test: Manually on above pages
Test: Unit test
Change-Id: Ia151ed8179a250f8f20cc5041f9383fffebdab10
2023-05-26 13:05:48 +08:00
SongFerngWang
e99db73c17
Modify the MetricsCategory as VPN_APP_MANAGEMENT
...
Bug: 260055313
Test: build pass
Change-Id: I7bb7d7519260abfa398b328829b559747d6f846b
2023-05-26 12:50:14 +08:00
Weng Su
f7d8f0481d
Fixed unable to enable hotspot with Security None
...
- Due to the design adjustment, the default value of SoftApConfiguration is not Security None, so the update of Security None cannot be omitted.
Bug: 283762826
Test: Manual test
atest -c WifiTetherSettingsTest
Change-Id: I07d18b8f73ab8190152332c01814a4bd72cf28d6
2023-05-26 12:26:31 +08:00
Tom Hsu
7f806717c2
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
am: 86db37ddcc
am: 233665d47c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462
Change-Id: Iee6325e3a237789c2eea1abd64790f07222d95cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 04:14:59 +00:00
Tom Hsu
f84799f0a2
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
am: f0fa79dc18
am: a754427874
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462
Change-Id: Ie00ced931b6845fae4f9521a1601e28e7f253abd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 04:12:13 +00:00
Tom Hsu
4ca5feddd3
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
am: 86db37ddcc
am: 8cd034ae72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462
Change-Id: Icd322832eb6a0b341f2983f13b23e309daf48930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 04:11:36 +00:00
Tom Hsu
a754427874
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
am: f0fa79dc18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462
Change-Id: Ic09ee4ea3bf4b9ab6dfde001bf0393b4c0ef16b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 03:30:18 +00:00
Tom Hsu
233665d47c
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
am: 86db37ddcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462
Change-Id: I2a71646abcb9264fec4820230718a18f20243efe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 03:29:03 +00:00
Tom Hsu
8cd034ae72
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
am: 86db37ddcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462
Change-Id: Ic7d3565555f54a259a647f614370381c9563d3e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 03:25:33 +00:00
Tom Hsu
86db37ddcc
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462
Change-Id: Id715f0645548dc225cfcc1a3396e0e81bd06fbdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 02:46:16 +00:00
Tom Hsu
f0fa79dc18
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462
Change-Id: Ie10308abc3b2ba08bfc5801ced15dc7132466d9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 02:41:59 +00:00
Tom Hsu
69caf6fbe4
Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev
2023-05-26 02:08:13 +00:00
Hao Dong
2eadf68438
Fix Fingerprint enrollment UI when display size is largest.
...
1. Remove land/udfps_enroll_enrolling and use the default land layout
instead. Swap header and content when necessary to avoid overlap.
2. Add UdfpsEnrollEnrollingView.java
Test: manual test - 1. Set system display and font size largest
2. Launch fingerprint enrollment and check UI.
Test: atest FingerprintEnrollEnrollingTest
Bug: 269060514
Bug: 283169056
Change-Id: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
2023-05-25 21:54:07 +00:00
Yuxin Hu
281ac47c33
Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
am: f783947615
am: d8fbd089d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519
Change-Id: I03241ab23527c86e69469f7fd9e9796fd924b4d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 20:39:02 +00:00
Yuxin Hu
5db4f3fa9b
Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
am: 75b784fcd0
am: fe2ed9c453
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519
Change-Id: I103e16e48099405020ce636fe35097f1dc100e46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 20:38:17 +00:00
Viesturs Zarins
04e1cc304d
Merge "Fix missing Activity embedding allowlisting for Assistant. The normal settings fragments are already allowlisted via SubSettingActivity. ManageApplications fragment based activities are not compatible with that however." into udc-d1-dev am: 8e9955a4f3
am: cd6409b84c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262238
Change-Id: Ib8ce403f545b51f03edffe10551079ba2db9896d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 20:37:54 +00:00