Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Neko: Sort the kitties\" into nyc-mr1-dev

Browse Source 
am: 7959250318

Change-Id: I80a7aece22ccd29ea8e3fee19f217958da4e1698
This commit is contained in:
Jason Monk
2016-07-19 14:39:14 +00:00
committed by android-build-merger
parent fd1e142b8a 7959250318
commit fafc4a768f
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/EasterEgg/src/com/android/egg/neko/NekoLand.java
View File

@@ -24,6 +24,7 @@ import android.content.DialogInterface.OnClickListener;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.media.MediaScannerConnection; import android.media.MediaScannerConnection;
import android.net.Uri; import android.net.Uri;
@@ -50,6 +51,9 @@ import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
public class NekoLand extends Activity implements PrefsListener { public class NekoLand extends Activity implements PrefsListener {
public static boolean DEBUG = false; public static boolean DEBUG = false;
@@ -98,7 +102,19 @@ public class NekoLand extends Activity implements PrefsListener {
cats[i] = Cat.create(this); cats[i] = Cat.create(this);
} }
} else { } else {
cats = mPrefs.getCats().toArray(new Cat[0]); final float[] hsv = new float[3];
List<Cat> list = mPrefs.getCats();
Collections.sort(list, new Comparator<Cat>() {
@Override
public int compare(Cat cat, Cat cat2) {
Color.colorToHSV(cat.getBodyColor(), hsv);
float bodyH1 = hsv[0];
Color.colorToHSV(cat2.getBodyColor(), hsv);
float bodyH2 = hsv[0];
return Float.compare(bodyH1, bodyH2);
}
});
cats = list.toArray(new Cat[0]);
} }
mAdapter.setCats(cats); mAdapter.setCats(cats);
return cats.length; return cats.length;