From e800044ab931c82caf65424e4eb47c4f8b420cfc Mon Sep 17 00:00:00 2001
From: Nick Kralevich <nnk@google.com>
Date: Wed, 12 Oct 2016 12:20:37 -0700
Subject: [PATCH] Delete development_settings.xml

This does not appear to be used. Also delete stale references
in strings.xml.

Bug: 21388590
Change-Id: I032a3f88624c589e007367693711464401a21a63
---
 .../res/layout/development_settings.xml       | 175 ------------------
 apps/Development/res/values/strings.xml       |  17 --
 2 files changed, 192 deletions(-)
 delete mode 100644 apps/Development/res/layout/development_settings.xml

diff --git a/apps/Development/res/layout/development_settings.xml b/apps/Development/res/layout/development_settings.xml
deleted file mode 100644
index e9b1dad5d..000000000
--- a/apps/Development/res/layout/development_settings.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/assets/res/any/layout/keyboard_version.xml
-**
-** Copyright 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.
-*/
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout 
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <TextView android:id="@+id/debug_app_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_debug_app_label_text" />
-
-        <Button android:id="@+id/debug_app"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/debug_app_label"
-            android:layout_alignParentLeft="true"
-            android:layout_toRightOf="@id/debug_app_label" />
-
-        <!-- android:visibility="gone" -->
-                
-        <CheckBox android:id="@+id/wait_for_debugger"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/debug_app"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_wait_for_debugger_text" />
-
-        <View android:id="@+id/separator"
-            android:layout_width="8dip"
-            android:layout_height="8dip"
-            android:layout_below="@id/wait_for_debugger"
-            android:layout_alignParentLeft="true" />
-
-        <Spinner android:id="@+id/pointer_location"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/separator"
-            android:layout_alignParentLeft="true" />
-
-        <CheckBox android:id="@+id/show_load"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/pointer_location"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_show_load_text" />
-
-        <CheckBox android:id="@+id/show_updates"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/show_load"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_show_updates_text" />
-
-        <Spinner android:id="@+id/strictmode_visual"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/show_updates"
-            android:layout_alignParentLeft="true" />
-
-        <CheckBox android:id="@+id/compatibility_mode"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/strictmode_visual"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_compatibility_mode_text" />
-
-        <Spinner android:id="@+id/max_procs"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/compatibility_mode"
-            android:layout_alignParentLeft="true" />
-
-        <View android:id="@+id/separator2"
-            android:layout_width="8dip"
-            android:layout_height="8dip"
-            android:layout_below="@id/max_procs"
-            android:layout_alignParentLeft="true" />
-
-        <CheckBox android:id="@+id/always_finish"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/separator2"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_always_finish_text" />
-
-        <CheckBox android:id="@+id/show_cpu"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/always_finish"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_show_cpu_text" />
-
-        <CheckBox android:id="@+id/enable_gl"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/show_cpu"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_enable_gl_text" />
-
-        <CheckBox android:id="@+id/show_background"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/enable_gl"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_show_background_text" />
-
-        <CheckBox android:id="@+id/show_sleep"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/show_background"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_show_sleep_text" />
-            
-        <Spinner android:id="@+id/window_animation_scale"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/show_sleep"
-            android:layout_alignParentLeft="true">
-        </Spinner>
-
-        <Spinner android:id="@+id/transition_animation_scale"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/window_animation_scale"
-            android:layout_alignParentLeft="true">
-        </Spinner>
-
-        <Spinner android:id="@+id/font_hinting"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/transition_animation_scale"
-            android:layout_alignParentLeft="true">
-        </Spinner>
-
-        <CheckBox android:id="@+id/show_xmpp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/font_hinting"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_show_xmpp_text" />
-
-        <CheckBox android:id="@+id/window_orientation_listener_log"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/show_xmpp"
-            android:layout_alignParentLeft="true"
-            android:text="@string/development_settings_window_orientation_listener_log" />
-
-    </RelativeLayout>
-
-</ScrollView>
-
diff --git a/apps/Development/res/values/strings.xml b/apps/Development/res/values/strings.xml
index 5f96d24e7..1ee1c18be 100644
--- a/apps/Development/res/values/strings.xml
+++ b/apps/Development/res/values/strings.xml
@@ -108,23 +108,6 @@
     <string name="launch_singleInstance">Single Instance</string>
     <string name="launch_unknown">"(Unknown)"</string>
 
-    <string name="development_settings_show_cpu_text">Show CPU usage</string>
-    <string name="development_settings_always_finish_text">Immediately destroy activities</string>
-    <string name="development_settings_show_load_text">Show running processes</string>
-    <string name="development_settings_show_updates_text">Show screen updates</string>
-    <string name="development_settings_compatibility_mode_text">Disable compatibility mode</string>
-    <string name="development_settings_compatibility_mode_toast">Reboot required for
-            change to take effect.</string>
-    <string name="development_settings_enable_gl_text">Enable OpenGL ES (reboot needed)</string>
-    <string name="development_settings_allow_mock_location_text">Allow mock locations for testing</string>
-    <string name="development_settings_wait_for_debugger_text">Wait for debugger</string>
-    <string name="development_settings_show_background_text">Show background</string>
-    <string name="development_settings_show_xmpp_text">Show GTalk service connection status</string>
-    <string name="development_settings_debug_app_label_text">Debug App:</string>
-    <string name="development_settings_show_sleep_text">Show sleep state on LED</string>
-    <string name="development_settings_keep_screen_on_text">Keep screen on while plugged in</string>
-    <string name="development_settings_window_orientation_listener_log">Enable window orientation listener log</string>
-
     <string name="monkey_screen_initialActivity_text"></string>
     <string name="monkey_screen_number_of_events_label">Number of Events: </string>
     <string name="monkey_screen_start_text">Start</string>