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

More code cleaning (missing items)

Browse Source 
- corrected the missed "switch_" variable naming
- optimize imports more

Change-Id: I8501c99d65e91f26fc56f589e02a1fd1be3d81a3
This commit is contained in:
Fabrice Di Meglio
2014-01-14 16:32:10 -08:00
parent ad38a88b95
commit a3d0158ff6
1 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/com/android/settings/Settings.java
View File

@@ -25,7 +25,6 @@ import android.app.Dialog;
import android.app.DialogFragment; import android.app.DialogFragment;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
@@ -722,12 +721,12 @@ public class Settings extends PreferenceActivity
private DevicePolicyManager mDevicePolicyManager; private DevicePolicyManager mDevicePolicyManager;
private static class HeaderViewHolder { private static class HeaderViewHolder {
ImageView icon; ImageView mIcon;
TextView title; TextView mTitle;
TextView summary; TextView mSummary;
Switch switch_; Switch mSwitch;
ImageButton button; ImageButton mButton;
View divider; View mDivider;
} }
private LayoutInflater mInflater; private LayoutInflater mInflater;
@@ -797,40 +796,40 @@ public class Settings extends PreferenceActivity
case HEADER_TYPE_CATEGORY: case HEADER_TYPE_CATEGORY:
view = new TextView(getContext(), null, view = new TextView(getContext(), null,
android.R.attr.listSeparatorTextViewStyle); android.R.attr.listSeparatorTextViewStyle);
holder.title = (TextView) view; holder.mTitle = (TextView) view;
break; break;
case HEADER_TYPE_SWITCH: case HEADER_TYPE_SWITCH:
view = mInflater.inflate(R.layout.preference_header_switch_item, parent, view = mInflater.inflate(R.layout.preference_header_switch_item, parent,
false); false);
holder.icon = (ImageView) view.findViewById(R.id.icon); holder.mIcon = (ImageView) view.findViewById(R.id.icon);
holder.title = (TextView) holder.mTitle = (TextView)
view.findViewById(com.android.internal.R.id.title); view.findViewById(com.android.internal.R.id.title);
holder.summary = (TextView) holder.mSummary = (TextView)
view.findViewById(com.android.internal.R.id.summary); view.findViewById(com.android.internal.R.id.summary);
holder.switch_ = (Switch) view.findViewById(R.id.switchWidget); holder.mSwitch = (Switch) view.findViewById(R.id.switchWidget);
break; break;
case HEADER_TYPE_BUTTON: case HEADER_TYPE_BUTTON:
view = mInflater.inflate(R.layout.preference_header_button_item, parent, view = mInflater.inflate(R.layout.preference_header_button_item, parent,
false); false);
holder.icon = (ImageView) view.findViewById(R.id.icon); holder.mIcon = (ImageView) view.findViewById(R.id.icon);
holder.title = (TextView) holder.mTitle = (TextView)
view.findViewById(com.android.internal.R.id.title); view.findViewById(com.android.internal.R.id.title);
holder.summary = (TextView) holder.mSummary = (TextView)
view.findViewById(com.android.internal.R.id.summary); view.findViewById(com.android.internal.R.id.summary);
holder.button = (ImageButton) view.findViewById(R.id.buttonWidget); holder.mButton = (ImageButton) view.findViewById(R.id.buttonWidget);
holder.divider = view.findViewById(R.id.divider); holder.mDivider = view.findViewById(R.id.divider);
break; break;
case HEADER_TYPE_NORMAL: case HEADER_TYPE_NORMAL:
view = mInflater.inflate( view = mInflater.inflate(
R.layout.preference_header_item, parent, R.layout.preference_header_item, parent,
false); false);
holder.icon = (ImageView) view.findViewById(R.id.icon); holder.mIcon = (ImageView) view.findViewById(R.id.icon);
holder.title = (TextView) holder.mTitle = (TextView)
view.findViewById(com.android.internal.R.id.title); view.findViewById(com.android.internal.R.id.title);
holder.summary = (TextView) holder.mSummary = (TextView)
view.findViewById(com.android.internal.R.id.summary); view.findViewById(com.android.internal.R.id.summary);
break; break;
} }
@@ -843,15 +842,15 @@ public class Settings extends PreferenceActivity
// All view fields must be updated every time, because the view may be recycled // All view fields must be updated every time, because the view may be recycled
switch (headerType) { switch (headerType) {
case HEADER_TYPE_CATEGORY: case HEADER_TYPE_CATEGORY:
holder.title.setText(header.getTitle(getContext().getResources())); holder.mTitle.setText(header.getTitle(getContext().getResources()));
break; break;
case HEADER_TYPE_SWITCH: case HEADER_TYPE_SWITCH:
// Would need a different treatment if the main menu had more switches // Would need a different treatment if the main menu had more switches
if (header.id == R.id.wifi_settings) { if (header.id == R.id.wifi_settings) {
mWifiEnabler.setSwitch(holder.switch_); mWifiEnabler.setSwitch(holder.mSwitch);
} else { } else {
mBluetoothEnabler.setSwitch(holder.switch_); mBluetoothEnabler.setSwitch(holder.mSwitch);
} }
updateCommonHeaderView(header, holder); updateCommonHeaderView(header, holder);
break; break;
@@ -860,16 +859,16 @@ public class Settings extends PreferenceActivity
if (header.id == R.id.security_settings) { if (header.id == R.id.security_settings) {
boolean hasCert = DevicePolicyManager.hasAnyCaCertsInstalled(); boolean hasCert = DevicePolicyManager.hasAnyCaCertsInstalled();
if (hasCert) { if (hasCert) {
holder.button.setVisibility(View.VISIBLE); holder.mButton.setVisibility(View.VISIBLE);
holder.divider.setVisibility(View.VISIBLE); holder.mDivider.setVisibility(View.VISIBLE);
boolean isManaged = mDevicePolicyManager.getDeviceOwner() != null; boolean isManaged = mDevicePolicyManager.getDeviceOwner() != null;
if (isManaged) { if (isManaged) {
holder.button.setImageResource(R.drawable.ic_settings_about); holder.mButton.setImageResource(R.drawable.ic_settings_about);
} else { } else {
holder.button.setImageResource( holder.mButton.setImageResource(
android.R.drawable.stat_notify_error); android.R.drawable.stat_notify_error);
} }
holder.button.setOnClickListener(new OnClickListener() { holder.mButton.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Intent intent = new Intent( Intent intent = new Intent(
@@ -878,8 +877,8 @@ public class Settings extends PreferenceActivity
} }
}); });
} else { } else {
holder.button.setVisibility(View.GONE); holder.mButton.setVisibility(View.GONE);
holder.divider.setVisibility(View.GONE); holder.mDivider.setVisibility(View.GONE);
} }
} }
updateCommonHeaderView(header, holder); updateCommonHeaderView(header, holder);
@@ -901,25 +900,25 @@ public class Settings extends PreferenceActivity
Drawable icon = mAuthHelper.getDrawableForType(getContext(), accType); Drawable icon = mAuthHelper.getDrawableForType(getContext(), accType);
setHeaderIcon(holder, icon); setHeaderIcon(holder, icon);
} else { } else {
holder.icon.setImageResource(header.iconRes); holder.mIcon.setImageResource(header.iconRes);
} }
holder.title.setText(header.getTitle(getContext().getResources())); holder.mTitle.setText(header.getTitle(getContext().getResources()));
CharSequence summary = header.getSummary(getContext().getResources()); CharSequence summary = header.getSummary(getContext().getResources());
if (!TextUtils.isEmpty(summary)) { if (!TextUtils.isEmpty(summary)) {
holder.summary.setVisibility(View.VISIBLE); holder.mSummary.setVisibility(View.VISIBLE);
holder.summary.setText(summary); holder.mSummary.setText(summary);
} else { } else {
holder.summary.setVisibility(View.GONE); holder.mSummary.setVisibility(View.GONE);
} }
} }
private void setHeaderIcon(HeaderViewHolder holder, Drawable icon) { private void setHeaderIcon(HeaderViewHolder holder, Drawable icon) {
ViewGroup.LayoutParams lp = holder.icon.getLayoutParams(); ViewGroup.LayoutParams lp = holder.mIcon.getLayoutParams();
lp.width = getContext().getResources().getDimensionPixelSize( lp.width = getContext().getResources().getDimensionPixelSize(
R.dimen.header_icon_width); R.dimen.header_icon_width);
lp.height = lp.width; lp.height = lp.width;
holder.icon.setLayoutParams(lp); holder.mIcon.setLayoutParams(lp);
holder.icon.setImageDrawable(icon); holder.mIcon.setImageDrawable(icon);
} }
public void resume() { public void resume() {