PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Start Safety & regulatory manual with new task" into sc-v2-dev am: 0a942ab338

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895173

Change-Id: I8dbd4c80dd48d8592b43478f9c88f2dbe7d89389
This commit is contained in:
Yanting Yang
2021-10-05 03:51:22 +00:00
committed by Automerger Merge Worker
parent fd6589ab00 0a942ab338
commit 06b2992da4
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/xml/my_device_info.xml
View File

@@ -84,9 +84,7 @@
<Preference
android:key="safety_info"
android:order="17"
android:title="@string/safety_and_regulatory_info">
<intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
</Preference>
android:title="@string/safety_and_regulatory_info"/>
</PreferenceCategory>
<PreferenceCategory

15
src/com/android/settings/deviceinfo/SafetyInfoPreferenceController.java
View File

@@ -18,6 +18,9 @@ package com.android.settings.deviceinfo;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.text.TextUtils;
import androidx.preference.Preference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -44,4 +47,16 @@ public class SafetyInfoPreferenceController extends AbstractPreferenceController
public String getPreferenceKey() {
return "safety_info";
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
return false;
}
final Intent intent = new Intent(INTENT_PROBE);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mContext.startActivity(intent);
return true;
}
}