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

Commit 1cdbbb1e authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Changes to support new screen cast settings screen." into klp-dev

parents 45bf2815 75af1710

core/java/android/preference/Preference.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -1069,9 +1069,9 @@ public class Preference implements Comparable<Preference> { 
     * @return 0 if the same; less than 0 if this Preference sorts ahead of <var>another</var>;

     * @return 0 if the same; less than 0 if this Preference sorts ahead of <var>another</var>;

     *          greater than 0 if this Preference sorts after <var>another</var>.

     *          greater than 0 if this Preference sorts after <var>another</var>.

     */

     */

    @Override

    public int compareTo(Preference another) {

    public int compareTo(Preference another) {

        if (mOrder != DEFAULT_ORDER

        if (mOrder != another.mOrder) {

                || (mOrder == DEFAULT_ORDER && another.mOrder != DEFAULT_ORDER)) {

            // Do order comparison

            // Do order comparison

            return mOrder - another.mOrder;

            return mOrder - another.mOrder;

        } else if (mTitle == another.mTitle) {

        } else if (mTitle == another.mTitle) {

core/res/res/drawable-hdpi/ic_notify_wifidisplay.png

deleted100644 → 0
−941 B
Loading image diff...

core/res/res/drawable-mdpi/ic_notify_wifidisplay.png

deleted100644 → 0
−721 B
Loading image diff...

core/res/res/drawable-xhdpi/ic_notify_wifidisplay.png

deleted100644 → 0
−1.07 KiB
Loading image diff...

core/res/res/drawable-xxhdpi/ic_notify_wifidisplay.png

deleted100644 → 0
−1.39 KiB
Loading image diff...