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

Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33 am: 5cbb7a1eb7

Browse Source 
Change-Id: If217693ff6e0e0e72c3e899b5bfe86f1034fd106
This commit is contained in:
Paul Chang
2020-05-27 05:37:35 +00:00
committed by Automerger Merge Worker
parent 70067d5c8c 5cbb7a1eb7
commit ada3762118
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
View File

@@ -29,6 +29,7 @@ import android.content.pm.UserInfo;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.view.View;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -38,7 +39,9 @@ import com.android.settings.Utils;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment; import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.RadioButtonPreference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -164,6 +167,14 @@ public class BugReportHandlerPicker extends DefaultAppPickerFragment {
return SettingsEnums.SETTINGS_BUGREPORT_HANDLER; return SettingsEnums.SETTINGS_BUGREPORT_HANDLER;
} }
@Override
public void bindPreferenceExtra(RadioButtonPreference pref,
String key, CandidateInfo info, String defaultKey, String systemDefaultKey) {
super.bindPreferenceExtra(pref, key, info, defaultKey, systemDefaultKey);
pref.setAppendixVisibility(View.GONE);
}
@VisibleForTesting @VisibleForTesting
DefaultAppInfo createDefaultAppInfo(Context context, PackageManager pm, int userId, DefaultAppInfo createDefaultAppInfo(Context context, PackageManager pm, int userId,
PackageItemInfo packageItemInfo) { PackageItemInfo packageItemInfo) {