Merge "Update Preference style" into sc-dev

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:orientation="horizontal"

    android:paddingStart="@dimen/preference_no_icon_padding_start"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

    <TextView

        <item name="android:windowIsFloating">true</item>

    </style>

    <style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings" />

    <style name="Theme.Settings" parent="Theme.SettingsBase">

        <item name="preferenceTheme">@style/PreferenceTheme</item>

        <item name="android:clipToPadding">false</item>

        <item name="android:clipChildren">false</item>

        <item name="android:listPreferredItemHeight">72dip</item>

        super(context, attrs);

        setLayoutResource(R.layout.accessibility_shortcut_secondary_action);

        setWidgetLayoutResource(R.layout.preference_widget_primary_switch);

        setIconSpaceReserved(true);

        setIconSpaceReserved(false);

    }

    @Override

        // Show the "Settings" menu as if it were a preference screen.

        mSettingsPreference = new Preference(getPrefContext());

        mSettingsPreference.setTitle(mSettingsTitle);

        mSettingsPreference.setIconSpaceReserved(true);

        mSettingsPreference.setIconSpaceReserved(false);

        mSettingsPreference.setIntent(mSettingsIntent);

        final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);