Rename Aspect Ratio option to Display Mode

- Display Mode has three items: Normal, Full, Zoom

Bug: 15503450
Change-Id: Ib01abfccfe4128f80754b948e2846bbc741f200a

14 files changed, 52 insertions, 56 deletions

diff --git a/res/drawable-hdpi/ic_tvoption_aspect.png b/res/drawable-hdpi/ic_tvoption_display_mode.png
index 05ea029b..05ea029b 100644
--- a/res/drawable-hdpi/ic_tvoption_aspect.png
+++ b/res/drawable-hdpi/ic_tvoption_display_mode.png
diff --git a/res/drawable-mdpi/ic_tvoption_aspect.png b/res/drawable-mdpi/ic_tvoption_display_mode.png
index 797537d4..797537d4 100644
--- a/res/drawable-mdpi/ic_tvoption_aspect.png
+++ b/res/drawable-mdpi/ic_tvoption_display_mode.png
diff --git a/res/drawable-xhdpi/ic_tvoption_aspect.png b/res/drawable-xhdpi/ic_tvoption_display_mode.png
index d57ffa62..d57ffa62 100644
--- a/res/drawable-xhdpi/ic_tvoption_aspect.png
+++ b/res/drawable-xhdpi/ic_tvoption_display_mode.png
diff --git a/res/drawable-xxhdpi/ic_tvoption_aspect.png b/res/drawable-xxhdpi/ic_tvoption_display_mode.png
index 0675d7c1..0675d7c1 100644
--- a/res/drawable-xxhdpi/ic_tvoption_aspect.png
+++ b/res/drawable-xxhdpi/ic_tvoption_display_mode.png
diff --git a/res/layout/action_tile.xml b/res/layout/action_tile.xml
index cb9fa28c..9247b4f9 100644
--- a/res/layout/action_tile.xml
+++ b/res/layout/action_tile.xml
@@ -42,7 +42,7 @@
                 android:layout_gravity="center"
                 android:contentDescription="@null"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_tvoption_aspect" />
+                android:src="@drawable/ic_tvoption_display_mode" />
         </FrameLayout>
 
         <TextView
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 24d55246..08fb68a6 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -15,13 +15,11 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- The aspect_ratio_label should be synced with src/com/android/tv/data/AspectRatio.java -->
-    <string-array name="aspect_ratio_label">
-        <item>16 : 9</item>
-        <item>4 : 3</item>
+    <!-- The display_mode_label should be synced with src/com/android/tv/data/DisplayMode.java -->
+    <string-array name="display_mode_label">
+        <item>Normal</item>
         <item>Full</item>
         <item>Zoom</item>
-        <item>Set by program</item>
     </string-array>
 
     <!-- The show_only_label should be synced with src/com/android/tv/data/ShowOnlyItems.java -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7f9a7290..c3048cf1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -48,8 +48,8 @@
     <string name="menu_program_guide">Program Guide</string>
     <!-- "Closed Caption" menu option [CHAR LIMIT=15] -->
     <string name="menu_closed_caption">Closed Caption</string>
-    <!-- "Aspect Ration" menu option [CHAR LIMIT=15] -->
-    <string name="menu_aspect_ratio">Aspect Ratio</string>
+    <!-- "Display Mode" menu option [CHAR LIMIT=15] -->
+    <string name="menu_display_mode">Display Mode</string>
     <!-- "Select TV Input" menu option [CHAR LIMIT=15] -->
     <string name="menu_select_input">TV Input</string>
     <!-- Toggle PIP [CHAR LIMIT=15] -->
@@ -104,8 +104,8 @@
     <!-- Title of the show only simple guide. [CHAR LIMIT=16]-->
     <string name="show_only_title">Show Only</string>
 
-    <!-- Title of Aspect Ratio option. [CHAR LIMIT=16]-->
-    <string name="aspect_ratio_option_title">Aspect Ratio</string>
+    <!-- Title of Display Mode option. [CHAR LIMIT=16]-->
+    <string name="display_mode_option_title">Display Mode</string>
 
     <!-- Title of Closed Caption option. [CHAR LIMIT=16]-->
     <string name="closed_caption_option_title">Closed Caption</string>
diff --git a/src/com/android/tv/TvActivity.java b/src/com/android/tv/TvActivity.java
index 2ce9b549..7975dc98 100644
--- a/src/com/android/tv/TvActivity.java
+++ b/src/com/android/tv/TvActivity.java
@@ -49,7 +49,7 @@ import android.view.animation.AnimationUtils;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
-import com.android.tv.data.AspectRatio;
+import com.android.tv.data.DisplayMode;
 import com.android.tv.data.Channel;
 import com.android.tv.data.ChannelMap;
 import com.android.tv.data.StreamInfo;
@@ -58,7 +58,7 @@ import com.android.tv.dialog.RecentlyWatchedDialogFragment;
 import com.android.tv.input.TisTvInput;
 import com.android.tv.input.TvInput;
 import com.android.tv.input.UnifiedTvInput;
-import com.android.tv.ui.AspectRatioOptionFragment;
+import com.android.tv.ui.DisplayModeOptionFragment;
 import com.android.tv.ui.BaseSideFragment;
 import com.android.tv.ui.ChannelBannerView;
 import com.android.tv.ui.ClosedCaptionOptionFragment;
@@ -143,7 +143,7 @@ public class TvActivity extends Activity implements AudioManager.OnAudioFocusCha
     private boolean mIsShy = true;
 
     private boolean mIsClosedCaptionEnabled;
-    private int mAspectRatio;
+    private int mDisplayMode;
     private SharedPreferences mSharedPreferences;
 
     static {
@@ -262,7 +262,7 @@ public class TvActivity extends Activity implements AudioManager.OnAudioFocusCha
 
         mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         restoreClosedCaptionEnabled();
-        restoreAspectRatio();
+        restoreDisplayMode();
         onNewIntent(getIntent());
     }
 
@@ -461,8 +461,8 @@ public class TvActivity extends Activity implements AudioManager.OnAudioFocusCha
         showSideFragment(new InputPickerFragment(), initiator);
     }
 
-    public void showAspectRatioOption(int initiator) {
-        showSideFragment(new AspectRatioOptionFragment(), initiator);
+    public void showDisplayModeOption(int initiator) {
+        showSideFragment(new DisplayModeOptionFragment(), initiator);
     }
 
     public void showClosedCaptionOption(int initiator) {
@@ -869,7 +869,7 @@ public class TvActivity extends Activity implements AudioManager.OnAudioFocusCha
                     return true;
                 }
                 case KeyEvent.KEYCODE_O: {
-                    showAspectRatioOption(BaseSideFragment.INITIATOR_SHORTCUT_KEY);
+                    showDisplayModeOption(BaseSideFragment.INITIATOR_SHORTCUT_KEY);
                     return true;
                 }
             }
@@ -1014,22 +1014,22 @@ public class TvActivity extends Activity implements AudioManager.OnAudioFocusCha
                 TvSettings.PREF_CLOSED_CAPTION_ENABLED, false), false);
     }
 
-    // Returns a constant defined in AspectRatio.
-    public int getAspectRatio() {
-        return mAspectRatio;
+    // Returns a constant defined in DisplayMode.
+    public int getDisplayMode() {
+        return mDisplayMode;
     }
 
-    public void setAspectRatio(int ratio, boolean storeInPreference) {
-        mAspectRatio = ratio;
+    public void setDisplayMode(int displayMode, boolean storeInPreference) {
+        mDisplayMode = displayMode;
         if (storeInPreference) {
-            mSharedPreferences.edit().putInt(TvSettings.PREF_ASPECT_RATIO, ratio).apply();
+            mSharedPreferences.edit().putInt(TvSettings.PREF_DISPLAY_MODE, displayMode).apply();
         }
-        // TODO: change aspect ratio
+        // TODO: change display mode
     }
 
-    public void restoreAspectRatio() {
-        setAspectRatio(mSharedPreferences.getInt(TvSettings.PREF_ASPECT_RATIO,
-                AspectRatio.RATIO_SET_BY_PROGRAM), false);
+    public void restoreDisplayMode() {
+        setDisplayMode(mSharedPreferences.getInt(TvSettings.PREF_DISPLAY_MODE,
+                DisplayMode.MODE_NORMAL), false);
     }
 
     private class HideRunnable implements Runnable {
diff --git a/src/com/android/tv/data/AspectRatio.java b/src/com/android/tv/data/DisplayMode.java
index 494776d1..6a033c3e 100644
--- a/src/com/android/tv/data/AspectRatio.java
+++ b/src/com/android/tv/data/DisplayMode.java
@@ -20,19 +20,17 @@ import android.content.Context;
 
 import com.android.tv.R;
 
-public class AspectRatio {
+public class DisplayMode {
 
-    // The values should be synced with R.arrays.aspect_ratio_label
-    public static final int RATIO_16_9 = 0;
-    public static final int RATIO_4_3 = 1;
-    public static final int RATIO_FULL = 2;
-    public static final int RATIO_ZOOM = 3;
-    public static final int RATIO_SET_BY_PROGRAM = 4;
-    public static final int SIZE_OF_RATIO_TYPES = RATIO_SET_BY_PROGRAM + 1;
+    // The values should be synced with R.arrays.display_mode_label
+    public static final int MODE_NORMAL = 0;
+    public static final int RATIO_FULL = 1;
+    public static final int RATIO_ZOOM = 2;
+    public static final int SIZE_OF_RATIO_TYPES = RATIO_ZOOM + 1;
 
-    private AspectRatio() { }
+    private DisplayMode() { }
 
-    public static final String getLabel(int ratio, Context context) {
-        return context.getResources().getStringArray(R.array.aspect_ratio_label)[ratio];
+    public static final String getLabel(int mode, Context context) {
+        return context.getResources().getStringArray(R.array.display_mode_label)[mode];
     }
 }
diff --git a/src/com/android/tv/ui/AspectRatioOptionFragment.java b/src/com/android/tv/ui/DisplayModeOptionFragment.java
index d5086e80..de7d1f5a 100644
--- a/src/com/android/tv/ui/AspectRatioOptionFragment.java
+++ b/src/com/android/tv/ui/DisplayModeOptionFragment.java
@@ -24,9 +24,9 @@ import android.widget.Toast;
 
 import com.android.tv.R;
 import com.android.tv.TvActivity;
-import com.android.tv.data.AspectRatio;
+import com.android.tv.data.DisplayMode;
 
-public class AspectRatioOptionFragment extends BaseOptionFragment {
+public class DisplayModeOptionFragment extends BaseOptionFragment {
     private static final String TAG = "AspectRatioOptionFragment";
     private static final boolean DEBUG = true;
 
@@ -41,11 +41,11 @@ public class AspectRatioOptionFragment extends BaseOptionFragment {
         mIsFirstResume = true;
         mTvActivity = (TvActivity) getActivity();
 
-        Object[] items = new Object[AspectRatio.SIZE_OF_RATIO_TYPES];
-        for (int i = 0; i < AspectRatio.SIZE_OF_RATIO_TYPES; ++i) {
-            items[i] = AspectRatio.getLabel(i, getActivity());
+        Object[] items = new Object[DisplayMode.SIZE_OF_RATIO_TYPES];
+        for (int i = 0; i < DisplayMode.SIZE_OF_RATIO_TYPES; ++i) {
+            items[i] = DisplayMode.getLabel(i, getActivity());
         }
-        initialize(getString(R.string.aspect_ratio_option_title), items);
+        initialize(getString(R.string.display_mode_option_title), items);
         return super.onCreateView(inflater, container, savedInstanceState);
     }
 
@@ -53,7 +53,7 @@ public class AspectRatioOptionFragment extends BaseOptionFragment {
     public void onResume() {
         super.onResume();
         if (mIsFirstResume) {
-            mAspectRatio = mTvActivity.getAspectRatio();
+            mAspectRatio = mTvActivity.getDisplayMode();
             mLastStoredAspectRatio = mAspectRatio;
             int initialPosition = mAspectRatio;
             setSelectedPosition(initialPosition);
@@ -66,7 +66,7 @@ public class AspectRatioOptionFragment extends BaseOptionFragment {
     public void onDetach() {
         super.onDetach();
         if (mLastStoredAspectRatio != mAspectRatio) {
-            mTvActivity.restoreAspectRatio();
+            mTvActivity.restoreDisplayMode();
         }
     }
 
@@ -75,14 +75,14 @@ public class AspectRatioOptionFragment extends BaseOptionFragment {
         super.onItemFocusChanged(v, focusGained, position, tag);
         if (focusGained) {
             mAspectRatio = position;
-            mTvActivity.setAspectRatio(position, false);
+            mTvActivity.setDisplayMode(position, false);
         }
     }
 
     @Override
     public void onItemSelected(View v, int position, Object tag) {
         mAspectRatio = position;
-        mTvActivity.setAspectRatio(mAspectRatio, true);
+        mTvActivity.setDisplayMode(mAspectRatio, true);
         mLastStoredAspectRatio = mAspectRatio;
         super.onItemSelected(v, position, tag);
         Toast.makeText(getActivity(), R.string.not_implemented_yet, Toast.LENGTH_SHORT).show();
diff --git a/src/com/android/tv/ui/MainMenuView.java b/src/com/android/tv/ui/MainMenuView.java
index 95cde6d7..5fb02679 100644
--- a/src/com/android/tv/ui/MainMenuView.java
+++ b/src/com/android/tv/ui/MainMenuView.java
@@ -282,8 +282,8 @@ public class MainMenuView extends FrameLayout implements View.OnClickListener,
                                             BaseSideFragment.INITIATOR_MENU);
                                     break;
 
-                                case MenuAction.SELECT_ASPECT_RATIO:
-                                    mTvActivity.showAspectRatioOption(
+                                case MenuAction.SELECT_DISPLAY_MODE:
+                                    mTvActivity.showDisplayModeOption(
                                             BaseSideFragment.INITIATOR_MENU);
                                     break;
 
diff --git a/src/com/android/tv/ui/MenuAction.java b/src/com/android/tv/ui/MenuAction.java
index d4832bbb..82249d08 100644
--- a/src/com/android/tv/ui/MenuAction.java
+++ b/src/com/android/tv/ui/MenuAction.java
@@ -25,7 +25,7 @@ import com.android.tv.R;
  */
 public class MenuAction {
     public static final int SELECT_CLOSED_CAPTION = 0;
-    public static final int SELECT_ASPECT_RATIO = 1;
+    public static final int SELECT_DISPLAY_MODE = 1;
     public static final int SELECT_TV_INPUT_TYPE = 2;
     public static final int TOGGLE_PIP_TYPE = 3;
 
@@ -37,9 +37,9 @@ public class MenuAction {
     public static final MenuAction SELECT_CLOSED_CAPTION_ACTION =
             new MenuAction(R.string.menu_closed_caption, SELECT_CLOSED_CAPTION,
                     R.drawable.ic_tvoption_cc);
-    public static final MenuAction SELECT_ASPECT_RATIO_ACTION =
-            new MenuAction(R.string.menu_aspect_ratio, SELECT_ASPECT_RATIO,
-                    R.drawable.ic_tvoption_aspect);
+    public static final MenuAction SELECT_DISPLAY_MODE_ACTION =
+            new MenuAction(R.string.menu_display_mode, SELECT_DISPLAY_MODE,
+                    R.drawable.ic_tvoption_display_mode);
     public static final MenuAction SELECT_TV_INPUT_ACTION =
             new MenuAction(R.string.menu_select_input, SELECT_TV_INPUT_TYPE,
                     R.drawable.ic_tvoptions_input_settings);
diff --git a/src/com/android/tv/ui/OptionsAdapter.java b/src/com/android/tv/ui/OptionsAdapter.java
index 5afe9a7c..ef54c785 100644
--- a/src/com/android/tv/ui/OptionsAdapter.java
+++ b/src/com/android/tv/ui/OptionsAdapter.java
@@ -59,7 +59,7 @@ public class OptionsAdapter extends ItemListView.ItemListAdapter {
 
         ArrayList<MenuAction> actionList = new ArrayList<MenuAction>();
         actionList.add(MenuAction.SELECT_CLOSED_CAPTION_ACTION);
-        actionList.add(MenuAction.SELECT_ASPECT_RATIO_ACTION);
+        actionList.add(MenuAction.SELECT_DISPLAY_MODE_ACTION);
         actionList.add(MenuAction.SELECT_TV_INPUT_ACTION);
         actionList.add(MenuAction.TOGGLE_PIP_ACTION);
         if (channelMap != null && channelMap.size() != 0) {
diff --git a/src/com/android/tv/util/TvSettings.java b/src/com/android/tv/util/TvSettings.java
index 4a513a78..033342c2 100644
--- a/src/com/android/tv/util/TvSettings.java
+++ b/src/com/android/tv/util/TvSettings.java
@@ -27,5 +27,5 @@ public final class TvSettings {
     public static final String PREF_TV_WATCH_LOGGING_ENABLED = "tv_watch_logging_enabled";
     public static final String PREF_DISPLAY_INPUT_NAME = "display_input_name_";
     public static final String PREF_CLOSED_CAPTION_ENABLED = "is_cc_enabled";  // boolean value
-    public static final String PREF_ASPECT_RATIO = "aspect_ratio";  // int value
+    public static final String PREF_DISPLAY_MODE = "display_mode";  // int value
 }