Commit Graph

13668 Commits

Author SHA1 Message Date
PETER LIANG
75d582768a Merge "Updates the padding of the reset button to meet for SetupWizard style." into tm-dev am: fc481ece26 am: 1932476fae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349802

Change-Id: I50019599e781389f40aa6b5406083050774fe7ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 12:54:41 +00:00
PETER LIANG
1932476fae Merge "Updates the padding of the reset button to meet for SetupWizard style." into tm-dev am: fc481ece26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349802

Change-Id: I9270826453ce63f23c56c447657d2899e361c181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 12:27:51 +00:00
PETER LIANG
fc481ece26 Merge "Updates the padding of the reset button to meet for SetupWizard style." into tm-dev 2022-05-13 12:01:18 +00:00
Weng Su
e48bcf1a53 Merge "Avoid unnecessary stopTethering when startTethering fails" into tm-dev am: 670070528c am: d792f5f0eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350145

Change-Id: Idf14a9aaccd4fc524ba842d592dbabe66864e4df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 09:49:31 +00:00
Weng Su
df66b3f320 Merge "Get app label by launched package" into tm-dev am: bbeed14835 am: 426b69b423
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18321386

Change-Id: I1c9e9a0efaaf1c8cd47fc4542e6062faf11abb50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 09:49:24 +00:00
Bonian Chen
055d903516 Merge "[Settings] Expand scrollable area of Wifi calling UI" into tm-dev am: 69c13dd49b am: 2ed1286deb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18335865

Change-Id: If66458cea9a843b1510a5d4a948ec54fdbbb5518
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 09:49:11 +00:00
Weng Su
fce87c2a85 Merge "Avoid unnecessary stopTethering when startTethering fails" into tm-dev am: 670070528c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350145

Change-Id: Iedbd144219d883e5a7fe0faa81496ef1e6e21639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 09:39:57 +00:00
Weng Su
1a2590eb82 Merge "Get app label by launched package" into tm-dev am: bbeed14835
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18321386

Change-Id: I3c533a466dcf9ed92774bc8a74f217a05015049d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 09:39:50 +00:00
Bonian Chen
00edf60a80 Merge "[Settings] Expand scrollable area of Wifi calling UI" into tm-dev am: 69c13dd49b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18335865

Change-Id: I2d145718da998a128c004526b6ccc95bf1db2dee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 09:37:39 +00:00
Weng Su
d792f5f0eb Merge "Avoid unnecessary stopTethering when startTethering fails" into tm-dev am: 670070528c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350145

Change-Id: I3a9e0cb6119179870abbeba114a58310e52dd474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 09:35:16 +00:00
Weng Su
426b69b423 Merge "Get app label by launched package" into tm-dev am: bbeed14835
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18321386

Change-Id: Iffb499e3006b5d41a3399e5b2984208776ea03cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 09:35:00 +00:00
Bonian Chen
2ed1286deb Merge "[Settings] Expand scrollable area of Wifi calling UI" into tm-dev am: 69c13dd49b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18335865

Change-Id: I46b1ef2315940d036027b4ce732855e5d3b6766b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 09:31:15 +00:00
Weng Su
670070528c Merge "Avoid unnecessary stopTethering when startTethering fails" into tm-dev 2022-05-13 06:14:57 +00:00
Weng Su
bbeed14835 Merge "Get app label by launched package" into tm-dev 2022-05-13 06:13:44 +00:00
Bonian Chen
69c13dd49b Merge "[Settings] Expand scrollable area of Wifi calling UI" into tm-dev 2022-05-13 06:00:52 +00:00
Chaohui Wang
a2464578a2 [DO NOT MERGE] Fix flicker for Data Usage page am: 5a2f5ecff5 am: 298ca56920
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281653

Change-Id: I24b6b41e62462890b964972c76c3217b751371cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 03:55:17 +00:00
Chaohui Wang
298ca56920 [DO NOT MERGE] Fix flicker for Data Usage page am: 5a2f5ecff5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281653

Change-Id: Ia23dc95e26e347924a85bc551d87a53dffa8a930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 03:15:02 +00:00
Chaohui Wang
33fa5ad0c0 [DO NOT MERGE] Fix flicker for Data Usage page am: 5a2f5ecff5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281653

Change-Id: I3ced87b95f04ae78449176be8b87f00753b7fb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 03:13:28 +00:00
Chaohui Wang
98fa9deb4a Merge "[DO NOT MERGE] Fix flicker for Data Usage page" into tm-dev 2022-05-13 01:41:16 +00:00
Peter_Liang
5bdc11a00d Updates the padding of the reset button to meet for SetupWizard style.
Goals: Call the function LayoutStyler#applyPartnerCustomizationLayoutPaddingStyle to dynamically adjust the padding of the view.

Bug: 231511522
Test: manual test
Change-Id: Idd4a00c004eca8ec9699edeabe85bbee4bd49af9
2022-05-13 09:37:13 +08:00
Bonian Chen
5c71853bd9 [Settings] Expand scrollable area of Wifi calling UI
1. Replace InstrumentedDialogFragment by SettingsPreferenceFragment.
   Enable the capability of shirnking the size of title.
2. Move switch bar into Preference.
   Enlarge scrollable area within this UI page.

Bug: 224661026
Test: local
Change-Id: I6e0a491721e9f93858c389593b2bb891f6fa8f8d
2022-05-13 09:18:32 +08:00
Weng Su
b1795081da Avoid unnecessary stopTethering when startTethering fails
- If Wi-Fi tethering is enabled or enabling, avoid to startTethering again.

- If Wi-Fi tethering is disabled or disabling, avoid to stopTethering again.

- Add more logs to know which module stopped Tethering.

Bug: 230457055
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSwitchBarControllerTest

Change-Id: I51d42ac0117d935ecaa9fa7312acc646b43d3593
2022-05-13 05:21:28 +08:00
Lifu Tang
3717f6f441 Merge "Cache summary text to avoid flickering" into tm-dev am: bd4b23ba0d am: 8186ffc6b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18328550

Change-Id: Iae70f7912c3e746a95f1da3c01215c6ca93753b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 15:20:59 +00:00
Lifu Tang
8186ffc6b1 Merge "Cache summary text to avoid flickering" into tm-dev am: bd4b23ba0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18328550

Change-Id: I2ed88c37d72f206af245a0c62037289e3015ad43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 15:01:56 +00:00
Lifu Tang
495e34da2b Merge "Cache summary text to avoid flickering" into tm-dev am: bd4b23ba0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18328550

Change-Id: I1c24084eae77b415834ec4d5bbc4121124a3df39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 15:00:40 +00:00
Lifu Tang
bd4b23ba0d Merge "Cache summary text to avoid flickering" into tm-dev 2022-05-12 14:57:31 +00:00
Julia Reynolds
265ac4148c Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3 am: 2d251eaa2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: I215afd39c21e68812732bbc02f9178e621782995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:49:24 +00:00
Julia Reynolds
2d251eaa2e Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: I43fe4faf8494593743293333756a142d256eddf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:27:10 +00:00
Julia Reynolds
38addd9f8d Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: Ief0ddf880d27a11b693bd01a1a6f7c033b8b4cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:26:54 +00:00
Julia Reynolds
9372f3b4e3 Merge "Use NMS calculation of fixed importance" into tm-dev 2022-05-12 11:55:40 +00:00
Yi-Ling Chuang
c1fd1de25b Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: ccc866a16f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I87d58a374fc4afbc1c8d3e5ce47d1803cfd23b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:15:06 +00:00
Yi-Ling Chuang
5cea4fc4a1 Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I9cea804407d90ff8b7304d311031e25d1b340e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 03:47:04 +00:00
Yi-Ling Chuang
ccc866a16f Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I4d5346f3cc0764cb94aad41a19ccf52a6b0b0831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 03:45:30 +00:00
Yi-Ling Chuang
f6c416054e Merge "Make the force stop dialog work properly in split screen" into tm-dev 2022-05-12 03:23:11 +00:00
Lifu Tang
f29a071fca Cache summary text to avoid flickering
Bug: 231927706
Test: build, flash, run unit test, then test manually.
Change-Id: Ia0585302c5cf86cd6035315fa750c71b9df55237
2022-05-11 15:52:23 -07:00
Julia Reynolds
2011588b16 Use NMS calculation of fixed importance
Rather than recalculating it again. Also align logic on
listing and details pages.

Test: NotificationBackendTest, NotificationPreferenceControllerTest
Bug: 231662091
Fixes: 231815850
Change-Id: If9572766666620008afb839ecb0828ace8d6073d
2022-05-11 16:38:04 +00:00
Weng Su
25b0db21ac Get app label by launched package
- Activity#getCallingPackage will return null in some special cases, use the launched package instead.

Bug: 194709435
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiScanModeActivityTest

Change-Id: I4f22bab7592dedf75dd36daf5e18dbc934bc8655
2022-05-11 22:51:45 +08:00
Yi-Ling Chuang
2754a20c72 Make the force stop dialog work properly in split screen
When it's in a multi-window mode, force stopping an app will lead to an
activity recreate, and the dialog fragment will also be recreated.
That's why the dialog still shows after the button is clicked.

Hence, dismiss the dialog before stopping the app to fix it.

Fixes: 231529730
Test: robotest
Change-Id: I75d27624f0c60bb617e7d1a92ffe01d3c0fbf7be
2022-05-11 17:07:38 +08:00
Chaohui Wang
5a2f5ecff5 [DO NOT MERGE] Fix flicker for Data Usage page
Both "Mobile data usage" & "Non-carrier data usage".

By,
1. Use summary placeholder for usage amount to avoid shift
2. Before fix CycleListener's onItemSelected() is called multiple times,
   cause the app list to flash, let DataUsageList to handle the dedup
   logic to better handling.
3. Before fix if return from App Usage page, no loading view is
   displayed (only first enter has it), move this to onResume() to fix.
4. Before fix the cycles passed to App Usage page is cached (even when
   the cycles are changed), clear the cache when onResume() to fix.
5. Listener in SpinnerPreference could be null, add safety guard to it.

Fix: 187019210
Test: manual visual test
Change-Id: I95e544c46333496f4f30ed77dafa4779b4d66019
2022-05-11 17:02:54 +08:00
TreeHugger Robot
b53549a4c5 Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18 am: 0fa209b89c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: Ib7e0937ab4ae2e61664e69054d4f3db5ab91312a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:07:40 +00:00
TreeHugger Robot
0fa209b89c Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: I683531b19121643ea5000d3bdd4344d0c7c9cfd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:38:59 +00:00
TreeHugger Robot
ebd46572c4 Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: I1d4d1936e6b5c5d556db078d2481c772826d1135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:37:25 +00:00
TreeHugger Robot
f39872bc18 Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev 2022-05-11 03:02:52 +00:00
TreeHugger Robot
435a8ae837 Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe am: ccd8147776
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990

Change-Id: Iaa804c69d8744a07de575fd57c57eede2ca6a7b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:06:33 +00:00
Bonian Chen
c8433b8435 Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467 am: 33bc83f19e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805

Change-Id: I979f44db2bc52cdef0b1e48a88457856a10cfda5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:06:04 +00:00
Martijn Coenen
ffef837a93 Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290 am: cf79b0fcf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004

Change-Id: Id7e7b020df7b7ba22e82bf80ac1b541d915ca48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:03:14 +00:00
Tsung-Mao Fang
551d742d83 Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333 am: 4e09433546
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967

Change-Id: Id8befe820b0df6bf057e952f56cc66a3d52ae4f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:01:50 +00:00
TreeHugger Robot
7e3c63dcd5 Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990

Change-Id: I550583e2fa4ba4c113760ca41caee4f499d76929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:33:52 +00:00
Bonian Chen
2a1040e1e2 Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805

Change-Id: I1a7d0cd2e38b39da2b1873b2cb6161d5a50abb45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:33:40 +00:00
Martijn Coenen
d77f3426a2 Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004

Change-Id: I6e942c241c734314246623b7521af6ebf9d2896c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:33:13 +00:00