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

Commit da0a3f03 authored by Gilles Debunne's avatar Gilles Debunne
Browse files

Multi-line EditText background is set using a state. Step 2. 

See change 86347 for Step 1.

New state_multiline state flag, handled in TextView drawable background drawables.

Change-Id: I230df16c7ddee3296da180fd80ef341a4ac17dc0
parent b2316968

api/current.xml

+12 −1
Original line number Diff line number Diff line
@@ -9084,6 +9084,17 @@ 
 visibility="public"

>

</field>

<field name="state_multiline"

 type="int"

 transient="false"

 volatile="false"

 value="16843595"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="state_pressed"

 type="int"

 transient="false"
@@ -252110,7 +252121,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="arg0" type="T">

<parameter name="t" type="T">

</parameter>

</method>

</interface>

core/java/android/widget/TextView.java

+9 −1
Original line number Diff line number Diff line
@@ -4132,7 +4132,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


    @Override

    protected int[] onCreateDrawableState(int extraSpace) {

        final int[] drawableState = super.onCreateDrawableState(extraSpace);

        final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);



        if (!mSingleLine) {

            mergeDrawableStates(drawableState, MULTILINE_STATE_SET);

        }



        if (mTextIsSelectable) {

            // Disable pressed state, which was introduced when TextView was made clickable.

            // Prevents text color change.
@@ -4148,6 +4153,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                }

            }

        }



        return drawableState;

    }
@@ -9488,4 +9494,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    private static long sLastCutOrCopyTime;

    // Used to highlight a word when it is corrected by the IME

    private CorrectionHighlighter mCorrectionHighlighter;

    // New state used to change background based on whether this TextView is multiline.

    private static final int[] MULTILINE_STATE_SET = { R.attr.state_multiline };

}

core/res/res/drawable/edit_text_holo_dark.xml

+10 −1
Original line number Diff line number Diff line
@@ -15,10 +15,19 @@ 
-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">



    <item android:state_multiline="true" android:state_window_focused="false" android:state_enabled="true"  android:drawable="@drawable/textfield_multiline_default_holo_dark" />

    <item android:state_multiline="true" android:state_window_focused="false" android:state_enabled="false" android:drawable="@drawable/textfield_multiline_disabled_holo_dark" />

    <item android:state_multiline="true" android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/textfield_multiline_activated_holo_dark" />

    <item android:state_multiline="true" android:state_enabled="true" android:state_activated="true" android:drawable="@drawable/textfield_multiline_focused_holo_dark" />

    <item android:state_multiline="true" android:state_enabled="true" android:drawable="@drawable/textfield_multiline_default_holo_dark" />

    <item android:state_multiline="true" android:state_focused="true" android:drawable="@drawable/textfield_multiline_disabled_focused_holo_dark" />

    <item android:state_multiline="true" android:drawable="@drawable/textfield_multiline_disabled_holo_dark" />



    <item android:state_window_focused="false" android:state_enabled="true" android:drawable="@drawable/textfield_default_holo_dark" />

    <item android:state_window_focused="false" android:state_enabled="false" android:drawable="@drawable/textfield_disabled_holo_dark" />

    <item android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/textfield_activated_holo_dark" />

    <item android:state_enabled="true" android:state_activated="true" android:drawable="@drawable/textfield_focused_holo_dark" />

    <iten android:state_enabled="true" android:state_activated="true" android:drawable="@drawable/textfield_focused_holo_dark" />

    <item android:state_enabled="true" android:drawable="@drawable/textfield_default_holo_dark" />

    <item android:state_focused="true" android:drawable="@drawable/textfield_disabled_focused_holo_dark" />

    <item android:drawable="@drawable/textfield_disabled_holo_dark" />

core/res/res/drawable/edit_text_holo_light.xml

+9 −0
Original line number Diff line number Diff line
@@ -15,6 +15,15 @@ 
-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">



    <item android:state_multiline="true" android:state_window_focused="false" android:state_enabled="true"  android:drawable="@drawable/textfield_multiline_default_holo_light" />

    <item android:state_multiline="true" android:state_window_focused="false" android:state_enabled="false" android:drawable="@drawable/textfield_multiline_disabled_holo_light" />

    <item android:state_multiline="true" android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/textfield_multiline_activated_holo_light" />

    <item android:state_multiline="true" android:state_enabled="true" android:state_activated="true" android:drawable="@drawable/textfield_multiline_focused_holo_light" />

    <item android:state_multiline="true" android:state_enabled="true" android:drawable="@drawable/textfield_multiline_default_holo_light" />

    <item android:state_multiline="true" android:state_focused="true" android:drawable="@drawable/textfield_multiline_disabled_focused_holo_light" />

    <item android:state_multiline="true" android:drawable="@drawable/textfield_multiline_disabled_holo_light" />



    <item android:state_window_focused="false" android:state_enabled="true" android:drawable="@drawable/textfield_default_holo_light" />

    <item android:state_window_focused="false" android:state_enabled="false" android:drawable="@drawable/textfield_disabled_holo_light" />

    <item android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/textfield_activated_holo_light" />

core/res/res/drawable/edit_text_multiline_holo_dark.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2010 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.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_window_focused="false" android:state_enabled="true"  android:drawable="@drawable/textfield_multiline_default_holo_dark" />

    <item android:state_window_focused="false" android:state_enabled="false" android:drawable="@drawable/textfield_multiline_disabled_holo_dark" />

    <item android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/textfield_multiline_activated_holo_dark" />

    <item android:state_enabled="true" android:state_activated="true" android:drawable="@drawable/textfield_multiline_focused_holo_dark" />

    <item android:state_enabled="true" android:drawable="@drawable/textfield_multiline_default_holo_dark" />

    <item android:state_focused="true" android:drawable="@drawable/textfield_multiline_disabled_focused_holo_dark" />

    <item android:drawable="@drawable/textfield_multiline_disabled_holo_dark" />

</selector>