diff options
author | Kulanthaivel Palanichamy <kulanthaivel@codeaurora.org> | 2014-12-12 18:16:24 -0800 |
---|---|---|
committer | WebTech Code Review <code-review@localhost> | 2015-01-14 17:19:01 -0800 |
commit | 033af09636218904a8d65f65d40bc702d3a7c9c7 (patch) | |
tree | 7cf69033c48f2889758f87bb9aa02aab57b0622b /res | |
parent | 055e6d855337d209c1799a59d57480ffa4616515 (diff) | |
download | android_packages_apps_Gello-033af09636218904a8d65f65d40bc702d3a7c9c7.tar.gz android_packages_apps_Gello-033af09636218904a8d65f65d40bc702d3a7c9c7.tar.bz2 android_packages_apps_Gello-033af09636218904a8d65f65d40bc702d3a7c9c7.zip |
Cleanup custom_screen layout
Removes ErrorConsloe
Removes FixedTitleBarContainer
Change-Id: Ib5b3fb74d33851fddf983e3ac4b205b2457a9381
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/custom_screen.xml | 25 | ||||
-rw-r--r-- | res/layout/error_console.xml | 67 | ||||
-rw-r--r-- | res/values/strings.xml | 7 | ||||
-rw-r--r-- | res/xml/debug_preferences.xml | 7 |
4 files changed, 4 insertions, 102 deletions
diff --git a/res/layout/custom_screen.xml b/res/layout/custom_screen.xml index d166d804..df5c0f79 100644 --- a/res/layout/custom_screen.xml +++ b/res/layout/custom_screen.xml @@ -16,31 +16,14 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android"> + <FrameLayout android:id="@+id/main_content" + android:layout_width="match_parent" + android:layout_height="match_parent" + /> <FrameLayout android:id="@+id/fullscreen_custom_content" android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent" /> - <com.android.browser.view.CustomScreenLinearLayout - android:orientation="vertical" - android:id="@+id/vertical_layout" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout android:id="@+id/error_console" - android:layout_width="match_parent" - android:layout_height="wrap_content" - /> - - <FrameLayout android:id="@+id/fixed_titlebar_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - /> - - <FrameLayout android:id="@+id/main_content" - android:layout_width="match_parent" - android:layout_height="match_parent" - /> - </com.android.browser.view.CustomScreenLinearLayout> </merge> diff --git a/res/layout/error_console.xml b/res/layout/error_console.xml deleted file mode 100644 index e2396228..00000000 --- a/res/layout/error_console.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!-- Copyright (C) 2009 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" - android:id="@+id/error_console_view_group_id" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:background="#000000"> - - <TextView android:id="@+id/error_console_header_id" - android:text="@string/error_console_header_text_minimized" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="2dip" - android:paddingBottom="2dip" - android:paddingLeft="5dip" - style="?android:attr/listSeparatorTextViewStyle" - android:visibility="gone" - /> - - <view class="com.android.browser.ErrorConsoleView$ErrorConsoleListView" - android:id="@+id/error_console_list_id" - android:layout_width="match_parent" - android:layout_height="200dip" - android:visibility="gone" - android:layout_weight="1" - android:cacheColorHint="#000000" - /> - - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/error_console_eval_view_group_id" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="gone"> - - <EditText android:id="@+id/error_console_eval_text_id" - android:hint="@string/error_console_eval_text_hint" - android:layout_height="wrap_content" - android:scrollHorizontally="true" - android:inputType="text" - android:layout_width="0dip" - android:layout_gravity="left" - android:layout_weight="1.0" - /> - - <Button android:id="@+id/error_console_eval_button_id" - android:text="@string/error_console_eval_button_text" - 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 490e41d8..4d772f3f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -596,8 +596,6 @@ <string name="js_engine_flags" translatable="false">Set JS flags</string> <!-- Do not tranlsate. Development option --> <string name="pref_development_uastring" translatable="false">UAString</string> - <!-- Do not tranlsate. Development option --> - <string name="pref_development_error_console" translatable="false">Show JavaScript Console</string> <!-- Do not translate. Development option to reset the prologin time [CHAR LIMIT=20] --> <string name="pref_development_reset_prelogin" translatable="false">Reset prelogin</string> <!-- Settings screen, setting option name --> @@ -894,11 +892,6 @@ <!-- Text in the progress dialog when we are setting an image as the home screen wallpaper. --> <string name="progress_dialog_setting_wallpaper">Setting wallpaper\u2026</string> - <string name="error_console_header_text_minimized" translatable="false">Show JavaScript console</string> - <string name="error_console_header_text_maximized" translatable="false">JavaScript console</string> - <string name="error_console_eval_text_hint" translatable="false">Evaluate JavaScript</string> - <string name="error_console_eval_button_text" translatable="false">Evaluate</string> - <!-- The default state to the "up to parent folder" button in the bookmarks UI. This is displayed when the user is at the highest level and cannot go up [CHAR LIMIT=16] --> <string name="defaultBookmarksUpButton">Bookmarks</string> diff --git a/res/xml/debug_preferences.xml b/res/xml/debug_preferences.xml index 3ab9b90e..dc6b7230 100644 --- a/res/xml/debug_preferences.xml +++ b/res/xml/debug_preferences.xml @@ -38,13 +38,6 @@ android:defaultValue="false" android:title="@string/pref_development_cpu_upload_path" /> - <!-- The javascript console is enabled by default when the user has - also enabled debug mode by navigating to about:debug. --> - <CheckBoxPreference - android:key="javascript_console" - android:defaultValue="true" - android:title="@string/pref_development_error_console" /> - <CheckBoxPreference android:key="small_screen" android:defaultValue="false" |