Commit Graph

41966 Commits

Author SHA1 Message Date
TreeHugger Robot
6d4c35933c Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev am: 468bad73d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15952458

Change-Id: I5d3ee4751264b436a3e1bc9d9ff7f90037a92102
2021-10-01 23:44:05 +00:00
TreeHugger Robot
468bad73d7 Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev 2021-10-01 23:26:52 +00:00
TreeHugger Robot
a9b0b5f659 Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev am: e750fb7528 am: 39fae9778c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15843434

Change-Id: If019d80c9d23c420824cff63e58035fd39f647fb
2021-10-01 18:24:26 +00:00
TreeHugger Robot
83c5600879 Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev am: e750fb7528
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15843434

Change-Id: Ie4441b828293a92208ba4b1bcd589fbd1d5e3f7e
2021-10-01 18:21:22 +00:00
TreeHugger Robot
39fae9778c Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev am: e750fb7528
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15843434

Change-Id: I0e708bc4dd419c72389dafb51dadb240fa8a79e7
2021-10-01 18:17:16 +00:00
TreeHugger Robot
e750fb7528 Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev 2021-10-01 18:15:58 +00:00
Weng Su
cabcecb2e8 [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
This reverts commit 199528d460.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: I5ed1782f1a35681ab6be4f74ea3156420b7dad5f
2021-10-01 15:06:20 +00:00
Bonian Chen
1eef718549 [Settings] Refactor MobileNetworkUtils
Code refactor MobileNetworkUtils
  - reorder the rule within #shouldDisplayNetworkSelectOptions()

Bug: 201757298
Test: presubmit pass
Change-Id: Idba39ca806263b850fa23aa8bb2dd423860bc043
2021-10-01 23:00:03 +08:00
Weng Su
f1f0353ed7 [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
This reverts commit 199528d460.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: I5ed1782f1a35681ab6be4f74ea3156420b7dad5f
2021-10-01 14:51:33 +00:00
Bonian Chen
b74ccf7f33 [Settings] Refactor MobileNetworkUtils
Code refactor MobileNetworkUtils
  - reduce number of accessing to isWorldMode()

Bug: 201757298
Test: presubmit pass
Change-Id: I710255887b5ba8038c3faf5471a88a02a15c015e
2021-10-01 13:32:57 +00:00
Bonian Chen
bc02a2d939 [Settings] Refactor MobileNetworkUtils
Code refactor MobileNetworkUtils
    - move isWorldMode() detection to the first line
      within shouldSpeciallyUpdateGsmCdma()

Bug: 201757298
Test: presubmit pass
Change-Id: Iccffca52b2e0e48ff62ec749c0cf3faa273b0e18
2021-10-01 11:18:36 +00:00
TreeHugger Robot
06d312f0af Merge "Punt battery status action when entering Settings main page" into sc-v2-dev am: 99554d3c34 am: d9195b80af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15938356

Change-Id: I3b030dd9ac65b93500814b62cae4ef48ceb3bc1b
2021-10-01 08:58:55 +00:00
TreeHugger Robot
d9195b80af Merge "Punt battery status action when entering Settings main page" into sc-v2-dev am: 99554d3c34
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15938356

Change-Id: I0c3c6b03e522c7320387253b0bd4546b6409b641
2021-10-01 08:43:07 +00:00
Yanting Yang
a9598c2f80 Start Safety & regulatory manual with new task
Based on the large screen design, Safety & regulatory manual should be
launched as a new task since it doesn’t fulfill the Settings UI design.
And it is not suitable to customize the background and font style with
Settings since the manual is provided by the legal team, we should keep
the content and style aligning with the server side.

Fixes: 197702066
Test: visual
Change-Id: Icaba237961cc774ed1bdca50d9095dc5409039e8
2021-10-01 16:42:59 +08:00
TreeHugger Robot
99554d3c34 Merge "Punt battery status action when entering Settings main page" into sc-v2-dev 2021-10-01 08:34:35 +00:00
Wesley.CW Wang
0cd29a70a4 Punt battery status action when entering Settings main page
- Checking battery sharing states at the beging may have some performance issue, post battery status update to background thread to avoid ANR

Bug: 193600924
Test: make SettingsRoboTests
Change-Id: I3b73e6bd4f952bc832783b9b3b5d45db560d088c
2021-10-01 15:15:25 +08:00
Sunny Shao
f25e8aa74c Add more info on the dialog of AllowBindAppWidgetActivity
- Show the label of the bound widget on the dialog of the AllowBindAppWidgetActivity.

Bug: 184676316
Test: manual test
Change-Id: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
Merged-In: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
(cherry picked from commit 1564ef5ca1)
2021-10-01 05:45:49 +00:00
TreeHugger Robot
68636fecf7 Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e am: 9a573b1942 am: f00be6bdfc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792

Change-Id: I7a1067e4d2c7ff8af697b9e65304f6cf7b34ba5d
2021-09-30 19:40:20 +00:00
TreeHugger Robot
a214347698 Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e am: cddd334ee6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792

Change-Id: I8c227ad10956e94c1feb3d019bafe88f65c4116a
2021-09-30 19:23:24 +00:00
TreeHugger Robot
f00be6bdfc Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e am: 9a573b1942
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792

Change-Id: Idd67e658def711bd9c63f24dfda05dedb989d795
2021-09-30 19:22:59 +00:00
TreeHugger Robot
4d966f38e4 Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e am: 0063fd58c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792

Change-Id: Ie3451fc541adf1d92f790de9a723748ab3aaa43c
2021-09-30 19:22:32 +00:00
TreeHugger Robot
cddd334ee6 Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792

Change-Id: Ia84dd48edcae481fb006b582e9e5c2274d2e86e7
2021-09-30 19:06:45 +00:00
TreeHugger Robot
9a573b1942 Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792

Change-Id: Id94319ec70f89a5f153d4e7f6db9ed2cba036997
2021-09-30 19:05:51 +00:00
TreeHugger Robot
a2e975064e Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev 2021-09-30 18:51:47 +00:00
TreeHugger Robot
7532914bb1 Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992 am: 0db131b42b am: a3272a14be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748

Change-Id: Ic404a67114e2f746a37ab44469aeafc705635eda
2021-09-30 12:47:30 +00:00
TreeHugger Robot
a3272a14be Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992 am: 0db131b42b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748

Change-Id: I56205568bc623b726ae074bdc421187c5bdb1c1e
2021-09-30 12:33:35 +00:00
TreeHugger Robot
0db131b42b Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748

Change-Id: I152a4223fbbf0ceaadfab992dc14bce46af763cd
2021-09-30 12:21:45 +00:00
TreeHugger Robot
b75781c7bc Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748

Change-Id: I4db07fe42154f484d9918096949427aa8569744d
2021-09-30 12:21:44 +00:00
TreeHugger Robot
7ba545d992 Merge "Fix USB tether option" into sc-qpr1-dev 2021-09-30 12:06:41 +00:00
Arc Wang
a6e71bdbfa Use startActivity for android.settings.APP_SEARCH_SETTINGS am: 407a725278 am: 6d6a1b136a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15939310

Change-Id: I460366fd2e6198a6290082d9268f87ba8be1a48c
2021-09-30 02:23:08 +00:00
Arc Wang
6d6a1b136a Use startActivity for android.settings.APP_SEARCH_SETTINGS am: 407a725278
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15939310

Change-Id: I3dda7d8dbaf171c8aafad18a86425af3205ef060
2021-09-30 02:06:25 +00:00
Arc Wang
407a725278 Use startActivity for android.settings.APP_SEARCH_SETTINGS
The Activity launched by android.settings.APP_SEARCH_SETTINGS
does not setResult. So it's no meaning to use
startActivityForResult for the Intent.

Bug: 196923591
Test: manual
      Settings -> Search settings -> search an item ->
      click back button twice and back to Settings home.
Change-Id: Ia760a301465bb87814326611a1ec2368887f120a
2021-09-30 01:52:48 +00:00
Tim Peng
9e1455492b Phone fails to switch channel mode from stereo to mono
-Set codec to SBC when HD audio is off

Bug: 194349060
Test: make -j50 RunSettingsRoboTests

Change-Id: Iae4aa3f1d77350f5b4d91e7a687e048091c1daea
Merged-In: Iae4aa3f1d77350f5b4d91e7a687e048091c1daea
(cherry picked from commit 1469626b4a)
2021-09-29 18:57:41 +00:00
TreeHugger Robot
b1e4442072 Merge "[Large screen] Disable/enable DeepLinkHomepageActivity" into sc-v2-dev am: 9a7d259341 am: cfb043298c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926635

Change-Id: Id7ea23b0404d0cf2e571fa4d98c1a86349659d41
2021-09-29 17:50:11 +00:00
TreeHugger Robot
cfb043298c Merge "[Large screen] Disable/enable DeepLinkHomepageActivity" into sc-v2-dev am: 9a7d259341
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926635

Change-Id: I0f2bcc51715a3829508539f2adab949efcd83a65
2021-09-29 17:36:57 +00:00
TreeHugger Robot
9a7d259341 Merge "[Large screen] Disable/enable DeepLinkHomepageActivity" into sc-v2-dev 2021-09-29 17:33:23 +00:00
TreeHugger Robot
dcd1683d1d Merge "Fix the summary format problem of the installed apps" into sc-v2-dev am: e65b3dae22 am: 9d3e4aba06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15939313

Change-Id: I400f5f0bce4d533b60568c299776b714181c2a4a
2021-09-29 13:27:43 +00:00
TreeHugger Robot
9d3e4aba06 Merge "Fix the summary format problem of the installed apps" into sc-v2-dev am: e65b3dae22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15939313

Change-Id: I0c0cdfb10b68a9776dd6a5f2db6157baecd76d09
2021-09-29 13:19:18 +00:00
Sunny Shao
256a65c467 Fix the summary format problem of the installed apps
- The summary of each installed apps in Opening links page is differnt
  with the summary of the Open by default in App info page.
- Let the format of the installed apps' summary is same as the Open
  by default.

Fixes: 193455965
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.applications.managedomainurls
Change-Id: Ifef4b27795300dc81c83ac1cc5063e8e22f54497
2021-09-29 19:21:17 +08:00
Arc Wang
54f619dfb8 [Large screen] Disable/enable DeepLinkHomepageActivity
This change enable/disable DeepLinkHomepageActivity according to
SplitController#isSplitSupported when receiving PRE_BOOT_COMPLETED.

PRE_BOOT_COMPLETED is an Intent which broadcasts once when the user
is booting after a system update.

Bug: 201236463
Bug: 201237323
Test: manual
      1. On a large screen device, Launcher -> Wallpaper & style
         Observe it uses intent ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK.
      2. On a small screen device, Launcher -> Wallpaper & style
         Observe it does NOT use intent ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK.
Change-Id: Icf6ab6d0cba38224c4b80276141d84a8468da760
2021-09-29 03:39:35 +00:00
YUKAI HUNG
185c1597d9 Merge "Invoke close() method for BatteryUsageStats to close cursor window" 2021-09-29 03:27:10 +00:00
TreeHugger Robot
f5d0a1e6b0 Merge "Do not update the previously connected devices for the sub device" 2021-09-29 01:40:22 +00:00
Xin Li
8aa74d1ad4 Merge SP1A.210812.016
Merged-In: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
Change-Id: Ib853137811901796f73e4d720accb3249a7db963
2021-09-28 19:39:58 +00:00
ykhung
454698d97e Invoke close() method for BatteryUsageStats to close cursor window
invoke close() method for BatteryUsageStats to close cursor window,
since BatteryUsageStats will implement "Closeable" interface in T.
(from Dimitri's request)

Bug: 201229421
Test: make SettingsRoboTests
Change-Id: Ibfca404d00cce51405cffddb636f685869ac130b
2021-09-29 00:44:11 +08:00
ykhung
96a8e63ebd [Robustness] protect get battery stats from DeadSystemException am: e893a890ca am: f63b2e08da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926630

Change-Id: I3730258d026f39fe0e31e080128d812231ca3e00
2021-09-28 11:48:53 +00:00
ykhung
f63b2e08da [Robustness] protect get battery stats from DeadSystemException am: e893a890ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926630

Change-Id: I3b7223abc84971b2d9051d2c777a37c85404985a
2021-09-28 11:33:46 +00:00
Alice Kuo
a6d549fee3 Do not update the previously connected devices for the sub device
As bluetooth turn on, and device reboot, UI will show the sub device
entry for hearing aid device or csip device. Check if the device is a sub device, do not update the cachedDevice information.

Bug: 150670922
Bug: 178981521
Test: bonded with a coordinated set. Check the UI only have one entry as Bluetooth turn on and device reboot.
Change-Id: I03dfdc25b57e614194fb8de2c9265edd50760d30
2021-09-28 10:25:06 +00:00
ykhung
e893a890ca [Robustness] protect get battery stats from DeadSystemException
Refine the original workaround patch in the ag/15527095 from NPE to
return default BatteryUsageStats instance as we merged in the
ag/15919139 (align the same solution).

Bug: 195306545
Test: make SettingsRoboTests
Change-Id: Ic03e8296d16ecb8629155f75727e9cde48c303eb
2021-09-28 10:00:50 +00:00
YUKAI HUNG
5e32dec664 Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919139

Change-Id: I92e32ec565c45d58b28c1430693f5fba11780844
2021-09-28 07:30:26 +00:00
YUKAI HUNG
4f513d7237 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: Icdc5d87aa5f41ab32fc546d0bd513d505bcebd51
2021-09-28 07:30:13 +00:00