From d56ad9dc61cbcbc76661068a78fc3b9311a52564 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Thu, 6 Oct 2016 16:51:01 -0700
Subject: [PATCH] Remove old unused activity.

Test: compiles
Change-Id: Ida7e9ac0646e60a6cb91fc30b00b9c09f5fe3a8d
---
 res/layout/display.xml                |  49 ----------
 res/values/strings.xml                |  12 ---
 src/com/android/settings/Display.java | 131 --------------------------
 3 files changed, 192 deletions(-)
 delete mode 100644 res/layout/display.xml
 delete mode 100644 src/com/android/settings/Display.java

diff --git a/res/layout/display.xml b/res/layout/display.xml
deleted file mode 100644
index f35730bdcce..00000000000
--- a/res/layout/display.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/res/layout/display.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/info_layout">        
-    <LinearLayout style="@style/entry_layout"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/display_font_size_label" />
-
-        <Spinner android:id="@+id/fontSize"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-        </Spinner>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/display_preview_label" />
-
-        <TextView android:id="@+id/preview"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <Button android:id="@+id/save"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 740657708f8..d7ab4b620cb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -146,13 +146,6 @@
     <!-- Summary of font size setting screen. [CHAR LIMIT=NONE] -->
     <string name="font_size_summary">Make the text on screen smaller or larger.</string>
 
-    <!-- choice for the font size spinner -->
-    <string name="small_font">Small</string>
-    <!-- choice for the font size spinner -->
-    <string name="medium_font">Medium</string>
-    <!-- choice for the font size spinner -->
-    <string name="large_font">Large</string>
-
     <!-- Description for the button that makes interface elements smaller. [CHAR_LIMIT=NONE] -->
     <string name="font_size_make_smaller_desc">Make smaller</string>
     <!-- Description for the button that makes interface elements larger. [CHAR_LIMIT=NONE] -->
@@ -359,11 +352,6 @@
     <!-- The title of the activity to pick a time zone. -->
     <string name="choose_timezone">Choose time zone</string>
 
-    <!-- Label of preview text when tweaking font size -->
-    <string name="display_preview_label">Preview:</string>
-    <!-- Label for chosen font size -->
-    <string name="display_font_size_label">Font size:</string>
-
     <!-- Used for diagnostic screens, precise translation is not necessary -->
     <string name="intent_sender_data_label"><xliff:g id="data">Data:</xliff:g></string>
     <!-- Used for diagnostic screens, precise translation is not necessary -->
diff --git a/src/com/android/settings/Display.java b/src/com/android/settings/Display.java
deleted file mode 100644
index 14e7b04c53f..00000000000
--- a/src/com/android/settings/Display.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-
-public class Display extends Activity implements View.OnClickListener {
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setContentView(R.layout.display);
-
-        mFontSize = (Spinner) findViewById(R.id.fontSize);
-        mFontSize.setOnItemSelectedListener(mFontSizeChanged);
-        String[] states = new String[3];
-        Resources r = getResources();
-        states[0] = r.getString(R.string.small_font);
-        states[1] = r.getString(R.string.medium_font);
-        states[2] = r.getString(R.string.large_font);
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
-                android.R.layout.simple_spinner_item, states);
-        adapter.setDropDownViewResource(
-                android.R.layout.simple_spinner_dropdown_item);
-        mFontSize.setAdapter(adapter);
-
-        mPreview = (TextView) findViewById(R.id.preview);
-        mPreview.setText(r.getText(R.string.font_size_preview_text));
-
-        Button save = (Button) findViewById(R.id.save);
-        save.setText(r.getText(R.string.font_size_save));
-        save.setOnClickListener(this);
-
-        mTextSizeTyped = new TypedValue();
-        TypedArray styledAttributes = 
-            obtainStyledAttributes(android.R.styleable.TextView);
-        styledAttributes.getValue(android.R.styleable.TextView_textSize,
-                mTextSizeTyped);
-
-        DisplayMetrics metrics = getResources().getDisplayMetrics();
-        mDisplayMetrics = new DisplayMetrics();
-        mDisplayMetrics.density = metrics.density;
-        mDisplayMetrics.heightPixels = metrics.heightPixels;
-        mDisplayMetrics.scaledDensity = metrics.scaledDensity;
-        mDisplayMetrics.widthPixels = metrics.widthPixels;
-        mDisplayMetrics.xdpi = metrics.xdpi;
-        mDisplayMetrics.ydpi = metrics.ydpi;
-
-        styledAttributes.recycle();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        final ContentResolver resolver = getContentResolver();
-        mFontScale = Settings.System.getFloat(resolver, Settings.System.FONT_SCALE, 1.0f);
-
-        if (mFontScale < 1) {
-            mFontSize.setSelection(0);
-        } else if (mFontScale > 1) {
-            mFontSize.setSelection(2);
-        } else {
-            mFontSize.setSelection(1);
-        }
-        updateFontScale();
-    }
-
-    private void updateFontScale() {
-        mDisplayMetrics.scaledDensity = mDisplayMetrics.density * mFontScale;
-        float size = mTextSizeTyped.getDimension(mDisplayMetrics);
-        mPreview.setTextSize(TypedValue.COMPLEX_UNIT_PX, size);
-    }
-
-    public void onClick(View v) {
-        final ContentResolver resolver = getContentResolver();
-        Settings.System.putFloat(resolver, Settings.System.FONT_SCALE, mFontScale);
-        finish();
-    }
-
-    private Spinner.OnItemSelectedListener mFontSizeChanged
-                                    = new Spinner.OnItemSelectedListener() {
-        public void onItemSelected(android.widget.AdapterView av, View v,
-                                    int position, long id) {
-            if (position == 0) {
-                mFontScale = .75f;
-            } else if (position == 2) {
-                mFontScale = 1.25f;
-            } else {
-                mFontScale = 1.0f;
-            }
-
-            updateFontScale();
-        }
-
-        public void onNothingSelected(android.widget.AdapterView av) {
-        }
-    };
-
-    private Spinner mFontSize;
-    private TextView mPreview;
-    private TypedValue mTextSizeTyped;
-    private DisplayMetrics mDisplayMetrics;
-    private float mFontScale = 1.0f;
-}