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

Commit 02b77575 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 1cdbbb1e: Merge "Changes to support new screen cast settings screen." into klp-dev 

* commit '1cdbbb1e':
  Changes to support new screen cast settings screen.
parents 86b06976 1cdbbb1e

core/java/android/preference/Preference.java

+3 −3
Original line number 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>;

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

     */

    @Override

    public int compareTo(Preference another) {

        if (mOrder != DEFAULT_ORDER

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

        if (mOrder != another.mOrder) {

            // Do order comparison

            return mOrder - another.mOrder;

        } 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...