Merge "Add feedback dialogs for WPS" into honeycomb
diff --git a/res/layout-xlarge/date_time_settings_setupwizard.xml b/res/layout-xlarge/date_time_settings_setupwizard.xml
index 328a014..600cdbd 100644
--- a/res/layout-xlarge/date_time_settings_setupwizard.xml
+++ b/res/layout-xlarge/date_time_settings_setupwizard.xml
@@ -18,7 +18,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingTop="160dip"
+ android:paddingTop="154dip"
android:paddingLeft="128dip"
android:paddingRight="128dip"
android:paddingBottom="96dip">
@@ -34,8 +34,8 @@
android:layout_alignParentTop="true"
android:textSize="30dip"
android:textColor="#FF99cc00"
- android:text="@string/date_and_time_settings_title"
- android:gravity="center_vertical" />
+ android:text="@string/date_and_time_settings_title_setup_wizard"
+ android:gravity="bottom" />
<!-- Divider -->
<View
@@ -44,97 +44,117 @@
android:layout_height="3dip"
android:layout_below="@id/title"
android:layout_marginTop="6dip"
- android:layout_marginBottom="7dip"
+ android:layout_marginBottom="17dip"
android:background="@color/divider_color" />
- <!-- timezone -->
- <Button
- android:id="@+id/time_zone_button"
- style="?android:attr/dropDownSpinnerStyle"
- android:layout_width="304dip"
- android:layout_height="48dip"
- android:layout_below="@id/top_divider"
- android:layout_marginTop="48dip"
- android:layout_marginLeft="16dip"
- android:paddingLeft="16dip"
- android:paddingTop="0dip"
- android:paddingBottom="0dip"
- android:gravity="left|center"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <LinearLayout
- android:id="@+id/date_time_auto"
- android:layout_width="624dip"
+ <RelativeLayout
+ android:id="@+id/timezone_auto_time"
+ android:layout_width="716dip"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_below="@id/top_divider"
- android:layout_alignParentRight="true"
- android:layout_marginTop="32dip"
- android:layout_marginRight="16dip"
- android:layout_marginBottom="48dip">
-
- <Switch
- android:id="@+id/date_time_auto_button"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:text="@string/date_time_auto"
+ android:layout_centerHorizontal="true"
+ android:layout_below="@id/top_divider">
+ <!-- timezone -->
+ <Button
+ android:id="@+id/time_zone_button"
+ style="?android:attr/dropDownSpinnerStyle"
+ android:layout_width="304dip"
+ android:layout_height="48dip"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:gravity="left|center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium" />
- <!-- Divider -->
+ <LinearLayout
+ android:id="@+id/date_time_auto"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_toRightOf="@id/time_zone_button"
+ android:layout_marginLeft="32dip"
+ android:layout_centerVertical="true"
+ android:layout_alignParentRight="true">
+
+ <Switch
+ android:id="@+id/date_time_auto_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dip"
+ android:text="@string/date_time_auto"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <!-- Divider -->
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:background="@color/divider_color" />
+ </LinearLayout>
+ </RelativeLayout>
+
+ <LinearLayout
+ android:layout_width="624dip"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_below="@+id/timezone_auto_time"
+ android:layout_marginTop="48dip"
+ android:orientation="horizontal">
+
+ <LinearLayout
+ android:layout_width="312dip"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <TextView
+ android:id="@+id/date_picker_title"
+ android:layout_width="match_parent"
+ android:layout_height="48dip"
+ android:text="@string/date_picker_title"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:clickable="false"
+ android:longClickable="false"
+ android:gravity="center" />
+ <DatePicker
+ android:id="@+id/date_picker"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/date_picker_title" />
+ </LinearLayout>
+
+ <!-- divider -->
<View
- android:layout_width="match_parent"
- android:layout_height="1px"
+ android:id="@+id/center_divider"
+ android:layout_width="1dip"
+ android:layout_height="match_parent"
android:background="@color/divider_color" />
+
+ <LinearLayout
+ android:layout_width="312dip"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <TextView
+ android:id="@+id/time_picker_title"
+ android:layout_width="match_parent"
+ android:layout_height="48dip"
+ android:text="@string/time_picker_title"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center" />
+
+ <TimePicker
+ android:id="@+id/time_picker"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/time_picker_title" />
+ </LinearLayout>
</LinearLayout>
- <TextView
- android:id="@+id/date_picker_title"
- android:layout_width="312dip"
- android:layout_height="48dip"
- android:layout_toLeftOf="@+id/time_picker_title"
- android:layout_below="@id/date_time_auto"
- android:text="@string/date_picker_title"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:gravity="center" />
-
- <DatePicker
- android:id="@+id/date_picker"
- android:layout_width="312dip"
- android:layout_height="wrap_content"
- android:layout_toLeftOf="@+id/time_picker"
- android:layout_below="@id/date_picker_title" />
-
- <TextView
- android:id="@+id/time_picker_title"
- android:layout_width="312dip"
- android:layout_height="48dip"
- android:layout_below="@id/date_time_auto"
- android:layout_alignParentRight="true"
- android:text="@string/time_picker_title"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:gravity="center" />
-
- <TimePicker
- android:id="@+id/time_picker"
- android:layout_width="312dip"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_below="@id/time_picker_title" />
-
- <!-- TODO: remove this button when we are sure it is needless -->
- <Button
- android:id="@+id/skip_button"
- android:layout_width="208dip"
- android:layout_height="48dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_alignParentBottom="true"
- android:layout_toLeftOf="@+id/next_button"
- android:layout_marginRight="16dip"
- android:text="@string/skip_label"
- android:visibility="gone" />
+ <View
+ android:id="@+id/bottom_divider"
+ android:layout_width="match_parent"
+ android:layout_height="3dip"
+ android:layout_alignLeft="@id/timezone_auto_time"
+ android:layout_above="@+id/next_button"
+ android:layout_marginBottom="16dip"
+ android:background="@color/divider_color" />
<Button
android:id="@+id/next_button"
@@ -142,8 +162,6 @@
android:layout_height="48dip"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
- android:layout_marginRight="16dip"
android:text="@string/next_label"
android:textAppearance="?android:attr/textAppearanceMedium" />
-
</RelativeLayout>
diff --git a/res/values-es-rUS-xlarge/strings.xml b/res/values-es-rUS-xlarge/strings.xml
index b1b3568..94555e6 100644
--- a/res/values-es-rUS-xlarge/strings.xml
+++ b/res/values-es-rUS-xlarge/strings.xml
@@ -64,7 +64,7 @@
<!-- XL -->
<string name="time_picker_title" msgid="4696843998853074855">"Hora"</string>
<!-- XL -->
- <!-- outdated translation 8167667824619597923 --> <string name="lock_after_timeout" msgid="7600891513842005">"Bloquear el dispositivo después del tiempo de espera"</string>
+ <string name="lock_after_timeout" msgid="7600891513842005">"Tiempo de espera"</string>
<!-- XL -->
<string name="owner_info_settings_title" msgid="5868468517033834142">"Datos de propietario"</string>
<!-- XL -->
@@ -76,19 +76,19 @@
<!-- XL -->
<!-- outdated translation 7222261825322058694 --> <string name="lock_settings_picker_title" msgid="2690788880781812819">"Seguridad de desbloqueo de la pantalla"</string>
<!-- XL -->
- <!-- outdated translation 347866107250190753 --> <string name="unlock_set_unlock_launch_picker_title" msgid="3679744779726501637">"Configurar bloqueo de pantalla"</string>
+ <string name="unlock_set_unlock_launch_picker_title" msgid="3679744779726501637">"Configurar bloqueo de pantalla"</string>
<!-- XL -->
- <!-- outdated translation 7839021413264124726 --> <string name="unlock_set_unlock_off_summary" msgid="7637549453338831016">"No mostrar el bloqueo de pantalla"</string>
+ <string name="unlock_set_unlock_off_summary" msgid="7637549453338831016">"Nunca bloquear la pantalla"</string>
<!-- XL -->
- <!-- outdated translation 6897899776351307938 --> <string name="unlock_set_unlock_none_title" msgid="8302920869082326280">"Ninguno"</string>
+ <string name="unlock_set_unlock_none_title" msgid="8302920869082326280">"Sin asegurar"</string>
<!-- XL -->
- <!-- outdated translation 8885805726462075726 --> <string name="unlock_set_unlock_none_summary" msgid="8836395154986917752">"Inhabilitar seguridad de desbloqueo de la pantalla"</string>
+ <string name="unlock_set_unlock_none_summary" msgid="8836395154986917752">"No se necesita un patrón, PIN o contraseña para desbloquear la pantalla"</string>
<!-- XL -->
- <!-- outdated translation 2255207039632944974 --> <string name="unlock_set_unlock_pattern_summary" msgid="7704094261502377451">"Establece el patrón para desbloquear la pantalla."</string>
+ <string name="unlock_set_unlock_pattern_summary" msgid="7704094261502377451">"Solicitar un patrón para desbloquear la pantalla"</string>
<!-- XL -->
- <!-- outdated translation 7340012856731870485 --> <string name="unlock_set_unlock_pin_summary" msgid="8765565920176739681">"Ingresa un PIN numérico para desbloquear la pantalla."</string>
+ <string name="unlock_set_unlock_pin_summary" msgid="8765565920176739681">"Se necesita PIN numérico para desbloquear la pantalla."</string>
<!-- XL -->
- <!-- outdated translation 2303105580723976714 --> <string name="unlock_set_unlock_password_summary" msgid="5551818803088356462">"Ingresa una contraseña para desbloquear la pantalla."</string>
+ <string name="unlock_set_unlock_password_summary" msgid="5551818803088356462">"Solicitar una contraseña para desbloquear la pantalla"</string>
<!-- XL -->
<string name="unlock_set_unlock_disabled_summary" msgid="5962903914511361952">"Inhabilitado por el administrador remoto de la tableta"</string>
<!-- XL -->
@@ -144,7 +144,7 @@
<!-- XL -->
<string name="wifi_tether_settings_title" msgid="1163442397537759931">"Configuración de la zona activa Wi-Fi portátil"</string>
<!-- XL -->
- <!-- outdated translation 221091308884159495 --> <string name="display_settings_title" msgid="891288246221134525">"Pantalla"</string>
+ <string name="display_settings_title" msgid="891288246221134525">"Pantalla"</string>
<!-- XL -->
<string name="silent_mode_title" msgid="1261478570389701519">"Modo silencio"</string>
<!-- XL -->
@@ -186,7 +186,7 @@
<string name="accelerometer_summary_off" product="tablet" msgid="4678290739639397018">"Cambiar la orientación automáticamente al girar la tableta"</string>
<string name="accelerometer_summary_off" product="default" msgid="5382045890112616097">"Cambiar la orientación automáticamente al girar el teléfono"</string>
<!-- XL -->
- <!-- outdated translation 4642702020751106195 --> <string name="screen_timeout" msgid="6722687152321894360">"Tiempo de espera de la pantalla"</string>
+ <string name="screen_timeout" msgid="6722687152321894360">"Tiempo de espera"</string>
<!-- XL -->
<string name="sim_lock_settings_category" msgid="3725835714557961131">"Configurar bloqueo de tarjeta SIM"</string>
<!-- XL -->
@@ -260,11 +260,11 @@
<!-- XL -->
<string name="location_gps_disabled" msgid="368445950600796860">"Localizar a nivel de calle (necesita más batería además de la vista del cielo)"</string>
<!-- XL -->
- <!-- outdated translation 6158635740500076705 --> <string name="use_location_title" msgid="6603235165943700077">"Utilizar la ubicación para buscar con Google"</string>
+ <string name="use_location_title" msgid="6603235165943700077">"Utilizar la ubicación para buscar con Google"</string>
<!-- XL -->
- <!-- outdated translation 5137275253035183227 --> <string name="use_location_summary_disabled" msgid="555010365449402016">"Utilizar la ubicación para buscar con Google y otros servicios de Google"</string>
+ <string name="use_location_summary_disabled" msgid="555010365449402016">"Utilizar la ubicación para buscar con Google y otros servicios de Google"</string>
<!-- XL -->
- <!-- outdated translation 7252704818478660952 --> <string name="use_location_summary_enabled" msgid="5155029913791084058">"Ubicación utilizada para mejorar los resultados de la búsqueda y otros servicios de Google"</string>
+ <string name="use_location_summary_enabled" msgid="5155029913791084058">"Ubicación utilizada para mejorar los resultados de la búsqueda y otros servicios de Google"</string>
<!-- XL -->
<string name="about_settings" product="tablet" msgid="4492242295431251939">"Acerca de la tableta"</string>
<string name="about_settings" product="default" msgid="5642163368100089859">"Acerca del teléfono"</string>
@@ -278,7 +278,7 @@
<!-- XL -->
<string name="lockpassword_choose_lock_generic_header" msgid="205113288645586976">"Desbloquear selección"</string>
<!-- XL -->
- <!-- outdated translation 1032594113258846963 --> <string name="lock_settings_title" msgid="9000564553472290676">"Desbloqueo de pantalla"</string>
+ <string name="lock_settings_title" msgid="9000564553472290676">"Bloquear pantalla"</string>
<!-- XL -->
<string name="lockpattern_change_lock_pattern_label" msgid="4234350892820550249">"Cambiar gráfico de desbloqueo"</string>
<!-- XL -->
@@ -442,6 +442,24 @@
<!-- XL -->
<string name="bluetooth_auto_connect" msgid="5635834571497957651">"Conectar automáticamente"</string>
<!-- XL -->
+ <string name="lock_after_timeout_summary" msgid="1115580514157023005">"Bloquear pantalla <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> luego de que la pantalla se apague automáticamente"</string>
+ <!-- XL -->
+ <string name="encryption_settings_title" msgid="2646733014286658918">"Encriptación del dispositivo"</string>
+ <!-- XL -->
+ <string name="encrypt_title" msgid="6588721799092579532">"Encriptar datos en el dispositivo"</string>
+ <!-- XL -->
+ <string name="encrypt_summary" msgid="8034174282555891811">"Debes configurar un número de PIN o contraseña para desbloquear el dispositivo"</string>
+ <!-- XL -->
+ <string name="unlock_set_unlock_mode_off" msgid="3083317055441778577">"Apagado"</string>
+ <!-- XL -->
+ <string name="unlock_set_unlock_mode_none" msgid="2265502443989071295">"Sin asegurar"</string>
+ <!-- XL -->
+ <string name="unlock_set_unlock_mode_pattern" msgid="891892061776325935">"Asegurado con patrón"</string>
+ <!-- XL -->
+ <string name="unlock_set_unlock_mode_pin" msgid="948449971660341581">"Asegurado con número de PIN"</string>
+ <!-- XL -->
+ <string name="unlock_set_unlock_mode_password" msgid="527487918702728081">"Asegurado con contraseña"</string>
+ <!-- XL -->
<string name="lockpattern_tutorial_cancel_label" msgid="8891383231976441554">"Cancelar"</string>
<!-- XL -->
<string name="lockpattern_tutorial_continue_label" msgid="607092788342282292">"Siguiente"</string>
@@ -450,6 +468,8 @@
<!-- XL -->
<string name="bluetooth_enter_passkey_msg" msgid="5281098098369174842">\n"Ingresa la llave maestra para vincular con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<!-- XL -->
+ <string name="bluetooth_display_passkey_pin_msg" msgid="4517875819897263465">"Ingresa la \"<xliff:g id="PASSKEY">%2$s</xliff:g>\" en tu \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" para sincronizar y luego return (volver) o enter (aceptar)."</string>
+ <!-- XL -->
<string name="bluetooth_disconnect_a2dp_profile" msgid="8558839213545432142">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio de medios."</string>
<!-- XL -->
<string name="bluetooth_disconnect_headset_profile" msgid="7632141632739822572">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará del audio de manos libre."</string>
@@ -460,6 +480,8 @@
<!-- XL -->
<string name="bluetooth_pan_profile_summary_use_for" msgid="7152329494274254683">"Utilizar para acceso a Internet"</string>
<!-- XL -->
+ <string name="screen_timeout_summary" msgid="8423734042860540453">"La pantalla se apaga automáticamente después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+ <!-- XL -->
<string name="memory_calculating_size" msgid="4994844259856032553">"Calculando…"</string>
<!-- XL -->
<string name="current_input_method" msgid="1106006204280275670">"Método de entrada actual"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2fbcb2a..b102214 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -512,6 +512,8 @@
<!-- Date and time settings --><skip />
<!-- Main Settings screen setting option name to go into the date and time settings-->
<string name="date_and_time_settings_title">Date & time</string>
+ <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
+ <string name="date_and_time_settings_title_setup_wizard">Set Date and time</string>
<!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
<string name="date_and_time_settings_summary">Set date, time, time zone & formats</string>
<!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=25] -->
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java
index 7fd7ef7..6964175 100644
--- a/src/com/android/settings/DateTimeSettingsSetupWizard.java
+++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -49,7 +49,7 @@
// force the first status of auto datetime flag.
private static final String EXTRA_INITIAL_AUTO_DATETIME_VALUE =
- "extra_initial_auto_datetime_value";
+ "extra_initial_auto_datetime_value";
private boolean mXLargeScreenSize;
@@ -126,7 +126,10 @@
mInputMethodManager = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
((Button)findViewById(R.id.next_button)).setOnClickListener(this);
- ((Button)findViewById(R.id.skip_button)).setOnClickListener(this);
+ final Button skipButton = (Button)findViewById(R.id.skip_button);
+ if (skipButton != null) {
+ skipButton.setOnClickListener(this);
+ }
}
@Override
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index c0b6da3..4628863 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -272,7 +272,9 @@
@Override
public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
- if (info instanceof AdapterContextMenuInfo) {
+ if (mInXlSetupWizard) {
+ ((WifiSettingsForSetupWizardXL)getActivity()).onCreateContextMenu(menu, view, info);
+ } else if (info instanceof AdapterContextMenuInfo) {
Preference preference = (Preference) getListView().getItemAtPosition(
((AdapterContextMenuInfo) info).position);
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index f420f34..7fccce0 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -30,7 +30,9 @@
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
+import android.view.ContextMenu.ContextMenuInfo;
import android.view.View.OnClickListener;
+import android.view.ContextMenu;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
@@ -524,4 +526,9 @@
/* package */ void onSaveNetwork(WifiConfiguration config) {
mWifiManager.connectNetwork(config);
}
+
+ @Override
+ public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo menuInfo) {
+ super.onCreateContextMenu(menu, view, menuInfo);
+ }
}