merge from donut (5f16c148) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+8 −2

Original line number	Diff line number	Diff line
		@@ -127,6 +127,7 @@
		</activity>

		<activity android:name=".vpn.VpnSettings"
		android:configChanges="orientation\|keyboardHidden"
		android:launchMode="singleTask">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		@@ -136,8 +137,12 @@
		</intent-filter>
		</activity>

		<activity android:name=".vpn.VpnTypeSelection"></activity>
		<activity android:name=".vpn.VpnEditor"></activity>
		<activity android:name=".vpn.VpnTypeSelection"
		android:configChanges="orientation\|keyboardHidden">
		</activity>
		<activity android:name=".vpn.VpnEditor"
		android:configChanges="orientation\|keyboardHidden">
		</activity>

		<activity android:name="DateTimeSettings" android:label="@string/date_and_time"
		>
		@@ -270,6 +275,7 @@
		</activity>

		<activity android:name="SecuritySettings" android:label="@string/security_settings_title"
		android:configChanges="orientation\|keyboardHidden"
		android:clearTaskOnLaunch="true"
		>
		<intent-filter>

res/layout/cstor_name_credential_dialog_view.xml

+16 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,22 @@
		android:layout_height="wrap_content"
		android:singleLine="True"/>

		<LinearLayout android:id="@+id/cstor_credential_password_container"
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="vertical"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent"
		android:padding="0dip">
		<TextView android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:text="@string/cstor_credential_password" />
		<EditText android:id="@+id/cstor_credential_password"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:password="True"
		android:singleLine="True"/>
		</LinearLayout>

		<TextView android:id="@+id/cstor_credential_info_title"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"

res/layout/power_usage_action_item.xml

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		<?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:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:minHeight="?android:attr/listPreferredItemHeight"
		android:gravity="center_vertical"
		android:paddingLeft="4dip"
		android:focusable="true"
		android:orientation="vertical"
		android:paddingRight="?android:attr/scrollbarSize">

		<TextView android:id="@+id/summary"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="2dip"
		android:ellipsize="marquee"
		android:textAppearance="?android:attr/textAppearanceMedium"/>

		<LinearLayout
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal">
		<!-- Spacer -->
		<View
		android:id="@+id/buttons_spacer_left"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="0.7"
		android:visibility="invisible" />

		<Button
		android:id="@+id/action_button"
		android:layout_width="150dip"
		android:paddingRight="6dip"
		android:layout_weight="0.3"
		android:layout_height="wrap_content"/>
		</LinearLayout>
		</LinearLayout>

res/layout/power_usage_details.xml

+3 −28

Original line number	Diff line number	Diff line
		@@ -103,43 +103,18 @@
		</LinearLayout>

		<LinearLayout
		android:id="@+id/controls_section"
		android:id="@+id/controls"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<TextView
		android:id="@+id/controls_section_title"
		android:id="@+id/controls_title"
		style="?android:attr/listSeparatorTextViewStyle"
		android:layout_marginTop="6dip"
		android:text="@string/controls_subtitle" />

		<RelativeLayout
		android:layout_width="fill_parent"
		android:layout_height="wrap_content">

		<Button
		android:id="@+id/action_button1"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="6dip"
		android:layout_marginTop="6dip"
		android:layout_marginBottom="6dip"
		android:layout_marginRight="6dip"
		android:layout_alignParentLeft="true"
		android:layout_weight="1"/>
		<Button
		android:id="@+id/action_button2"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="6dip"
		android:layout_marginTop="6dip"
		android:layout_marginBottom="6dip"
		android:layout_marginRight="6dip"
		android:layout_alignParentRight="true"
		android:layout_weight="1"/>

		</RelativeLayout>
		<!-- Controls go here ... -->

		</LinearLayout>

res/values-cs/arrays.xml

+45 −4

Original line number	Diff line number	Diff line
		@@ -32,18 +32,44 @@
		<item>"10 minut"</item>
		<item>"Nevypínat"</item>
		</string-array>
		<string-array name="tts_rate_entries">
		<item>"Velmi pomalá"</item>
		<item>"Nízká"</item>
		<item>"Běžná"</item>
		<item>"Vysoká"</item>
		<item>"Velmi rychlá"</item>
		</string-array>
		<string-array name="tts_pitch_entries">
		<item>"Velmi nízká"</item>
		<item>"Nízká"</item>
		<item>"Běžná"</item>
		<item>"Vysoká"</item>
		<item>"Velmi vysoká"</item>
		</string-array>
		<string-array name="tts_lang_entries">
		<item>"americká angličtina"</item>
		<item>"britská angličtina"</item>
		<item>"francouzština"</item>
		<item>"němčina"</item>
		<item>"italština"</item>
		<item>"španělština"</item>
		</string-array>
		<string-array name="wifi_security_entries">
		<item>"Automaticky"</item>
		<item>"Žádné"</item>
		<item>"WEP"</item>
		<item>"WPA Personal"</item>
		<item>"WPA2 Personal"</item>
		<item>"WPA personal"</item>
		<item>"WPA2 personal"</item>
		<item>"WPA-EAP"</item>
		<item>"IEEE 802.1x"</item>
		</string-array>
		<string-array name="wifi_security_without_auto_entries">
		<item>"Žádné"</item>
		<item>"WEP"</item>
		<item>"WPA Personal"</item>
		<item>"WPA2 Personal"</item>
		<item>"WPA personal"</item>
		<item>"WPA2 personal"</item>
		<item>"WPA-EAP"</item>
		<item>"IEEE 802.1x"</item>
		</string-array>
		<string-array name="wifi_wep_type">
		<item>"Automaticky"</item>
		@@ -73,4 +99,19 @@
		<item>"Počet spuštění"</item>
		<item>"Název aplikace"</item>
		</string-array>
		<string-array name="wifi_eap_entries">
		<item>"PEAP"</item>
		<item>"TLS"</item>
		<item>"TTLS"</item>
		</string-array>
		<string-array name="wifi_phase2_entries">
		<item>"Žádné"</item>
		<item>"PAP"</item>
		<item>"MSCHAP"</item>
		<item>"MSCHAP2"</item>
		<item>"GTC"</item>
		</string-array>
		<!-- no translation found for emergency_tone_entries:0 (5165439859689033665) -->
		<!-- no translation found for emergency_tone_entries:1 (3165868966179561687) -->
		<!-- no translation found for emergency_tone_entries:2 (6038758039030476855) -->
		</resources>