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

Fix references to resources for Settings

Browse Source 
Bug: 293810334
Test: m Settings
Change-Id: Ie140278f492ef7e1c062ec1ecae2866c521a86aa
This commit is contained in:
Chaohui Wang
2023-07-31 15:56:42 +08:00
parent ed505c25fa
commit 2541381259
247 changed files with 859 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/widget/AppCheckBoxPreference.java
View File

@@ -25,27 +25,26 @@ import android.widget.LinearLayout;
import androidx.preference.CheckBoxPreference;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
/**
* {@link CheckBoxPreference} that used only to display app
*/
public class AppCheckBoxPreference extends CheckBoxPreference {
public AppCheckBoxPreference(Context context, AttributeSet attrs) {
super(context, attrs);
setLayoutResource(R.layout.preference_app);
setLayoutResource(com.android.settingslib.widget.R.layout.preference_app);
}
public AppCheckBoxPreference(Context context) {
super(context);
setLayoutResource(R.layout.preference_app);
setLayoutResource(com.android.settingslib.widget.R.layout.preference_app);
}
@Override
public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
final LinearLayout layout = (LinearLayout) holder.findViewById(R.id.summary_container);
final LinearLayout layout = (LinearLayout) holder
.findViewById(com.android.settingslib.widget.R.id.summary_container);
if (layout != null) {
// If summary doesn't exist, make it gone
layout.setVisibility(TextUtils.isEmpty(getSummary()) ? View.GONE : View.VISIBLE);

4
src/com/android/settings/widget/BottomLabelLayout.java
View File

@@ -25,8 +25,6 @@ import android.widget.LinearLayout;
import androidx.annotation.VisibleForTesting;
import com.android.settingslib.R;
/**
* An extension of LinearLayout that automatically switches to vertical
* orientation when it can't fit its child views horizontally.
@@ -85,7 +83,7 @@ public class BottomLabelLayout extends LinearLayout {
setOrientation(stacked ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL);
setGravity(stacked ? Gravity.START : Gravity.BOTTOM);
final View spacer = findViewById(R.id.spacer);
final View spacer = findViewById(com.android.settings.R.id.spacer);
if (spacer != null) {
spacer.setVisibility(stacked ? View.GONE : View.VISIBLE);
}

10
src/com/android/settings/widget/EntityHeaderController.java
View File

@@ -116,7 +116,8 @@ public class EntityHeaderController {
mHeader = header;
} else {
mHeader = LayoutInflater.from(fragment.getContext())
.inflate(R.layout.settings_entity_header, null /* root */);
.inflate(com.android.settingslib.widget.R.layout.settings_entity_header,
null /* root */);
}
}
@@ -254,9 +255,9 @@ public class EntityHeaderController {
}
setText(R.id.entity_header_title, mLabel);
setText(R.id.entity_header_summary, mSummary);
setText(R.id.entity_header_second_summary, mSecondSummary);
setText(com.android.settingslib.widget.R.id.entity_header_second_summary, mSecondSummary);
if (mIsInstantApp) {
setText(R.id.install_type,
setText(com.android.settingslib.widget.R.id.install_type,
mHeader.getResources().getString(R.string.install_type_instant));
}
@@ -271,7 +272,8 @@ public class EntityHeaderController {
* Only binds entity header with button actions.
*/
public EntityHeaderController bindHeaderButtons() {
final View entityHeaderContent = mHeader.findViewById(R.id.entity_header_content);
final View entityHeaderContent = mHeader.findViewById(
com.android.settingslib.widget.R.id.entity_header_content);
final ImageButton button1 = mHeader.findViewById(android.R.id.button1);
final ImageButton button2 = mHeader.findViewById(android.R.id.button2);
bindAppInfoLink(entityHeaderContent);

3
src/com/android/settings/widget/SingleTargetGearPreference.java
View File

@@ -58,7 +58,8 @@ public class SingleTargetGearPreference extends Preference {
@Override
public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
final View divider = holder.findViewById(com.android.settingslib.R.id.two_target_divider);
final View divider = holder.findViewById(
com.android.settingslib.widget.R.id.two_target_divider);
if (divider != null) {
divider.setVisibility(View.INVISIBLE);
}

15
src/com/android/settings/widget/UsageGraph.java
View File

@@ -84,17 +84,21 @@ public class UsageGraph extends View {
mLinePaint.setStrokeCap(Cap.ROUND);
mLinePaint.setStrokeJoin(Join.ROUND);
mLinePaint.setAntiAlias(true);
mCornerRadius = resources.getDimensionPixelSize(R.dimen.usage_graph_line_corner_radius);
mCornerRadius = resources.getDimensionPixelSize(
com.android.settingslib.R.dimen.usage_graph_line_corner_radius);
mLinePaint.setPathEffect(new CornerPathEffect(mCornerRadius));
mLinePaint.setStrokeWidth(resources.getDimensionPixelSize(R.dimen.usage_graph_line_width));
mLinePaint.setStrokeWidth(resources.getDimensionPixelSize(
com.android.settingslib.R.dimen.usage_graph_line_width));
mFillPaint = new Paint(mLinePaint);
mFillPaint.setStyle(Style.FILL);
mDottedPaint = new Paint(mLinePaint);
mDottedPaint.setStyle(Style.STROKE);
float dots = resources.getDimensionPixelSize(R.dimen.usage_graph_dot_size);
float interval = resources.getDimensionPixelSize(R.dimen.usage_graph_dot_interval);
float dots = resources.getDimensionPixelSize(
com.android.settingslib.R.dimen.usage_graph_dot_size);
float interval = resources.getDimensionPixelSize(
com.android.settingslib.R.dimen.usage_graph_dot_interval);
mDottedPaint.setStrokeWidth(dots * 3);
mDottedPaint.setPathEffect(new DashPathEffect(new float[] {dots, interval}, 0));
mDottedPaint.setColor(context.getColor(R.color.usage_graph_dots));
@@ -103,7 +107,8 @@ public class UsageGraph extends View {
context.getTheme().resolveAttribute(com.android.internal.R.attr.listDivider, v, true);
mDivider = context.getDrawable(v.resourceId);
mTintedDivider = context.getDrawable(v.resourceId);
mDividerSize = resources.getDimensionPixelSize(R.dimen.usage_graph_divider_size);
mDividerSize = resources.getDimensionPixelSize(
com.android.settingslib.R.dimen.usage_graph_divider_size);
}
void clearPaths() {