Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 81f4b582: Merge "Fix hardware keyboard switch listener" into honeycomb

Browse Source 
* commit '81f4b582d4f3547bcd432da6bcb21d4ef414723d':
  Fix hardware keyboard switch listener
This commit is contained in:
Tadashi G. Takaoka
2011-01-31 08:49:30 -08:00
committed by Android Git Automerger
parent 5592f0b16e 81f4b582d4
commit ed670b8b25
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodsPanel.java
View File

@@ -16,6 +16,8 @@
package com.android.systemui.statusbar.tablet; package com.android.systemui.statusbar.tablet;
import com.android.systemui.R;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -23,18 +25,16 @@ import android.content.IntentFilter;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.util.Slog;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener;
import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.view.inputmethod.InputMethodSubtype; import android.view.inputmethod.InputMethodSubtype;
import android.widget.CompoundButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RadioButton; import android.widget.RadioButton;
@@ -48,10 +48,8 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.TreeMap; import java.util.TreeMap;
import com.android.internal.statusbar.IStatusBarService; public class InputMethodsPanel extends LinearLayout implements StatusBarPanel, View.OnClickListener,
import com.android.systemui.R; CompoundButton.OnCheckedChangeListener {
public class InputMethodsPanel extends LinearLayout implements StatusBarPanel, OnClickListener {
private static final boolean DEBUG = TabletStatusBar.DEBUG; private static final boolean DEBUG = TabletStatusBar.DEBUG;
private static final String TAG = "InputMethodsPanel"; private static final String TAG = "InputMethodsPanel";
@@ -144,8 +142,8 @@ public class InputMethodsPanel extends LinearLayout implements StatusBarPanel, O
mInputMethodMenuList = (LinearLayout) findViewById(R.id.input_method_menu_list); mInputMethodMenuList = (LinearLayout) findViewById(R.id.input_method_menu_list);
mHardKeyboardSection = (LinearLayout) findViewById(R.id.hard_keyboard_section); mHardKeyboardSection = (LinearLayout) findViewById(R.id.hard_keyboard_section);
mHardKeyboardSwitch = (Switch) findViewById(R.id.hard_keyboard_switch); mHardKeyboardSwitch = (Switch) findViewById(R.id.hard_keyboard_switch);
mHardKeyboardSwitch.setOnClickListener(this); mHardKeyboardSwitch.setOnCheckedChangeListener(this);
mConfigureImeShortcut = ((View) findViewById(R.id.ime_settings_shortcut)); mConfigureImeShortcut = findViewById(R.id.ime_settings_shortcut);
mConfigureImeShortcut.setOnClickListener(this); mConfigureImeShortcut.setOnClickListener(this);
// TODO: If configurations for IME are not changed, do not update // TODO: If configurations for IME are not changed, do not update
// by checking onConfigurationChanged. // by checking onConfigurationChanged.
@@ -179,9 +177,17 @@ public class InputMethodsPanel extends LinearLayout implements StatusBarPanel, O
if (view == mConfigureImeShortcut) { if (view == mConfigureImeShortcut) {
showConfigureInputMethods(); showConfigureInputMethods();
onFinishPanel(true); onFinishPanel(true);
} else if (view == mHardKeyboardSwitch) { }
mHardKeyboardEnabled = mHardKeyboardSwitch.isChecked(); }
mHardKeyboardEnabledChangeListener.onHardKeyboardEnabledChange(mHardKeyboardEnabled);
@Override
public void onCheckedChanged(CompoundButton button, boolean checked) {
if (button == mHardKeyboardSwitch) {
if (mHardKeyboardEnabled != checked) {
mHardKeyboardEnabled = checked;
if (mHardKeyboardEnabledChangeListener != null)
mHardKeyboardEnabledChangeListener.onHardKeyboardEnabledChange(checked);
}
} }
} }
@@ -247,9 +253,9 @@ public class InputMethodsPanel extends LinearLayout implements StatusBarPanel, O
subtypeView, new Pair<InputMethodInfo, InputMethodSubtype> (imi, subtype)); subtypeView, new Pair<InputMethodInfo, InputMethodSubtype> (imi, subtype));
subtypeView.setOnClickListener(new View.OnClickListener() { subtypeView.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View v) {
Pair<InputMethodInfo, InputMethodSubtype> imiAndSubtype = Pair<InputMethodInfo, InputMethodSubtype> imiAndSubtype =
updateRadioButtonsByView(view); updateRadioButtonsByView(v);
onFinishPanel(false); onFinishPanel(false);
setInputMethodAndSubtype(imiAndSubtype.first, imiAndSubtype.second); setInputMethodAndSubtype(imiAndSubtype.first, imiAndSubtype.second);
} }
@@ -310,7 +316,9 @@ public class InputMethodsPanel extends LinearLayout implements StatusBarPanel, O
private void updateHardKeyboardSection() { private void updateHardKeyboardSection() {
if (mHardKeyboardAvailable) { if (mHardKeyboardAvailable) {
mHardKeyboardSection.setVisibility(View.VISIBLE); mHardKeyboardSection.setVisibility(View.VISIBLE);
mHardKeyboardSwitch.setChecked(mHardKeyboardEnabled); if (mHardKeyboardSwitch.isChecked() != mHardKeyboardEnabled) {
mHardKeyboardSwitch.setChecked(mHardKeyboardEnabled);
}
} else { } else {
mHardKeyboardSection.setVisibility(View.GONE); mHardKeyboardSection.setVisibility(View.GONE);
} }