Clean up unneded includes and fix logic for display output to include fitscreen text

diff --git a/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/BookmarkBase.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/BookmarkBase.java
index 87a65dd..8db15b8 100644 (file)
--- a/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/BookmarkBase.java
+++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/BookmarkBase.java
@@ -10,8 +10,6 @@
 package com.freerdp.freerdpcore.domain;
 
 import com.freerdp.freerdpcore.application.GlobalApp;
-import com.freerdp.freerdpcore.application.GlobalSettings;
-import com.freerdp.freerdpcore.R;
 
 import android.content.SharedPreferences;
 import android.os.Parcel;

diff --git a/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/BookmarkActivity.java b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/BookmarkActivity.java
index 33e6a33..ca5b8f4 100644 (file)
--- a/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/BookmarkActivity.java
+++ b/client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/presentation/BookmarkActivity.java
@@ -343,10 +343,17 @@ public class BookmarkActivity extends PreferenceActivity implements OnSharedPref
                else if (key.equals("bookmark.resolution") || key.equals("bookmark.colors") || key.equals("bookmark.width") || key.equals("bookmark.height"))
                {
                        String resolution = sharedPreferences.getString("bookmark.resolution", "800x600");
-                       if (resolution.equals("automatic"))
+                       //compare english string from resolutions_values_array array, decode to localized
+                       //text for display
+                       if (resolution.equals("automatic")) {
                                resolution = getResources().getString(R.string.resolution_automatic);
-                       else if (resolution.equals("custom"))
+                       }
+                       if (resolution.equals("custom")) {
                                resolution = getResources().getString(R.string.resolution_custom);
+                       }
+                       if (resolution.equals("fitscreen")) {
+                               resolution = getResources().getString(R.string.resolution_fit);
+                       }
                        resolution += "@" + sharedPreferences.getInt("bookmark.colors", 16);
                        findPreference("bookmark.screen").setSummary(resolution);                                               
                }