Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c5af54a authored by Fan Zhang's avatar Fan Zhang
Browse files

Get rid of extra whitespace under divider lines 

Change-Id: Iad5ec5771a61c6e12aaefbe5fe41d17f7f09de73
Fixes: 76116029
Test: visual
parent 6cc043ba

res/xml/power_usage_summary.xml

+32 −39
Original line number Diff line number Diff line
@@ -30,15 +30,13 @@ 
        android:key="battery_tip"

        android:layout="@layout/preference_category_no_title" />



    <PreferenceCategory

        android:key="power_management">



    <Preference

        android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings"

        android:key="battery_saver_summary"

        android:title="@string/battery_saver"

        settings:controller="com.android.settings.fuelgauge.BatterySaverController"

            settings:platform_slice="true"/>

        settings:platform_slice="true"

        settings:allowDividerAbove="true" />



    <Preference

        android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
@@ -51,21 +49,16 @@ 
        android:title="@string/battery_percentage"

        android:summary="@string/battery_percentage_description" />



    </PreferenceCategory>



    <PreferenceCategory

        android:key="device_usage_list">



    <com.android.settings.fuelgauge.PowerGaugePreference

        android:key="last_full_charge"

        android:title="@string/battery_last_full_charge"

            android:selectable="false"/>

        android:selectable="false"

        settings:allowDividerAbove="true" />



    <com.android.settings.fuelgauge.PowerGaugePreference

        android:key="screen_usage"

        android:title="@string/device_screen_usage"

        android:selectable="false" />



    </PreferenceCategory>



</PreferenceScreen>

src/com/android/settings/SelectableEditTextPreference.java

deleted100644 → 0
+0 −71
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings;



import android.content.Context;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.view.View;

import android.widget.EditText;



import com.android.settingslib.CustomEditTextPreference;



public class SelectableEditTextPreference extends CustomEditTextPreference {



    private int mSelectionMode;



    public static final int SELECTION_CURSOR_END   = 0;

    public static final int SELECTION_CURSOR_START = 1;

    public static final int SELECTION_SELECT_ALL   = 2;



    public SelectableEditTextPreference(Context context, AttributeSet attrs) {

        super(context, attrs);

    }



    /**

     * Sets the selection mode for the text when it shows up in the dialog

     * @hide

     * @param selectionMode can be SELECTION_CURSOR_START, SELECTION_CURSOR_END or

     * SELECTION_SELECT_ALL. Default is SELECTION_CURSOR_END

     */

    public void setInitialSelectionMode(int selectionMode) {

        mSelectionMode = selectionMode;

    }



    @Override

    protected void onBindDialogView(View view) {

        super.onBindDialogView(view);



        EditText editText = getEditText();

        // Set the selection based on the mSelectionMode

        int length = editText.getText() != null ? editText.getText().length() : 0;

        if (!TextUtils.isEmpty(editText.getText())) {

            switch (mSelectionMode) {

            case SELECTION_CURSOR_END:

                editText.setSelection(length);

                break;

            case SELECTION_CURSOR_START:

                editText.setSelection(0);

                break;

            case SELECTION_SELECT_ALL:

                editText.setSelection(0, length);

                break;

            }

        }

    }

}