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

Merge "Misc string updates"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-05 18:02:27 +00:00
committed by Android (Google) Code Review
parent e50f314cbf b2b6f7d20e
commit e3a6a8dbae
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/datausage/BillingCycleSettings.java
View File

@@ -101,7 +101,7 @@ public class BillingCycleSettings extends DataUsageBase implements
private void updatePrefs() {
NetworkPolicy policy = services.mPolicyEditor.getPolicy(mNetworkTemplate);
mBillingCycle.setSummary(getString(R.string.billing_cycle_summary, policy != null ?
mBillingCycle.setSummary(getString(R.string.billing_cycle_fragment_summary, policy != null ?
policy.cycleDay : 1));
if (policy != null && policy.warningBytes != WARNING_DISABLED) {
mDataWarning.setSummary(Formatter.formatFileSize(getContext(), policy.warningBytes));

9
src/com/android/settings/display/DensityPreference.java
View File

@@ -16,6 +16,7 @@ package com.android.settings.display;
import android.content.Context;
import android.content.res.Resources;
import android.text.BidiFormatter;
import android.text.InputType;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
@@ -23,10 +24,13 @@ import android.util.Slog;
import android.view.Display;
import android.view.View;
import android.widget.EditText;
import com.android.settings.CustomEditTextPreference;
import com.android.settings.R;
import com.android.settingslib.display.DisplayDensityUtils;
import java.text.NumberFormat;
public class DensityPreference extends CustomEditTextPreference {
private static final String TAG = "DensityPreference";
@@ -37,8 +41,9 @@ public class DensityPreference extends CustomEditTextPreference {
@Override
public void onAttached() {
super.onAttached();
setSummary(getContext().getString(R.string.developer_density_summary, getCurrentSwDp()));
final CharSequence dpValue = BidiFormatter.getInstance()
.unicodeWrap(NumberFormat.getInstance().format(getCurrentSwDp()));
setSummary(getContext().getString(R.string.density_pixel_summary,dpValue));
}
private int getCurrentSwDp() {