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

am 3b378c92: am a7a4e518: Fix 2209086: Fix missing callback that was preventing right tab bar text from updating.

Browse Source 
Merge commit '3b378c925560eb3f65a93d66fa8cb69582a6ac6a' into eclair-mr2-plus-aosp

* commit '3b378c925560eb3f65a93d66fa8cb69582a6ac6a':
  Fix 2209086: Fix missing callback that was preventing right tab bar text from updating.
This commit is contained in:
Jim Miller
2009-11-15 14:55:51 -08:00
committed by Android Git Automerger
parent db674b3322 5abfc111a2
commit 30bf56267d
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
policy/com/android/internal/policy/impl/LockScreen.java
View File

@@ -204,9 +204,8 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM
updateMonitor.registerConfigurationChangeCallback(this);
mAudioManager = (AudioManager) getContext().getSystemService(Context.AUDIO_SERVICE);
mSilentMode = mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_SILENT;
mSilentMode = isSilentMode();
mSelector.setOnTriggerListener(this);
mSelector.setLeftTabResources(
R.drawable.ic_jog_dial_unlock,
R.drawable.jog_tab_target_green,
@@ -215,9 +214,15 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM
updateRightTabResources();
mSelector.setOnTriggerListener(this);
resetStatusInfo(updateMonitor);
}
private boolean isSilentMode() {
return mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_SILENT;
}
private void updateRightTabResources() {
mSelector.setRightTabResources(
mSilentMode ? R.drawable.ic_jog_dial_sound_off : R.drawable.ic_jog_dial_sound_on,
@@ -226,9 +231,6 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM
: R.drawable.jog_tab_bar_right_sound_off,
mSilentMode ? R.drawable.jog_tab_right_sound_on
: R.drawable.jog_tab_right_sound_off);
mSelector.setRightHintText(mSilentMode ?
R.string.lockscreen_sound_on_label : R.string.lockscreen_sound_off_label);
}
private void resetStatusInfo(KeyguardUpdateMonitor updateMonitor) {
@@ -281,7 +283,11 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM
/** {@inheritDoc} */
public void onGrabbedStateChange(View v, int grabbedState) {
// TODO: Update onscreen hint text based on the new state.
if (grabbedState == SlidingTab.OnTriggerListener.RIGHT_HANDLE) {
mSilentMode = isSilentMode();
mSelector.setRightHintText(mSilentMode ? R.string.lockscreen_sound_on_label
: R.string.lockscreen_sound_off_label);
}
mCallback.pokeWakelock();
}