Commit Graph

49544 Commits

Author SHA1 Message Date
SongFerng Wang
9556fdf30c Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4 am: daf2fdc6f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967

Change-Id: Iaf6380199679e8f0643274c4e6968222219b15dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 13:27:08 +00:00
SongFerng Wang
c4ed48cbe4 Merge "Try to avoid the timing UI issue" into udc-dev 2023-05-30 12:00:39 +00:00
Chaohui Wang
d38e08c97b Merge "Replace deprecated fields with ImsManager fields" into udc-qpr-dev am: 232ab65146 am: 614de9cad8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467965

Change-Id: Idddb11cc94b78b98f738c170729ec682ea60b469
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 11:14:37 +00:00
Chaohui Wang
614de9cad8 Merge "Replace deprecated fields with ImsManager fields" into udc-qpr-dev am: 232ab65146
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467965

Change-Id: I047939c39a931a7be3d28bf394bf73adb00299ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 10:30:08 +00:00
Chaohui Wang
232ab65146 Merge "Replace deprecated fields with ImsManager fields" into udc-qpr-dev 2023-05-30 09:29:58 +00:00
SongFerngWang
0f3f6086e9 Try to avoid the timing UI issue
Tester exit network scan interface and then enter network scan activity
immediately. The previous network scan stop command effect the current
network scan.

Move "stop network scan" to first at onStop.

Bug: 276679520
Test: Build pass.
Change-Id: Ib0125c3745537a82b7574a8580d2a02c4e3644a0
2023-05-30 15:18:28 +08:00
Daniel Huang
78f32fafa6 Merge "Display gesture education button in touchpad settings" into udc-qpr-dev am: 58aab66f51 am: 3021c1d3bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23428477

Change-Id: If09157eba3da520c4b364c8d108f4cb0498a30b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 07:04:17 +00:00
Daniel Huang
3021c1d3bf Merge "Display gesture education button in touchpad settings" into udc-qpr-dev am: 58aab66f51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23428477

Change-Id: I23f3608d3b46d43c6e431348c98131946375921f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 06:41:57 +00:00
Daniel Huang
58aab66f51 Merge "Display gesture education button in touchpad settings" into udc-qpr-dev 2023-05-30 06:23:59 +00:00
TreeHugger Robot
1f22a21b0a Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 261a252a84 am: 71e6d2e29e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I7149441acacf4a302eb639e81f9c7a6d0ab60570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 06:12:04 +00:00
Chaohui Wang
4aeb362668 Replace deprecated fields with ImsManager fields
Bug: 284913888
Test: m Settings
Change-Id: Iac56df24f571e1c8268b8b217ec1a05f67f7a2b2
2023-05-30 14:08:21 +08:00
Zoey Chen
1f76872d78 [Panlingual] Remove the large space when searching language
Don't expand the tool bar when users search the language because they will see a large space on the top.

Bug: 284480214
Test: local test
Change-Id: Ie8653536117a999bd420ccfce961b17fe9349d35
Merged-In: Ie8653536117a999bd420ccfce961b17fe9349d35
2023-05-30 05:44:13 +00:00
Zoey Chen
e2a9ee2f35 [Panlingual] Remove the large space when searching language
Don't expand the tool bar when users search the language because they will see a large space on the top.

Bug: 284480214
Test: local test
Change-Id: Ie8653536117a999bd420ccfce961b17fe9349d35
2023-05-30 05:42:42 +00:00
TreeHugger Robot
106525cd10 Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 261a252a84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: Ida476028924b3c33f92e98c20fbf3a27f5482b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 05:31:17 +00:00
TreeHugger Robot
71e6d2e29e Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 261a252a84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: Iaaed0f91044266c6fe5846422a95faa30bf57d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 05:27:12 +00:00
TreeHugger Robot
cc9c278168 Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: 43bb90a8f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I56529ad6971d358fd017499da2ee3f6816837a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 05:27:10 +00:00
TreeHugger Robot
261a252a84 Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I0d50d150c413f1fa9e17948e844a1331e85c21c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 04:47:26 +00:00
TreeHugger Robot
b98d6644ed Merge "[Settings] Remove redundant sort" into udc-dev 2023-05-30 04:05:22 +00:00
Hao Dong
7ced7a7cbd Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev am: 6cb1f9401d am: 81587b1864
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23418521

Change-Id: I47013f77ec1436048a41afbba34bdb4eeaa6ac6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-27 00:32:26 +00:00
Hao Dong
81587b1864 Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev am: 6cb1f9401d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23418521

Change-Id: Ifd0ca0b6881b2e8d0ff8f57e9fa4876208f9e520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:05:55 +00:00
TreeHugger Robot
a14d53163c Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee am: 1efd1f6d3c am: 6e9b0d97da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: I93be3c2d16321bacec5253332a6dc83e4e0b2f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:02:34 +00:00
Treehugger Robot
0934c3e881 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393 am: 424440670d am: 9abd002f0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: I38e0b893872feca32d26aa62f48b2f1e69f8e9cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:02:22 +00:00
Hao Dong
6cb1f9401d Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev 2023-05-26 20:35:34 +00:00
TreeHugger Robot
a6f32e2cb3 Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee am: 1efd1f6d3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: I343c82faae3d9fb135d4e9e500923a3fec91de4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:20:45 +00:00
Treehugger Robot
67b9234806 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393 am: 424440670d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: Ib5975d1e338250b7468f3e37650094eeb5244bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:20:34 +00:00
TreeHugger Robot
bb92abb0ae Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee am: 5c238c0f5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: I8eb5dffe4b0bdef9cdfc8d37b5968c301d04e05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:17:53 +00:00
Treehugger Robot
eff0680f84 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393 am: f483a19888
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: Ib4a95a02a1ab9dae837d795c3721f0357746a395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:17:44 +00:00
TreeHugger Robot
6e9b0d97da Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee am: 1efd1f6d3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: I150a607f7d37f89224ab2aa0aadad7d2242ecbff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:17:40 +00:00
Treehugger Robot
9abd002f0c Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393 am: 424440670d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: I0cd780aed67bbe0560f5057fc430fc144b9f1f35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:17:32 +00:00
TreeHugger Robot
1efd1f6d3c Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: I3c68a806fa8849b68f0e853a181d3f2859e485a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 19:13:08 +00:00
TreeHugger Robot
1df5ad89ee Merge "Update bad calibration error message" into udc-dev 2023-05-26 18:59:46 +00:00
Treehugger Robot
424440670d Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: I9d29601614b0f166afc898f99e3ee87df974abf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 18:52:36 +00:00
Treehugger Robot
24db1f3393 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: Ifa1155d2a3ae19ff743b29b47e088d5d42724f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 17:44:20 +00:00
Diya Bera
1069105558 Update bad calibration error message
Test: Manual - send bad calibration error in code and observe the
strings
Bug: 280786940

Change-Id: I999750b98fcfd83a6fd265bac0aa334342c9f536
2023-05-26 10:26:59 -07: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
8a9a86ad60 Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33 am: ca3c3ae9d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460

Change-Id: I1cb85516f8c73ce24a6564e61fc428cbfdac7e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 14:17:59 +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
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
2587270451 Merge "[Terms of Address] Add a constructor with Attr for xml" 2023-05-26 08:58:58 +00:00
Chaohui Wang
2e871b3727 Merge "Move unrestricted data summary to DataSaverController" into udc-qpr-dev am: 97963e8389 am: 6a6e3b848b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442437

Change-Id: I2dd90fc550a0db58021061024eefae44a02de7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 08:42:38 +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
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
Treehugger Robot
92100dc493 Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905 am: 82fbafac93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441

Change-Id: I05a5838ffd71356e8163f49c5ebf4d97f706e6ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 08:11:55 +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
Chaohui Wang
97963e8389 Merge "Move unrestricted data summary to DataSaverController" into udc-qpr-dev 2023-05-26 07:50:45 +00:00