PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,185 Commits 1 Branch 0 Tags
c7ff65bc8510b10ee4864e666a700cae75cbcec2
Commit Graph

1782 Commits

Author SHA1 Message Date
Stanley Wang
8eafccf610 Merge "Update Adaptive connectivity page." into sc-dev am: 8cd20c0bb1 am: cb3626eaf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15142232

Change-Id: Id0a9027af06f75fe0ecfe138ae991dea911e6e70
 2021-06-30 09:51:13 +00:00
Stanley Wang
8cd20c0bb1 Merge "Update Adaptive connectivity page." into sc-dev 2021-06-30 09:23:51 +00:00
Stanley Wang
e722fbe277 Update Adaptive connectivity page. 
- Use MainSwitchPreference.
- Use the TopIntroPreference to display the summary.
- Use the IllustrationPreference to display the stastic
  illustration.
- Add new illustrations for adaptive connectivity.

Fix: 178673083
Test: robotest and test the switch preference manually
Change-Id: I2376f4433b61ce1d3da287de92660fbeea5dd64e
 2021-06-30 16:12:17 +08:00
Peter Wang
8dc461f40f Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" into sc-dev am: baecf00ce2 am: 249c3677d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15140324

Change-Id: I22278d14c83613251393588b322b7e8efe8a91f7
 2021-06-30 07:00:16 +00:00
Peter Wang
eba8857094 Add a cancel string for ToggleSubscriptionDialog to handle Tamil 
translation

Bug: 185553806
Test: Build
Change-Id: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
 2021-06-29 15:08:00 -07:00
TreeHugger Robot
825811a9b4 Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev am: a375349c0a am: ba2a3a8e09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135719

Change-Id: I902c54716904c50c9e782a2d90f1c600a27823c0
 2021-06-29 13:39:38 +00:00
TreeHugger Robot
5ec625631b Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce am: 19fe74f9af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124033

Change-Id: Ic95449de889dab619bd64021e6ff75a39ee59756
 2021-06-29 13:39:35 +00:00
TreeHugger Robot
a375349c0a Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev 2021-06-29 13:13:04 +00:00
TreeHugger Robot
80fd8a7cce Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev 2021-06-29 13:11:14 +00:00
Weng Su
d2fb4f06a3 [Provider Model] Fix the "Cancel" button issue in the reminder dialog 
- Do nothing if user cancel to turn off mobile data

Bug: 192052695
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Ib4b990a1f3f51a6bf11552a6018c73f8d7105736
 2021-06-29 16:08:20 +08:00
Bonian Chen
ffb5c7f2fe Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d am: 26af8823ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273

Change-Id: I2315933474450633b5639f992935a071f5561267
 2021-06-28 10:24:11 +00:00
Bonian Chen
d9bf670725 Revert "[Settings] Code Refactor - ActiveSubscip..." 
There seems to be an issue on system when a modification on file name get referenced by multiple submit(s).
(ag/15106410 and ag/15102785).

It seems to me that, build system got build breakage immediately instead of merging all of the files (even within same package).

Reason for revert: Try to submit all of the modifications within single submit as a workaround.

Bug: 192204057
Test: build pass
Change-Id: Ie497088a58c6ac564fde193fad2c0b67a965933c
 2021-06-28 09:32:54 +00:00
Weng Su
7a45b33c42 [Provider Model] Hide Connectivity Subsystems when recovering 
- Hide Carrier Network

- Hide Wi-Fi toggle

- Hide all of Wi-Fi Networks

Bug: 186590805
Test: manual test
atest InternetResetHelperTest
atest NetworkMobileProviderControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ib8462f890847d14bfc6ef533d1147822fd797a13
 2021-06-28 17:19:13 +08:00
Bonian Chen
704b69ac35 Merge changes from topic "revert-15102785-Fix build break of refactor ActiveSubscriptionsListener-TNZMDOZYZU" into sc-dev am: f4a80fdfa3 am: 1e035db889 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15120295

Change-Id: I1b0deaf438a5bfc60dfbacc9ab3f62aeacdb1e5c
 2021-06-28 05:51:48 +00:00
Bonian Chen
4c4d8e3a08 Revert "[Settings] Fix build breakage" 
Revert submission 15102785-Fix build break of refactor ActiveSubscriptionsListener

Reason for revert: Build breakage.
Reverted Changes:
I9ae819f06:Revert "Revert "[Settings] Code Refactor - ActiveS...
I15819472b:[Settings] Fix build breakage

Change-Id: Ifb1a579863df157b41aebbdf59ad7e4584efa866
 2021-06-28 05:23:33 +00:00
Bonian Chen
69fc8e0ccd Revert "Revert "Revert "[Settings] Code Refactor - ActiveSubscip..." 
Revert submission 15102785-Fix build break of refactor ActiveSubscriptionsListener

Reason for revert: Build breakage.
Reverted Changes:
I9ae819f06:Revert "Revert "[Settings] Code Refactor - ActiveS...
I15819472b:[Settings] Fix build breakage

Change-Id: Ib830b7b00504264a703a03a00bfdfcf65135d394
 2021-06-28 05:23:33 +00:00
Bonian Chen
e0667d76d6 Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b am: 80d7c162d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: I41b520c31b5ffaef539f3873f4b2863cbf907960
 2021-06-28 04:13:08 +00:00
Bonian Chen
80d7c162d6 Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: I527a0776f2d90cd46e79d1a6166c9299d0455d15
 2021-06-28 04:03:59 +00:00
Bonian Chen
c437177d4b Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev 2021-06-28 03:59:43 +00:00
Bonian Chen
ea951aab42 Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" 
This reverts commit 7b8e05adab.

Reason for revert: add missing file back to CL

Bug: 191321218
Test: build pass
Change-Id: I9ae819f06b2b6f042c2f39a8ff76c025ba49f631
 2021-06-25 08:47:21 +00:00
Bonian Chen
4a6733e456 [Settings] Fix build breakage 
There's a missing file within ag/15076791.
ag/15102531 is a revert for ag/15076791.

Right now, ag/15106410 is a revert for revert (ag/15102531).
And this is a CL adding the missing file back.

Bug: 191321218
Test: build pass
Merged-In: I7282c7ba9fbb793056c12928843b6eef59eb2213
Change-Id: I15819472b37a3bdba25fe006246baa968680a19f
 2021-06-25 16:38:27 +08:00
Bonian Chen
d4f8302d9c Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9 am: d2e5971ed1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102531

Change-Id: I3fb7018e458943a14ad8494cca1c81814d7fff15
 2021-06-25 02:28:51 +00:00
Bonian Chen
43402ead79 Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev am: 97886470cb am: 0363e192c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076791

Change-Id: I11b97060982cd68afd566479265dca5d9f1d6aed
 2021-06-25 02:28:25 +00:00
Bonian Chen
f9aa12f4d9 Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev 2021-06-25 02:17:59 +00:00
Bonian Chen
7b8e05adab Revert "[Settings] Code Refactor - ActiveSubsciptionsListener" 
This reverts commit 2a1344a50e.

Reason for revert: Missing some files which would lead to build breakage.

Change-Id: I8c63dea9b41598b563cbf5e5ff1c500cc51b7005
 2021-06-25 02:10:43 +00:00
Bonian Chen
97886470cb Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev 2021-06-25 01:59:05 +00:00
Jeremy Goldman
b866e020d9 Merge "Close AirplaneModeEnabler once lifecycle classes are destroyed." into sc-dev am: 7a6ff6942c am: 1d2831122a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007770

Change-Id: I20bb0ddcd89b746c6678928221a0d8b738154139
 2021-06-24 00:55:28 +00:00
Jeremy Goldman
7a6ff6942c Merge "Close AirplaneModeEnabler once lifecycle classes are destroyed." into sc-dev 2021-06-24 00:40:46 +00:00
TreeHugger Robot
1bc83c7062 Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472 am: 70af2a91a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792

Change-Id: Id855f19cd171e231ecf90d9d594b806149c2c3eb
 2021-06-23 10:47:42 +00:00
TreeHugger Robot
2f1afd7d83 Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 am: 55b7b6b508 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930

Change-Id: I9018efaa52ce217501b5c188260e2385cb6e0c02
 2021-06-23 10:47:37 +00:00
TreeHugger Robot
5764de71ed Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 am: 3f3034c2db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: Id67b1bd720c833d16de76b7d36023ba567a464ea
 2021-06-23 10:47:19 +00:00
TreeHugger Robot
b86f0c0472 Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev 2021-06-23 10:19:04 +00:00
TreeHugger Robot
d26416ce81 Merge "[Provider Model] Show carrier network to internet preference" into sc-dev 2021-06-23 10:11:33 +00:00
TreeHugger Robot
74babf6e91 Merge "Fix the NPE issue" into sc-dev 2021-06-23 10:10:22 +00:00
Weng Su
362bf07919 [Provider Model] Add Wi-Fi toggle in internet panel 
- Add a new slice row for Wi-Fi toggle in the network lists

- Increase the maximum number of network lists to 6

Bug: 189912933
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Ie25e108573f264ab3a94fc6804b9d46d855eeea1
 2021-06-23 17:19:34 +08:00
Weng Su
627efc46a2 [Provider Model] Show carrier network to internet preference 
- If the connected network is the merged carrier Wi-Fi, then show
carrier network to internet prefernce.

Bug: 191091045
Test: manual test
atest -c InternetUpdaterTest

Change-Id: Iad3869f086ea0a4d0607691c6709ee12567831c7
 2021-06-23 15:55:24 +08:00
Bonian Chen
2a1344a50e [Settings] Code Refactor - ActiveSubsciptionsListener 
Fix the spelling with "ActiveSubsciptionsListener" into "ActiveSubscriptionsListener".

Bug: 191321218
Test: build pass
Change-Id: I7282c7ba9fbb793056c12928843b6eef59eb2213
 2021-06-23 07:34:00 +00:00
TreeHugger Robot
b1098f023f Merge "Fix missing share context option in settings app" into sc-dev am: 60b63d549a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14957028

Change-Id: Ic3689b50c773bb34fe97650ad6418b848c05ae37
 2021-06-23 06:24:36 +00:00
TreeHugger Robot
60b63d549a Merge "Fix missing share context option in settings app" into sc-dev 2021-06-23 03:47:39 +00:00
Weng Su
ebcfa17353 Fix the NPE issue 
Bug: 190938633
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I249d701abfa79872a331c071116d2db0bfdcced6
 2021-06-22 18:20:55 +08:00
TreeHugger Robot
3909722588 Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682

Change-Id: I51bebf3bb069e00aa7628d395d3d6c264e7ff544
 2021-06-21 10:13:46 +00:00
TreeHugger Robot
dbaad0436d Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev 2021-06-21 10:00:14 +00:00
Yi-Ling Chuang
c55b2cef2a Revert "Suppress Shared Axis transition on the SIM dialog" 
This reverts commit 5e8a3947d2.

Reason for revert: <b/191335572>

Bug: 191335572
Change-Id: I0d4756797914ac5bcb37dde31e80dc4cd45fcd6b
 2021-06-21 09:32:01 +00:00
SongFerng Wang
3bfb649c29 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: I572b167d39ebce9442821578c048ad6c9ddb5b06
 2021-06-18 09:49:10 +00:00
SongFerng Wang
7e4b664df0 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev 2021-06-18 09:38:18 +00:00
TreeHugger Robot
56be44e4b9 Merge "Add a loading progress timeout mechanism to Internet Settings" into sc-dev am: 0781c52dfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016144

Change-Id: I102131cb18a9538c5ee5e17deda7336f899af1f3
 2021-06-18 08:18:15 +00:00
TreeHugger Robot
0781c52dfe Merge "Add a loading progress timeout mechanism to Internet Settings" into sc-dev 2021-06-18 08:08:19 +00:00
SongFerngWang
c9a9faf5b8 Add the confirmation dialog when user disable mobile data at first time 
Bug: 189983549
Test: atest ProviderModelSliceTest
Change-Id: I83fcadb07e4f8dff5d07bc4015c0c6004c4f5de5
 2021-06-18 15:58:58 +08:00
Weng Su
98cf86b367 Add a loading progress timeout mechanism to Internet Settings 
- The WiFi scan results may not be called back, need to add loading
progress timeout to avoid loading forever

Bug: 191336310
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I71071e7e68007cf7e16be46230eec3b01f4d2b45
 2021-06-18 13:43:14 +08:00
Tom Hsu
d332493def Merge "[Settings] Prevent crash from abnormal behavior." into sc-dev am: 0279a99e43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980880

Change-Id: If5720ff1bd460f7a311a5c87d0366282a51cf8fc
 2021-06-17 11:33:21 +00:00