Merge "Fix Switches padding for Settings app"

This commit is contained in:
Fabrice Di Meglio
2013-01-17 16:33:25 +00:00
committed by Android (Google) Code Review
10 changed files with 11 additions and 11 deletions

View File

@@ -1024,7 +1024,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
ToggleSwitch toggleSwitch = new ToggleSwitch(activity);
final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
toggleSwitch.setPadding(0, 0, padding, 0);
toggleSwitch.setPaddingRelative(0, 0, padding, 0);
activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
ActionBar.DISPLAY_SHOW_CUSTOM);
activity.getActionBar().setCustomView(toggleSwitch,

View File

@@ -335,7 +335,7 @@ public class DataUsageSummary extends Fragment {
if (mInsetSide > 0) {
// inset selector and divider drawables
insetListViewDrawables(mListView, mInsetSide);
mHeader.setPadding(mInsetSide, 0, mInsetSide, 0);
mHeader.setPaddingRelative(mInsetSide, 0, mInsetSide, 0);
}
{
@@ -1564,7 +1564,7 @@ public class DataUsageSummary extends Fragment {
R.layout.data_usage_item, parent, false);
if (mInsetSide > 0) {
convertView.setPadding(mInsetSide, 0, mInsetSide, 0);
convertView.setPaddingRelative(mInsetSide, 0, mInsetSide, 0);
}
}

View File

@@ -318,7 +318,7 @@ public class DevelopmentSettings extends PreferenceFragment
final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
mEnabledSwitch.setPadding(0, 0, padding, 0);
mEnabledSwitch.setPaddingRelative(0, 0, padding, 0);
mEnabledSwitch.setOnCheckedChangeListener(this);
}

View File

@@ -99,7 +99,7 @@ public class DreamSettings extends SettingsPreferenceFragment {
final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
mSwitch.setPadding(0, 0, padding, 0);
mSwitch.setPaddingRelative(0, 0, padding, 0);
activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
ActionBar.DISPLAY_SHOW_CUSTOM);
activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams(

View File

@@ -449,7 +449,7 @@ public class Utils {
com.android.internal.R.dimen.preference_fragment_padding_bottom);
final int effectivePaddingSide = ignoreSidePadding ? 0 : paddingSide;
list.setPadding(effectivePaddingSide, 0, effectivePaddingSide, paddingBottom);
list.setPaddingRelative(effectivePaddingSide, 0, effectivePaddingSide, paddingBottom);
}
}

View File

@@ -540,7 +540,7 @@ public class InstalledAppDetails extends Fragment
// Utility method to set applicaiton label and icon.
private void setAppLabelAndIcon(PackageInfo pkgInfo) {
final View appSnippet = mRootView.findViewById(R.id.app_snippet);
appSnippet.setPadding(0, appSnippet.getPaddingTop(), 0, appSnippet.getPaddingBottom());
appSnippet.setPaddingRelative(0, appSnippet.getPaddingTop(), 0, appSnippet.getPaddingBottom());
ImageView icon = (ImageView) appSnippet.findViewById(R.id.app_icon);
mState.ensureIcon(mAppEntry);

View File

@@ -119,7 +119,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment {
if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
actionBarSwitch.setPadding(0, 0, padding, 0);
actionBarSwitch.setPaddingRelative(0, 0, padding, 0);
activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
ActionBar.DISPLAY_SHOW_CUSTOM);
activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(

View File

@@ -52,7 +52,7 @@ public class AndroidBeam extends Fragment
if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
mActionBarSwitch.setPadding(0, 0, padding, 0);
mActionBarSwitch.setPaddingRelative(0, 0, padding, 0);
activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
ActionBar.DISPLAY_SHOW_CUSTOM);
activity.getActionBar().setCustomView(mActionBarSwitch, new ActionBar.LayoutParams(

View File

@@ -97,7 +97,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
mActionBarSwitch.setPadding(0, 0, padding, 0);
mActionBarSwitch.setPaddingRelative(0, 0, padding, 0);
activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
ActionBar.DISPLAY_SHOW_CUSTOM);
activity.getActionBar().setCustomView(mActionBarSwitch,

View File

@@ -379,7 +379,7 @@ public class WifiSettings extends SettingsPreferenceFragment
if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
actionBarSwitch.setPadding(0, 0, padding, 0);
actionBarSwitch.setPaddingRelative(0, 0, padding, 0);
activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
ActionBar.DISPLAY_SHOW_CUSTOM);
activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(