am 613cab12: am f9d69170: Import translations. DO NOT MERGE
* commit '613cab12188b59b907834d6e8e473219ba6306a8':
Import translations. DO NOT MERGE
diff --git a/Android.mk b/Android.mk
index c8b81dc..0663e85 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_JAVA_LIBRARIES := bouncycastle telephony-common
+LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305
LOCAL_MODULE_TAGS := optional
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 67aa7ee..7025a9c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -262,7 +262,8 @@
<activity android:name="ApnSettings"
android:label="@string/apn_settings"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:launchMode="singleTask">
+ android:launchMode="singleTask"
+ android:parentActivityName="Settings$WirelessSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.APN_SETTINGS" />
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index ab87527..6c6553b 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -39,6 +39,7 @@
import android.widget.DatePicker;
import android.widget.TimePicker;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -233,44 +234,38 @@
@Override
public Dialog onCreateDialog(int id) {
- Dialog d;
-
+ final Calendar calendar = Calendar.getInstance();
switch (id) {
- case DIALOG_DATEPICKER: {
- final Calendar calendar = Calendar.getInstance();
- d = new DatePickerDialog(
- getActivity(),
- this,
- calendar.get(Calendar.YEAR),
- calendar.get(Calendar.MONTH),
- calendar.get(Calendar.DAY_OF_MONTH));
- // The system clock can't represent dates outside this range.
- DatePickerDialog datePicker = (DatePickerDialog)d;
- Calendar t = Calendar.getInstance();
- t.clear();
- t.set(1970, Calendar.JANUARY, 1);
- datePicker.getDatePicker().setMinDate(t.getTimeInMillis());
- t.clear();
- t.set(2037, Calendar.DECEMBER, 31);
- datePicker.getDatePicker().setMaxDate(t.getTimeInMillis());
- break;
- }
- case DIALOG_TIMEPICKER: {
- final Calendar calendar = Calendar.getInstance();
- d = new TimePickerDialog(
+ case DIALOG_DATEPICKER:
+ DatePickerDialog d = new DatePickerDialog(
+ getActivity(),
+ this,
+ calendar.get(Calendar.YEAR),
+ calendar.get(Calendar.MONTH),
+ calendar.get(Calendar.DAY_OF_MONTH));
+ configureDatePicker(d.getDatePicker());
+ return d;
+ case DIALOG_TIMEPICKER:
+ return new TimePickerDialog(
getActivity(),
this,
calendar.get(Calendar.HOUR_OF_DAY),
calendar.get(Calendar.MINUTE),
DateFormat.is24HourFormat(getActivity()));
- break;
- }
default:
- d = null;
- break;
+ throw new IllegalArgumentException();
}
+ }
- return d;
+ static void configureDatePicker(DatePicker datePicker) {
+ // The system clock can't represent dates outside this range.
+ Calendar t = Calendar.getInstance();
+ t.clear();
+ t.set(1970, Calendar.JANUARY, 1);
+ datePicker.setMinDate(t.getTimeInMillis());
+ t.clear();
+ t.set(2037, Calendar.DECEMBER, 31);
+ datePicker.setMaxDate(t.getTimeInMillis());
}
/*
@@ -378,40 +373,10 @@
}
}
- /* Helper routines to format timezone */
-
- /* package */ static String getTimeZoneText(TimeZone tz) {
- // Similar to new SimpleDateFormat("'GMT'Z, zzzz").format(new Date()), but
- // we want "GMT-03:00" rather than "GMT-0300".
- Date now = new Date();
- return formatOffset(new StringBuilder(), tz, now).
- append(", ").
- append(tz.getDisplayName(tz.inDaylightTime(now), TimeZone.LONG)).toString();
- }
-
- private static StringBuilder formatOffset(StringBuilder sb, TimeZone tz, Date d) {
- int off = tz.getOffset(d.getTime()) / 1000 / 60;
-
- sb.append("GMT");
- if (off < 0) {
- sb.append('-');
- off = -off;
- } else {
- sb.append('+');
- }
-
- int hours = off / 60;
- int minutes = off % 60;
-
- sb.append((char) ('0' + hours / 10));
- sb.append((char) ('0' + hours % 10));
-
- sb.append(':');
-
- sb.append((char) ('0' + minutes / 10));
- sb.append((char) ('0' + minutes % 10));
-
- return sb;
+ private static String getTimeZoneText(TimeZone tz) {
+ SimpleDateFormat sdf = new SimpleDateFormat("ZZZZ, zzzz");
+ sdf.setTimeZone(tz);
+ return sdf.format(new Date());
}
private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java
index 05e0d4e..bb2c6da 100644
--- a/src/com/android/settings/DateTimeSettingsSetupWizard.java
+++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -121,7 +121,6 @@
mSelectedTimeZone = tz;
mTimeZoneButton = (Button)findViewById(R.id.time_zone_button);
mTimeZoneButton.setText(tz.getDisplayName());
- // mTimeZoneButton.setText(DateTimeSettings.getTimeZoneText(tz));
mTimeZoneButton.setOnClickListener(this);
final boolean autoDateTimeEnabled;
@@ -141,6 +140,7 @@
mDatePicker = (DatePicker)findViewById(R.id.date_picker);
mDatePicker.setEnabled(!autoDateTimeEnabled);
mDatePicker.setCalendarViewShown(false);
+ DateTimeSettings.configureDatePicker(mDatePicker);
mInputMethodManager = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
@@ -244,7 +244,6 @@
if (mTimeZoneButton != null) {
mTimeZoneButton.setText(tz.getDisplayName());
}
- // mTimeZoneButton.setText(DateTimeSettings.getTimeZoneText(tz));
mDatePicker.updateDate(now.get(Calendar.YEAR), now.get(Calendar.MONTH),
now.get(Calendar.DAY_OF_MONTH));
mTimePicker.setCurrentHour(now.get(Calendar.HOUR_OF_DAY));
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index 687663a..cdfe7cd 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -45,7 +45,8 @@
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore;
+
+import com.android.org.conscrypt.TrustedCertificateStore;
public class TrustedCredentialsSettings extends Fragment {
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 64c4d4a..c14dbbe 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -115,7 +115,8 @@
} catch (AuthenticatorException e) {
// handled below
}
- if (failed) {
+ if (failed && getActivity() != null &&
+ !getActivity().isFinishing()) {
showDialog(FAILED_REMOVAL_DIALOG);
} else {
finish();
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index 846c324..7ce3b8d 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -110,6 +110,7 @@
Toast.makeText(mContext, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show();
// Reset switch to off. No infinite check/listenenr loop.
buttonView.setChecked(false);
+ return;
}
// Disable tethering if enabling Wifi