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

Commit 7c79a49d authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 9e564903 on remote branch 

Change-Id: I329d327b5700edb3614b6c9a491e5e8e6d40783c
parents 7cc51a46 9e564903

core/java/android/widget/AbsListView.java

+7 −0
Original line number Diff line number Diff line
@@ -2166,6 +2166,13 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
        // TODO: Move somewhere sane. This doesn't belong in onLayout().

        if (mFastScroll != null) {

            mFastScroll.onItemCountChanged(getChildCount(), mItemCount);

            //This may call internalSetPadding and cause children dirty.

            //So need to layout children again.

            if(isLayoutRequested()){

                mInLayout = true;

                layoutChildren();

                mInLayout = false;

            }

        }

    }

core/java/com/android/internal/util/StateMachine.java

+16 −0
Original line number Diff line number Diff line
@@ -1921,6 +1921,22 @@ public class StateMachine { 
        return false;

    }



    /**

     * Check if there are any pending messages with code 'what' in deferred messages queue.

     */

    protected final boolean hasDeferredMessages(int what, Object obj) {

        SmHandler smh = mSmHandler;

        if (smh == null) return false;



        Iterator<Message> iterator = smh.mDeferredMessages.iterator();

        while (iterator.hasNext()) {

            Message msg = iterator.next();

            if ((msg.what == what) && (msg.obj == obj)) return true;

        }



        return false;

    }



    /**

     * Check if there are any pending posts of messages with code 'what' in

     * the message queue. This does NOT check messages in deferred message queue.

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -2558,6 +2558,7 @@ 
        <item>China Mobile</item>

        <item>China Unicom</item>

        <item>China Telecom</item>

        <item>CHN-CT</item>

        <item>中国移动</item>

        <item>中国联通</item>

        <item>中国电信</item>
@@ -2574,6 +2575,7 @@ 
        <item>China_Mobile</item>

        <item>China_Unicom</item>

        <item>China_Telecom</item>

        <item>China_Telecom</item>

        <item>China_Mobile</item>

        <item>China_Unicom</item>

        <item>China_Telecom</item>

core/res/res/values/customize.xml

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
    <!-- custom date format or not  -->

    <bool name="config_dateformat">false</bool>



    <bool name="config_usb_data_unlock">false</bool>

    <!-- Used in LocalePicker, default language must be contained -->

    <string name="locale_codes" translatable="false"></string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2734,4 +2734,5 @@ 
  <java-symbol type="string" name="power_key_emergency_number" />

  <java-symbol type="integer" name="power_key_hits_emergency" />

  <java-symbol type="bool" name="config_emergencyCallOnPowerkeyTapGestureEnabled" />

  <java-symbol type="bool" name="config_usb_data_unlock" />

</resources>