Added a new icon by NathanX, DPI and disable texture pack options in …

…the menu

ant.properties

@@ -15,5 +15,3 @@
 #  'key.alias' for the name of the key to use.
 # The password will be asked during the build when you use the 'release' target.
 
-key.store=androidreleasekey.keystore
-key.alias=androidreleasekey

res/values/strings.xml

@@ -30,6 +30,9 @@
     <string name="pref_zz_patch_ip_enable_summary">Redirects multiplayer connections to an online server</string>
     <string name="pref_zz_patch_ip">Server IP</string>
     <string name="pref_zz_patch_ip_summary">The IP address of the online server</string>
+    <string name="pref_zz_texture_pack_enable">Use texture pack</string>
+    <string name="pref_zz_custom_dpi">Custom DPI</string>
+    <string name="pref_zz_custom_dpi_summary">Change the reported screen density to change size of controls - leave blank to disable</string>
     <string name="texture_pack_unable_to_load">Unable to load texture pack.</string>
     <string name="nerdy_stuff_page">Nerdy stuff</string>
     <string name="dump_libminecraftpe">Dump libminecraftpe.so from memory</string>

res/xml/preferences.xml

@@ -44,6 +44,14 @@
         android:title="@string/pref_gfx_lowquality"
         android:summary="@string/pref_gfx_lowquality_summary"
         android:defaultValue="false"/>
+
+    <EditTextPreference
+        android:key="zz_custom_dpi"
+        android:title="@string/pref_zz_custom_dpi"
+        android:summary="@string/pref_zz_custom_dpi_summary"
+        android:inputType="numberDecimal"
+        android:defaultValue=""/>
+
     <CheckBoxPreference
         android:key="game_difficultypeaceful"
         android:title="@string/pref_game_difficultypeaceful"

src/com/mojang/minecraftpe/MainActivity.java

@@ -58,6 +58,8 @@ public class MainActivity extends NativeActivity
 
 	protected TexturePack texturePack;
 
+	protected TexturePack originalPack;
+
 	protected Context minecraftApkContext;
 
 	protected boolean fakePackage = false;
@@ -122,8 +124,9 @@ public void onCreate(Bundle savedInstanceState) {
 		setFakePackage(false);
 
 		try {
+			boolean loadTexturePack = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("zz_texture_pack_enable", false);
 			String filePath = getSharedPreferences(MainMenuOptionsActivity.PREFERENCES_NAME, 0).getString("texturePack", null);
-			if (filePath != null) {
+			if (loadTexturePack && filePath != null) {
 				File file = new File(filePath);
 				System.out.println("File!! " + file);
 				if (!file.exists()) {
@@ -141,7 +144,7 @@ public void onCreate(Bundle savedInstanceState) {
 			if (this.getPackageName().equals("com.mojang.minecraftpe")) {
 				minecraftApkContext = this;
 			} else {
-				minecraftApkContext = createPackageContext("com.mojang.minecraftpe", 0);
+				minecraftApkContext = createPackageContext("com.mojang.minecraftpe", Context.CONTEXT_IGNORE_SECURITY);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -414,7 +417,17 @@ public String[] getOptionStrings() {
 
 	public float getPixelsPerMillimeter() {
 		System.out.println("Pixels per mm");
-		return ((float) displayMetrics.densityDpi) / 25.4f ;
+		float val = ((float) displayMetrics.densityDpi) / 25.4f;
+		String custom = PreferenceManager.getDefaultSharedPreferences(this).getString("zz_custom_dpi", null);
+		if (custom != null && custom.length() > 0) {
+			try {
+				val = Float.parseFloat(custom) / 25.4f;
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		return val;
+
 	}
 
 	public String getPlatformStringVar(int a) {

src/net/zhuoweizhang/mcpelauncher/MainMenuOptionsActivity.java

@@ -27,6 +27,7 @@ public class MainMenuOptionsActivity extends PreferenceActivity implements Prefe
 	public static final int REQUEST_MANAGE_PATCHES = 6;
 
 	private Preference texturePackPreference;
+	private Preference texturePackEnablePreference;
 	private Preference managePatchesPreference;
 	private Preference safeModePreference;
 	private boolean needsRestart = false;
@@ -36,7 +37,9 @@ public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		addPreferencesFromResource(net.zhuoweizhang.mcpelauncher.R.xml.preferences);
 		texturePackPreference = findPreference("zz_texture_pack");
-		texturePackPreference.setOnPreferenceClickListener(this);
+		if (texturePackPreference != null) texturePackPreference.setOnPreferenceClickListener(this);
+		texturePackEnablePreference = findPreference("zz_texture_pack_enable");
+		if (texturePackEnablePreference != null) texturePackEnablePreference.setOnPreferenceClickListener(this);
 		managePatchesPreference = findPreference("zz_manage_patches");
 		managePatchesPreference.setOnPreferenceClickListener(this);
 		safeModePreference = findPreference("zz_safe_mode");
@@ -59,7 +62,7 @@ public boolean onPreferenceClick(Preference pref) {
 		} else if (pref == managePatchesPreference) {
 			managePatches();
 			return true;
-		} else if (pref == safeModePreference) {
+		} else if (pref == safeModePreference || pref == texturePackEnablePreference) {
 			needsRestart = true;
 			return false; //Don't eat it
 		}
@@ -94,7 +97,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 					} catch (Exception e) {
 						e.printStackTrace();
 					}
-					Toast.makeText(this, "Texture pack set! Restarting Minecraft to load texture pack...", Toast.LENGTH_LONG).show();
+					//Toast.makeText(this, "Texture pack set! Restarting Minecraft to load texture pack...", Toast.LENGTH_LONG).show();
 					finish();
 					restartFirstActivity();
 					//System.exit(0);