diff options
author | Owen Lin <owenlin@google.com> | 2011-09-01 21:00:30 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-01 21:00:30 -0700 |
commit | 3b8147e5c566fde6bc145865013bb7f0141d4591 (patch) | |
tree | 3843df85e1596529dc0a6974a03ef89b63e73128 | |
parent | a610ef4c0c46e6737384c6c7cdcc307c3b0b813f (diff) | |
parent | 3c2289811e5e5a3ac46a78b57eab92b2b1ca5eae (diff) | |
download | android_packages_apps_Snap-3b8147e5c566fde6bc145865013bb7f0141d4591.tar.gz android_packages_apps_Snap-3b8147e5c566fde6bc145865013bb7f0141d4591.tar.bz2 android_packages_apps_Snap-3b8147e5c566fde6bc145865013bb7f0141d4591.zip |
Merge "Remove resources for Settings."
-rw-r--r-- | res/layout/account_header_preference.xml | 33 | ||||
-rw-r--r-- | res/layout/account_sync_preference.xml | 45 | ||||
-rw-r--r-- | res/layout/account_visible_preference.xml | 39 | ||||
-rw-r--r-- | res/layout/auto_upload_account_preference.xml | 34 | ||||
-rw-r--r-- | res/layout/auto_upload_help_text_preference.xml | 35 | ||||
-rw-r--r-- | res/values/strings.xml | 54 | ||||
-rw-r--r-- | res/xml/gallery_settings.xml | 41 |
7 files changed, 0 insertions, 281 deletions
diff --git a/res/layout/account_header_preference.xml b/res/layout/account_header_preference.xml deleted file mode 100644 index c25058d23..000000000 --- a/res/layout/account_header_preference.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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:orientation="horizontal" - android:gravity="center_vertical" - android:paddingRight="?android:attr/scrollbarSize" - android:paddingLeft="15dp" - android:paddingTop="6dp" - android:paddingBottom="6dp" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <TextView android:id="@+id/title" - android:layout_weight="1" - android:focusable="true" - android:clickable="true" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:singleLine="true"/> -</LinearLayout> diff --git a/res/layout/account_sync_preference.xml b/res/layout/account_sync_preference.xml deleted file mode 100644 index de41f0b37..000000000 --- a/res/layout/account_sync_preference.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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:orientation="vertical" - android:gravity="left" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingRight="?android:attr/scrollbarSize" - android:paddingLeft="25dp" - android:paddingTop="6dp" - android:paddingBottom="6dp" - android:layout_weight="1"> - - <TextView android:id="@+id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:focusable="false" - android:clickable="false" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceMedium" - android:ellipsize="marquee" - android:fadingEdge="horizontal" /> - - <TextView android:id="@+id/summary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:focusable="false" - android:clickable="false" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorSecondary" - android:maxLines="4"/> -</LinearLayout> diff --git a/res/layout/account_visible_preference.xml b/res/layout/account_visible_preference.xml deleted file mode 100644 index 8111e8dfe..000000000 --- a/res/layout/account_visible_preference.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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:orientation="horizontal" - android:gravity="center_vertical" - android:paddingRight="?android:attr/scrollbarSize" - android:paddingLeft="25dp" - android:paddingTop="6dp" - android:paddingBottom="6dp" - android:minHeight="?android:attr/listPreferredItemHeight" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <TextView android:id="@+id/title" - android:focusable="false" - android:clickable="false" - android:layout_weight="1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:maxLines="3"/> - <CheckBox android:id="@+id/checkbox" - android:focusable="false" - android:clickable="false" - android:layout_height="wrap_content" - android:layout_width="wrap_content" /> -</LinearLayout> diff --git a/res/layout/auto_upload_account_preference.xml b/res/layout/auto_upload_account_preference.xml deleted file mode 100644 index 2f7e9e30f..000000000 --- a/res/layout/auto_upload_account_preference.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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:orientation="horizontal" - android:gravity="center_vertical" - android:paddingRight="?android:attr/scrollbarSize" - android:paddingLeft="25dp" - android:paddingTop="6dp" - android:paddingBottom="6dp" - android:minHeight="?android:attr/listPreferredItemHeight" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <TextView android:id="@+id/title" - android:layout_weight="1" - android:focusable="false" - android:clickable="false" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:singleLine="true"/> -</LinearLayout> diff --git a/res/layout/auto_upload_help_text_preference.xml b/res/layout/auto_upload_help_text_preference.xml deleted file mode 100644 index 6601ecf2b..000000000 --- a/res/layout/auto_upload_help_text_preference.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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:orientation="vertical" - android:gravity="left" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingRight="?android:attr/scrollbarSize" - android:paddingLeft="15dp" - android:paddingTop="6dp" - android:paddingBottom="6dp" - android:layout_weight="1"> - - <TextView android:id="@+id/summary" - android:focusable="true" - android:clickable="true" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorSecondary" - android:maxLines="4"/> -</LinearLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 0e0db1242..3c0588ad7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -406,58 +406,4 @@ <!-- Group by menu item. [CHAR LIMIT=20] --> <string name="group_by">Group by</string> - - <!-- The strings used in Gallery Settings --> - - <!-- The title of the menu item which enable the settings [CHAR LIMIT=20] --> - <string name="settings">Settings</string> - - <!-- The header of the preference group about account [CHAR LIMIT=40] --> - <string name="prefs_accounts">Account settings</string> - - <!-- The header of the preference group about data usage [CHAR LIMIT=40] --> - <string name="prefs_data_usage">Data usage settings</string> - - <!-- The header of the preference group about Auto-upload [CHAR LIMIT=40] --> - <string name="prefs_auto_upload">Auto-upload</string> - - <!-- The header of the preference group about other settings [CHAR LIMIT=40] --> - <string name="prefs_other_settings">Other settings</string> - - <!-- The title of the preference item which shows details info about the - gallery [CHAR LIMIT=40] --> - <string name="about_gallery">About Gallery</string> - - <!-- The title of the preference item which controls whether we do sync - only on wifi network [CHAR LIMIT=40] --> - <string name="sync_on_wifi_only">Sync on WiFi only</string> - - <!-- The help document about auto upload [CHAR LIMIT=120] --> - <string name="helptext_auto_upload">Automatically upload all the photos and videos you take to a private picasa web album</string> - - <!-- The title of the preference item which sets whether auto-upload is - enabled [CHAR LIMIT=40] --> - <string name="enable_auto_upload">Enable Auto-upload</string> - - <!-- The title which indicates the picasa sync for the account is on [CHAR LIMIT=30] --> - <string name="photo_sync_is_on">Google photos sync is ON</string> - - <!-- The title which indicates the picasa sync for the account is off [CHAR LIMIT=30] --> - <string name="photo_sync_is_off">Google photos sync is OFF</string> - - <!-- The help document which explains user can change system sync settings - by this preference item [CHAR LIMIT=40] --> - <string name="helptext_photo_sync">Change sync preferences or remove this account</string> - - <!-- The title of the preference item which sets whether the photos of - the account are visible in Gallery [CHAR LIMIT=60] --> - <string name="view_photo_for_account">View photos and videos from this account in the Gallery</string> - - <!-- The title of menu item where user can add a new account --> - <string name="add_account">Add account</string> - - <!-- The title of the dialog for the user to choose the account for auto - uploading [CHAR LIMIT=30] --> - <string name="auto_upload_chooser_title">Choose Auto-upload account</string> - </resources> diff --git a/res/xml/gallery_settings.xml b/res/xml/gallery_settings.xml deleted file mode 100644 index 8490454ad..000000000 --- a/res/xml/gallery_settings.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <PreferenceCategory - android:key="prefs_account_settings" - android:title="@string/prefs_accounts"/> - <PreferenceCategory - android:title="@string/prefs_data_usage"> - <CheckBoxPreference - android:key="prefs_sync_on_wifi_only" - android:title="@string/sync_on_wifi_only" /> - </PreferenceCategory> - <PreferenceCategory - android:key="prefs_auto_upload_settings" - android:title="@string/prefs_auto_upload"> - <com.android.gallery3d.settings.AutoUploadHelpTextPreference /> - <CheckBoxPreference - android:key="prefs_auto_upload_enabled" - android:title="@string/enable_auto_upload"/> - </PreferenceCategory> - <PreferenceCategory - android:title="@string/prefs_other_settings"> - <Preference - android:key="prefs_about_gallery" - android:title="@string/about_gallery"/> - </PreferenceCategory> -</PreferenceScreen> |