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

Change-Id: Id0fc26c1bec4dd87b3ea5b5eda8a207465074461
This commit is contained in:
Paul Chang
2020-05-27 05:16:21 +00:00
committed by Automerger Merge Worker

View File

@@ -29,6 +29,7 @@ import android.content.pm.UserInfo;
import android.os.UserHandle;
import android.util.Log;
import android.util.Pair;
import android.view.View;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
@@ -38,7 +39,9 @@ import com.android.settings.Utils;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.RadioButtonPreference;
import java.util.ArrayList;
import java.util.List;
@@ -164,6 +167,14 @@ public class BugReportHandlerPicker extends DefaultAppPickerFragment {
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
DefaultAppInfo createDefaultAppInfo(Context context, PackageManager pm, int userId,
PackageItemInfo packageItemInfo) {