Fix references to resources for Settings
Bug: 293810334 Test: m Settings Change-Id: Ie140278f492ef7e1c062ec1ecae2866c521a86aa
This commit is contained in:
@@ -73,7 +73,7 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
|
||||
mAppName = itemView.findViewById(android.R.id.title);
|
||||
mAppIcon = itemView.findViewById(android.R.id.icon);
|
||||
mSummary = itemView.findViewById(android.R.id.summary);
|
||||
mDisabled = itemView.findViewById(R.id.appendix);
|
||||
mDisabled = itemView.findViewById(com.android.settingslib.widget.R.id.appendix);
|
||||
mSwitch = itemView.findViewById(R.id.switchWidget);
|
||||
mWidgetContainer = itemView.findViewById(android.R.id.widget_frame);
|
||||
mAddIcon = itemView.findViewById(R.id.add_preference_widget);
|
||||
@@ -86,7 +86,7 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
static View newView(ViewGroup parent, boolean twoTarget, int listType) {
|
||||
ViewGroup view = (ViewGroup) LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.preference_app, parent, false);
|
||||
.inflate(com.android.settingslib.widget.R.layout.preference_app, parent, false);
|
||||
ViewGroup widgetFrame = view.findViewById(android.R.id.widget_frame);
|
||||
if (twoTarget) {
|
||||
if (widgetFrame != null) {
|
||||
@@ -98,7 +98,8 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
|
||||
.inflate(R.layout.preference_widget_primary_switch, widgetFrame, true);
|
||||
}
|
||||
View divider = LayoutInflater.from(parent.getContext()).inflate(
|
||||
R.layout.preference_two_target_divider, view, false);
|
||||
com.android.settingslib.widget.R.layout.preference_two_target_divider,
|
||||
view, false);
|
||||
// second to last, before widget frame
|
||||
view.addView(divider, view.getChildCount() - 1);
|
||||
}
|
||||
@@ -110,7 +111,8 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
static View newHeader(ViewGroup parent, int resText) {
|
||||
ViewGroup view = (ViewGroup) LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.preference_app_header, parent, false);
|
||||
.inflate(com.android.settingslib.widget.R.layout.preference_app_header,
|
||||
parent, false);
|
||||
TextView textView = view.findViewById(R.id.apps_top_intro_text);
|
||||
textView.setText(resText);
|
||||
return view;
|
||||
@@ -183,7 +185,7 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
|
||||
} else if (!info.enabled || info.enabledSetting
|
||||
== PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED) {
|
||||
mDisabled.setVisibility(View.VISIBLE);
|
||||
mDisabled.setText(R.string.disabled);
|
||||
mDisabled.setText(com.android.settingslib.R.string.disabled);
|
||||
} else {
|
||||
mDisabled.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user