diff options
7 files changed, 105 insertions, 22 deletions
diff --git a/core/java/com/android/internal/util/cm/QSUtils.java b/core/java/com/android/internal/util/cm/QSUtils.java index 977d603..49dc566 100644 --- a/core/java/com/android/internal/util/cm/QSUtils.java +++ b/core/java/com/android/internal/util/cm/QSUtils.java @@ -4,6 +4,7 @@ import android.bluetooth.BluetoothAdapter; import android.content.ContentResolver; import android.content.Context; import android.content.pm.PackageManager; +import android.content.res.Resources; import android.hardware.display.DisplayManager; import android.hardware.display.WifiDisplayStatus; import android.net.ConnectivityManager; @@ -14,6 +15,11 @@ import android.telephony.TelephonyManager; import com.android.internal.telephony.PhoneConstants; public class QSUtils { + public static boolean deviceSupportsImeSwitcher(Context ctx) { + Resources res = ctx.getResources(); + return res.getBoolean(com.android.internal.R.bool.config_show_cmIMESwitcher); + } + public static boolean deviceSupportsUsbTether(Context ctx) { ConnectivityManager cm = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE); return (cm.getTetherableUsbRegexs().length != 0); diff --git a/core/res/res/values-af/donottranslate-cldr.xml b/core/res/res/values-af/donottranslate-cldr.xml index 77b7f7c..c0bf60c 100644 --- a/core/res/res/values-af/donottranslate-cldr.xml +++ b/core/res/res/values-af/donottranslate-cldr.xml @@ -54,6 +54,8 @@ <string name="same_month_mdy1_mdy2">%9$s %2$s %3$s-%8$s</string> <string name="same_year_wday1_mdy1_wday2_mdy2">%1$s, %9$s %2$s %3$s - %6$s, y %7$s %8$s</string> <string name="short_format_month">%b</string> - <string name="full_wday_month_day_no_year">E MMMM d</string> - <string name="abbrev_wday_month_day_year">E, y MMM dd</string> + <string name="full_wday_month_day_no_year">EEEE, d MMMM</string> + <string name="abbrev_wday_month_day_no_year">EEE, d MMMM </string> + <string name="abbrev_wday_month_day_year">E dd MMM yyyy</string> + <string name="full_wday_month_day_no_year_split">EEEE\nd MMMM</string> </resources> diff --git a/core/res/res/values-af/donottranslate-maps.xml b/core/res/res/values-af/donottranslate-maps.xml new file mode 100644 index 0000000..9695e91 --- /dev/null +++ b/core/res/res/values-af/donottranslate-maps.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/assets/res/any/colors.xml +** +** Copyright 2006, Google Inc. +** +** 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. +*/ +--> +<resources> + + <!-- Do not translate. --> + <integer-array name="maps_starting_lat_lng"> + <item>-26183333</item> + <item>28050000</item> + </integer-array> + <!-- Do not translate. --> + <integer-array name="maps_starting_zoom"> + <item>5</item> + </integer-array> + +</resources> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 09f752f..2934cca 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -26,7 +26,7 @@ <string name="gigabyteShort" msgid="3259882455212193214">"GB"</string> <string name="terabyteShort" msgid="231613018159186962">"TB"</string> <string name="petabyteShort" msgid="5637816680144990219">"PB"</string> - <string name="fileSizeSuffix" msgid="9164292791500531949">"<xliff:g id="UNIT">%2$s</xliff:g><xliff:g id="NUMBER">%1$s</xliff:g>"</string> + <string name="fileSizeSuffix" msgid="9164292791500531949">"<xliff:g id="NUMBER">%1$s</xliff:g><xliff:g id="UNIT">%2$s</xliff:g>"</string> <string name="untitled" msgid="4638956954852782576">"<Titelloos>"</string> <string name="ellipsis" msgid="7899829516048813237">"…"</string> <string name="ellipsis_two_dots" msgid="1228078994866030736">"‥"</string> @@ -761,7 +761,7 @@ <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Probeer weer"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Probeer weer"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Maksimum gesigontsluit-pogings oorskry"</string> - <string name="lockscreen_plugged_in" msgid="8057762828355572315">"Laai, (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <string name="lockscreen_plugged_in" msgid="8057762828355572315">"Laai, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_charged" msgid="321635745684060624">"Gelaai"</string> <string name="lockscreen_battery_short" msgid="4477264849386850266">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Koppel jou herlaaier."</string> @@ -1066,8 +1066,8 @@ <string name="smv_application" msgid="3307209192155442829">"Die program <xliff:g id="APPLICATION">%1$s</xliff:g> (proses <xliff:g id="PROCESS">%2$s</xliff:g>) het sy selfopgelegde StrictMode-beleid oortree."</string> <string name="smv_process" msgid="5120397012047462446">"Die proses <xliff:g id="PROCESS">%1$s</xliff:g> het die selfopgelegde StrictMode-beleid geskend."</string> <string name="android_upgrading_title" msgid="1584192285441405746">"Android gradeer tans op..."</string> - <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimeer program <xliff:g id="NUMBER_0">%1$d</xliff:g> van <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> - <string name="android_upgrading_starting_apps" msgid="451464516346926713">"Begin programme."</string> + <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimaliseer program <xliff:g id="NUMBER_0">%1$d</xliff:g> van <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> + <string name="android_upgrading_starting_apps" msgid="451464516346926713">"Programme is besig om te begin."</string> <string name="android_upgrading_complete" msgid="1405954754112999229">"Voltooi herlaai."</string> <string name="heavy_weight_notification" msgid="9087063985776626166">"<xliff:g id="APP">%1$s</xliff:g> loop"</string> <string name="heavy_weight_notification_detail" msgid="1721681741617898865">"Raak om na program te wissel"</string> @@ -1456,4 +1456,39 @@ <string name="enable_accessibility_canceled" msgid="3833923257966635673">"Toeganklikheid gekanselleer."</string> <string name="user_switched" msgid="3768006783166984410">"Huidige gebruiker <xliff:g id="NAME">%1$s</xliff:g> ."</string> <string name="owner_name" msgid="2716755460376028154">"Eienaar"</string> + + <!-- CYANOGENMOD ADDITIONS START --> + <string name="profileNameDefault">Normaal</string> + <string name="profileNameWork">Werk</string> + <string name="profileNameHome">Huis</string> + <string name="profileNameSilent">Stil</string> + <string name="profileNameNight">Nag</string> + <string name="profileGroupPhone">Foon</string> + <string name="profileGroupCalendar">Kalender</string> + <string name="profileGroupGmail">Gmail</string> + <string name="profileGroupEmail">Epos</string> + <string name="profileGroupSMS">SMS</string> + <string name="wildcardProfile">Ander</string> + <string name="reboot_system" product="tablet">Herlaai tablet</string> + <string name="reboot_system" product="default">Herlaai foon</string> + <string name="global_action_screenshot">Skermfoto</string> + <string name="global_actions_toggle_expanded_desktop_mode">Volskerm</string> + <string name="global_actions_expanded_desktop_mode_on_status">Aan</string> + <string name="global_actions_expanded_desktop_mode_off_status">Af</string> + <string name="reboot_reboot">Herlaai</string> + <string name="reboot_recovery">Recovery</string> + <string name="reboot_bootloader">Bootloader</string> + <string name="reboot_bootmenu">Bootmenu</string> + <string name="reboot_fastboot">Fastboot</string> + <string name="reboot_download">Download</string> + <string name="reboot_progress">Herlaai\u2026</string> + <string name="reboot_confirm" product="tablet">Jou tablet gaan herlaai.</string> + <string name="reboot_confirm" product="default">Jou foon gaan herlaai.</string> + <string name="global_action_reboot">Herlaai</string> + <string name="global_action_choose_profile">Profiel</string> + <string name="toast_rotation_unlocked">Skerm rotasie ontsluit</string> + <string name="toast_rotation_locked">Skerm rotasie gesluit</string> + + <!-- CYANOGENMOD ADDITIONS END --> + </resources> diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/BrightnessTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/BrightnessTile.java index 6549c06..ef5b327 100644 --- a/packages/SystemUI/src/com/android/systemui/quicksettings/BrightnessTile.java +++ b/packages/SystemUI/src/com/android/systemui/quicksettings/BrightnessTile.java @@ -3,6 +3,7 @@ package com.android.systemui.quicksettings; import android.app.Dialog; import android.content.ContentResolver; import android.content.Context; +import android.content.DialogInterface; import android.net.Uri; import android.os.Handler; import android.os.RemoteException; @@ -16,11 +17,14 @@ import android.view.View.OnLongClickListener; import android.view.Window; import android.view.WindowManager; import android.view.WindowManagerGlobal; +import android.widget.ImageView; import com.android.systemui.R; import com.android.systemui.statusbar.phone.QuickSettingsController; import com.android.systemui.statusbar.phone.QuickSettingsContainerView; +import com.android.systemui.statusbar.policy.BrightnessController; import com.android.systemui.statusbar.policy.BrightnessController.BrightnessStateChangeCallback; +import com.android.systemui.statusbar.policy.ToggleSlider; public class BrightnessTile extends QuickSettingsTile implements BrightnessStateChangeCallback { @@ -29,14 +33,12 @@ public class BrightnessTile extends QuickSettingsTile implements BrightnessState private final int mBrightnessDialogLongTimeout; private Dialog mBrightnessDialog; private final Handler mHandler; - private boolean autoBrightness = true; public BrightnessTile(Context context, LayoutInflater inflater, QuickSettingsContainerView container, final QuickSettingsController qsc, Handler handler) { super(context, inflater, container, qsc); mHandler = handler; - mBrightnessDialogLongTimeout = mContext.getResources().getInteger(R.integer.quick_settings_brightness_dialog_long_timeout); mOnClick = new OnClickListener() { @@ -58,10 +60,8 @@ public class BrightnessTile extends QuickSettingsTile implements BrightnessState }; - qsc.registerObservedContent(Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS) - , this); - qsc.registerObservedContent(Settings.System.getUriFor(Settings.System - .SCREEN_BRIGHTNESS_MODE), this); + qsc.registerObservedContent(Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS), this); + qsc.registerObservedContent(Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS_MODE), this); onBrightnessLevelChanged(); } @@ -71,6 +71,11 @@ public class BrightnessTile extends QuickSettingsTile implements BrightnessState mBrightnessDialog.requestWindowFeature(Window.FEATURE_NO_TITLE); mBrightnessDialog.setContentView(R.layout.quick_settings_brightness_dialog); mBrightnessDialog.setCanceledOnTouchOutside(true); + + new BrightnessController(mContext, + (ImageView) mBrightnessDialog.findViewById(R.id.brightness_icon), + (ToggleSlider) mBrightnessDialog.findViewById(R.id.brightness_slider)); + mBrightnessDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT); mBrightnessDialog.getWindow().getAttributes().privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS; @@ -80,6 +85,7 @@ public class BrightnessTile extends QuickSettingsTile implements BrightnessState try { WindowManagerGlobal.getWindowManagerService().dismissKeyguard(); } catch (RemoteException e) { + // Do nothing here } mBrightnessDialog.show(); dismissBrightnessDialog(mBrightnessDialogLongTimeout); @@ -119,8 +125,7 @@ public class BrightnessTile extends QuickSettingsTile implements BrightnessState mode = Settings.System.getIntForUser(mContext.getContentResolver(), Settings.System.SCREEN_BRIGHTNESS_MODE, Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL); - autoBrightness = - (mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC); + boolean autoBrightness = (mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC); mDrawable = autoBrightness ? R.drawable.ic_qs_brightness_auto_on : R.drawable.ic_qs_brightness_auto_off; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java index 93ee320..9b30a93 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java @@ -42,6 +42,7 @@ import static com.android.internal.util.cm.QSConstants.TILE_WIFI; import static com.android.internal.util.cm.QSConstants.TILE_WIFIAP; import static com.android.internal.util.cm.QSConstants.TILE_WIMAX; import static com.android.internal.util.cm.QSUtils.deviceSupportsBluetooth; +import static com.android.internal.util.cm.QSUtils.deviceSupportsImeSwitcher; import static com.android.internal.util.cm.QSUtils.deviceSupportsTelephony; import static com.android.internal.util.cm.QSUtils.deviceSupportsUsbTether; import static com.android.internal.util.cm.QSUtils.systemProfilesEnabled; @@ -111,7 +112,7 @@ public class QuickSettingsController { private ContentObserver mObserver; public PhoneStatusBar mStatusBarService; - private InputMethodTile IMETile; + private InputMethodTile mIMETile; public QuickSettingsController(Context context, QuickSettingsContainerView container, PhoneStatusBar statusBarService) { mContext = context; @@ -122,6 +123,8 @@ public class QuickSettingsController { } void loadTiles() { + // Reset reference tiles + mIMETile = null; // Filter items not compatible with device boolean bluetoothSupported = deviceSupportsBluetooth(); @@ -229,10 +232,10 @@ public class QuickSettingsController { qs.setupQuickSettingsTile(); mQuickSettingsTiles.add(qs); } - if (Settings.System.getInt(resolver, Settings.System.QS_DYNAMIC_IME, 1) == 1) { - QuickSettingsTile qs = new InputMethodTile(mContext, inflater, mContainerView, this); - qs.setupQuickSettingsTile(); - mQuickSettingsTiles.add(qs); + if (deviceSupportsImeSwitcher(mContext) && Settings.System.getInt(resolver, Settings.System.QS_DYNAMIC_IME, 1) == 1) { + mIMETile = new InputMethodTile(mContext, inflater, mContainerView, this); + mIMETile.setupQuickSettingsTile(); + mQuickSettingsTiles.add(mIMETile); } if (deviceSupportsUsbTether(mContext) && Settings.System.getInt(resolver, Settings.System.QS_DYNAMIC_USBTETHER, 1) == 1) { QuickSettingsTile qs = new UsbTetherTile(mContext, inflater, mContainerView, this); @@ -333,8 +336,8 @@ public class QuickSettingsController { } public void setImeWindowStatus(boolean visible) { - if (IMETile != null) { - IMETile.toggleVisibility(visible); + if (mIMETile != null) { + mIMETile.toggleVisibility(visible); } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java index 98a961d..4c19caa 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java @@ -172,7 +172,7 @@ public abstract class KeyguardActivityLauncher { boolean isSecure = lockPatternUtils.isSecure(); if (!isSecure || showsWhileLocked) { if (!isSecure) { - getCallback().dismiss(false); + dismissKeyguardOnNextActivity(); } try { if (DEBUG) Log.d(TAG, String.format("Starting activity for intent %s at %s", |