lucaslin
09bbb51d29
Replace the hidden API to public API or other alternatives
...
Some of connectivity related files are going to be a part of
mainline module, so the external callers cannot call its hidden
API.
Replace the hidden API to public API or other alternatives from
the callers side.
Bug: 182859030
Test: 1. Remove "framework-connectivity.impl"
2. atest SettingsUnitTests:InternetUpdaterTest
3. atest SettingsUnitTests:ProviderModelSliceHelperTest
4. atest SettingsUnitTests:MobileNetworkUtilsTest
5. make RunSettingsRoboTests \
ROBOTEST_FILTER=AppDataUsagePreferenceControllerTest
6. make RunSettingsRoboTests \
ROBOTEST_FILTER=TetherPreferenceControllerTest
7. make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDetailPreferenceController2Test
8. make RunSettingsRoboTests \
ROBOTEST_FILTER=ContextualWifiSliceTest
Change-Id: Idd1ca57d8f2790070e9c401936c5af2a05bcfe9d
2021-04-14 11:36:54 +00:00
lucaslin
4400038635
Remove the usage of hidden API and fix the test
...
- Network class will be inside mainline module, so the external
callers cannot call its hidden API. Remove the usage of hidden
API.
- The orignal test looks wrong because it shouldn't set the data
of intent, it should set the extra of intent instead. (Refer to
the design of ConnectivityService.java) Fix the test and remove
the @Ignore annotation.
- Add 2 new tests to cover the case of receiving unexpected network.
Bug: 182859030
Bug: 183920404
Test: 1. Remove "framework-connectivity.impl"
2. make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiNoInternetDialogTest
Change-Id: Ie48a1651629ad9c067728f667cdd91f2f0bccd07
2021-04-14 09:07:54 +00:00
Jeremy Goldman
8371ee713d
Update string for editing an insecure VPN.
...
The new string comes from the connectivity s strings document: https://screenshot.googleplex.com/9nQFc9PFwgCYCFV
Test: atest -c SettingsUnitTests
Bug: 176821216
Bug: 184921649
Change-Id: I76257a4a2c2b9d5a49248296676d98980be9d77c
Merged-In: I76257a4a2c2b9d5a49248296676d98980be9d77c
(cherry picked from commit ec4b612932
)
2021-04-12 06:21:27 +00:00
TreeHugger Robot
57a7c9b307
Merge "[Provider Model] Remove "Advanced" from Wi-Fi hotspot settings" into sc-dev
2021-04-12 04:38:07 +00:00
Weng Su
f53c4ca8ae
[Provider Model] Remove "Advanced" from Wi-Fi hotspot settings
...
- Screenshot:
https://screenshot.googleplex.com/B4vjvGdcQUL8YCR
Bug: 184907962
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest
Change-Id: I934061c9129e77fc37381d1eba4a8107d40131eb
2021-04-12 11:22:48 +08:00
SongFerng Wang
c7d2169120
Merge "The Network Select shows wrong operator name" into sc-dev
2021-04-12 02:45:52 +00:00
TreeHugger Robot
feb811053f
Merge "Modify Wi-Fi network details settings to restricted style" into sc-dev
2021-04-12 02:15:52 +00:00
ykhung
bdaee1431f
Send fake data if there is no battey consumption entry list
...
Sends fake data into SettingsIntelligence if there is no data in the
battery consumption list, otherwise we don't have battery level data to
draw into the chart graph. We should draw the battery levels if it is
full-charged without any BatteryEntry data.
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I759e769256f4aa0ec152afff5c265ee3d04c03da
2021-04-11 22:54:27 +08:00
YUKAI HUNG
c024ec7cc9
Merge "Display the chart levels data into BatteryHistoryPreference" into sc-dev
2021-04-10 22:32:27 +00:00
Wesley.CW Wang
f1ca264f69
Refine battery settings layout
...
- Add loading text to progress bar to prevent UI flaky
- Setup enable/disable state for battery saver switch
- Remove battery saver page divider
Bug: 177964551
Bug: 177964753
Bug: 184626649
Test: make SettingsRoboTests, visually
Change-Id: I8e05c0c0f02710729e1f59eff23fb3f425770de9
2021-04-10 17:39:14 +00:00
ykhung
40319d9d6f
Avoid drawing the invalid levels in the chart view
...
Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Id540f35044beabe4d56ab5ce3af63271ac356f49
2021-04-10 10:51:47 +00:00
ykhung
740ac9a047
Display the chart levels data into BatteryHistoryPreference
...
Bug: 184807417
Bug: 180607918
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I78718a59671ca6775abc725432fbfbec6c0993fe
2021-04-10 10:48:09 +00:00
Peter Wang
9b226a4ff0
[automerger skipped] Merge "Fix intent String for starting profile management page in Manifest" am: ae74222567
am: 108ee559ea
am: bc52992b42
-s ours
...
am skip reason: skip tag Change-Id I6c3f36f1dd99eb4b380dce7218f85757d350bc42 with SHA-1 93ce0688de
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1671969
Change-Id: I4c8c2737864b5db755da586036aa450d339c2f6d
2021-04-10 02:05:23 +00:00
Peter Wang
bc52992b42
Merge "Fix intent String for starting profile management page in Manifest" am: ae74222567
am: 108ee559ea
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1671969
Change-Id: I35ee9c8bc08d8cbbbac9d22d47aa75e3fcfcc4dd
2021-04-10 01:14:56 +00:00
Peter Wang
108ee559ea
Merge "Fix intent String for starting profile management page in Manifest" am: ae74222567
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1671969
Change-Id: I26d0d0be6943bfc691c9b2476dd32f98a5561d50
2021-04-09 23:26:07 +00:00
Suprabh Shukla
39086c24fd
Merge "Changes to "Alarms and Reminders" permission" into sc-dev
2021-04-09 22:27:50 +00:00
Peter Wang
ae74222567
Merge "Fix intent String for starting profile management page in Manifest"
2021-04-09 22:24:58 +00:00
Peter Wang
f40897d27e
Fix intent String for starting profile management page in Manifest
...
Bug: 170507492
Test: Local
Change-Id: I6c3f36f1dd99eb4b380dce7218f85757d350bc42
Merged-In: I6c3f36f1dd99eb4b380dce7218f85757d350bc42
2021-04-09 13:33:15 -07:00
Peter Wang
cd263f5535
Merge "Fix intent String for starting profile management page in Manifest" into sc-dev
2021-04-09 20:30:16 +00:00
TreeHugger Robot
8aa0b4a53c
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours am: c3edd0b379
-s ours am: 00e30fba67
-s ours am: be6b904ec5
-s ours am: 8ec57d3e30
-s ours am: 7ccc647d7b
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: Ibfb97d755fbe71a05787cb575600fc38b977f165
2021-04-09 20:29:46 +00:00
TreeHugger Robot
a6c5c629c1
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours am: c3edd0b379
-s ours am: 00e30fba67
-s ours am: be6b904ec5
-s ours am: fa9fd4f924
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: I31ee438d2f7425ccd1aa1d87640aabb53336eee7
2021-04-09 20:03:49 +00:00
TreeHugger Robot
7ccc647d7b
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours am: c3edd0b379
-s ours am: 00e30fba67
-s ours am: be6b904ec5
-s ours am: 8ec57d3e30
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: Id36ed926f501ab40049c3d76cef814958cf8dfa4
2021-04-09 19:34:39 +00:00
TreeHugger Robot
fa9fd4f924
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours am: c3edd0b379
-s ours am: 00e30fba67
-s ours am: be6b904ec5
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: Ia88db4d0b98ebbcd5c1114cf21673bbbd73a217b
2021-04-09 18:57:07 +00:00
TreeHugger Robot
8ec57d3e30
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours am: c3edd0b379
-s ours am: 00e30fba67
-s ours am: be6b904ec5
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: I92487706addaddda44613b00903c4dd5c862de3a
2021-04-09 18:52:26 +00:00
Peter Wang
93ce0688de
Fix intent String for starting profile management page in Manifest
...
Bug: 170507492
Test: Local
Change-Id: I6c3f36f1dd99eb4b380dce7218f85757d350bc42
2021-04-09 11:49:34 -07:00
TreeHugger Robot
be6b904ec5
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours am: c3edd0b379
-s ours am: 00e30fba67
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: I8dae5afba2b9b3ad00a1c7d8ec0d254abd706901
2021-04-09 18:10:21 +00:00
TreeHugger Robot
00e30fba67
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours am: c3edd0b379
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: I0f596d744078240f574e6f998cbb7dd9e8d09dfd
2021-04-09 17:27:01 +00:00
TreeHugger Robot
8974b83e8a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fe40f85cca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140499
Change-Id: Ib11f8983a69d3a8a731d829e8f6df6bacd71cf9a
2021-04-09 17:10:58 +00:00
TreeHugger Robot
c3edd0b379
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: Ie4514dfe4f245139b9733d903f8f36ed29af998c
2021-04-09 16:50:18 +00:00
Abel Tesfaye
473fffa318
Merge "Add warning message when camera privacy lock is enabled for screen attention settings" into sc-dev
2021-04-09 16:31:36 +00:00
Bill Yi
1282ff2016
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a160fbc8d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14141307
Change-Id: I4310dd5f6b780fe43504bf0784457bea5e2e49ad
2021-04-09 16:27:24 +00:00
Sally Yuen
550072d0fa
Merge "Get Extra Dim availability through ColorDisplayManager" into sc-dev
2021-04-09 16:21:32 +00:00
TreeHugger Robot
d2ee0db550
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev
2021-04-09 15:58:30 +00:00
TreeHugger Robot
fe40f85cca
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-09 15:46:04 +00:00
Weng Su
688fa772b9
Modify Wi-Fi network details settings to restricted style
...
- Show restricted text in guest mode
- Screenshot:
https://screenshot.googleplex.com/Q5tbzn67EJigpVJ
Bug: 177573895
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test
Change-Id: I64c8d82518d47c7f96802f505efa380c63b9e10c
2021-04-09 23:10:24 +08:00
Rubin Xu
2f03bda6a6
Merge "Update titles & messages for password enrolment flows" into sc-dev
2021-04-09 15:03:19 +00:00
Jason Chiu
fecc24cc53
Merge "Guard against NullPointerException when getActivity in PanelFragment" into sc-dev
2021-04-09 14:25:31 +00:00
Bill Yi
5a160fbc8d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I377d6f3d7f4af04a0cb9797fe95bff881b17e8b3
2021-04-09 06:59:47 -07:00
Rubin Xu
1ac05237ab
Update titles & messages for password enrolment flows
...
Show different titles and description messages when
enrolling password under various conditions:
* personal lock verus work lock
* adding a new lock versus updating existing lock
* enrolling a PIN verus password versus pattern
Add icons to options in screen lock picker.
Add an option to redirect to work lock flow if the admin
has set device-wide password requirement.
Bug: 183922696
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: I40417b113814659d3226a44eb7f9d553386e3c58
2021-04-09 14:35:36 +01:00
Bill Yi
a626332f65
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I422132510dd25b392386f53bc9e1a77c5b483bf1
2021-04-09 06:11:06 -07:00
SongFerngWang
5c2b140483
The Network Select shows wrong operator name
...
It get the empty subscriptionInfoList from
SubscriptionManager#getAccessibleSubscriptionInfoList, so the UI
shows default subId's operator.
Since this item appears, when sim is active, using
getActiveSubscriptionInfoList is enough.
- https://screenshot.googleplex.com/9aHtDVpnYQBsiQr
Bug: 182020952
Test: atest MobileNetworkUtilsTest
atest OpenNetworkSelectPagePreferenceControllerTest
Change-Id: I0d86ec41236a0d1be657ccd57fd0cf90f96b8b89
2021-04-09 12:07:00 +00:00
ykhung
cdd73e7fec
Add kill-switch to distinguish chart or non-chart design
...
Bug: 184807417
Bug: 180607918
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iacbb012209d552b58b774f90f5b0aeb60ce6d33d
2021-04-09 07:21:06 +00:00
Wesley Wang
57f27f7a30
Merge "Support help message when battery is unavailable(1/2)" into sc-dev
2021-04-09 04:43:06 +00:00
TreeHugger Robot
a586dc3a96
Merge "wifi settings: Fix incorrect maximum compativibility toggle behavior" into sc-dev
2021-04-09 04:33:36 +00:00
TreeHugger Robot
036a0c8877
Merge "Add icons to Manage location services and App location permissions" into sc-dev
2021-04-09 03:51:39 +00:00
Wesley.CW Wang
756028aadd
Support help message when battery is unavailable(1/2)
...
- Present help preference when battery is unavailable
Bug: 179237551
Test: make SettingsRoboTests
Change-Id: If6e82210d831123cb1169d53a18d24cb2c576b10
2021-04-09 11:24:51 +08:00
ykhung
318cc18f25
Add getBatteryHistory method to query data from SettingsIntelligence
...
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Idd640f8f8b07311fafc76f7b61c96c453ae7b604
2021-04-09 01:31:32 +00:00
Fan Zhang
b6e8a1ca22
Merge "Update emergency gesture settings string" into sc-dev
2021-04-08 23:42:34 +00:00
lesl
80af71b92c
wifi settings: Fix incorrect maximum compativibility toggle behavior
...
Correct behavior:
maximize_compatibility (enabled) 2.4 GHz Single AP
maximize_compatibility (disabled) 5 GHz Preferred Single AP
Bug: 184802466
Bug: 184802508
Test: Manual Test to check toggle behavior
Test: RunSettingsRoboTests
Test: atest -c WifiTetherMaximizeCompatibilityPreferenceControllerTest
Change-Id: I0e97455ea9cf62294b50514ce912ef66d274db8d
2021-04-09 07:29:59 +08:00
TreeHugger Robot
fa3ac98d3b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-08 21:33:55 +00:00