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

Merge "Make toggle slider use default assets"

Browse Source
This commit is contained in:
Alan Viverette
2014-04-08 22:29:37 +00:00
committed by Android (Google) Code Review
parent 4f009658f5 f6a679870f
commit 18c7f559a0
3 changed files with 102 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/status_bar_toggle_slider.xml
View File

@@ -29,7 +29,7 @@
android:layout_alignParentBottom="true"
android:button="@null"
/>
<SeekBar
<com.android.systemui.settings.ToggleSeekBar
android:id="@+id/slider"
android:layout_width="0dp"
android:layout_height="wrap_content"

45
packages/SystemUI/src/com/android/systemui/settings/ToggleSeekBar.java Normal file
View File

@@ -0,0 +1,45 @@
/*
* Copyright (C) 2014 The Android Open Source Project
*
* 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.
*/
package com.android.systemui.settings;
import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.widget.SeekBar;
public class ToggleSeekBar extends SeekBar {
public ToggleSeekBar(Context context) {
super(context);
}
public ToggleSeekBar(Context context, AttributeSet attrs) {
super(context, attrs);
}
public ToggleSeekBar(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
@Override
public boolean onTouchEvent(MotionEvent event) {
if (!isEnabled()) {
setEnabled(true);
}
return super.onTouchEvent(event);
}
}

98
packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java
View File

@@ -19,20 +19,18 @@ package com.android.systemui.settings;
import android.content.Context;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.RelativeLayout;
import android.widget.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
import android.widget.TextView;
import com.android.systemui.R;
public class ToggleSlider extends RelativeLayout
implements CompoundButton.OnCheckedChangeListener, SeekBar.OnSeekBarChangeListener {
private static final String TAG = "StatusBar.ToggleSlider";
public class ToggleSlider extends RelativeLayout {
public interface Listener {
public void onInit(ToggleSlider v);
public void onChanged(ToggleSlider v, boolean tracking, boolean checked, int value);
@@ -55,20 +53,21 @@ public class ToggleSlider extends RelativeLayout
public ToggleSlider(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
View.inflate(context, R.layout.status_bar_toggle_slider, this);
final Resources res = context.getResources();
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ToggleSlider,
defStyle, 0);
final TypedArray a = context.obtainStyledAttributes(
attrs, R.styleable.ToggleSlider, defStyle, 0);
mToggle = (CompoundButton)findViewById(R.id.toggle);
mToggle.setOnCheckedChangeListener(this);
mToggle.setBackgroundDrawable(res.getDrawable(R.drawable.status_bar_toggle_button));
mToggle = (CompoundButton) findViewById(R.id.toggle);
mToggle.setOnCheckedChangeListener(mCheckListener);
mToggle.setBackground(res.getDrawable(R.drawable.status_bar_toggle_button));
mSlider = (SeekBar)findViewById(R.id.slider);
mSlider.setOnSeekBarChangeListener(this);
mSlider = (SeekBar) findViewById(R.id.slider);
mSlider.setOnSeekBarChangeListener(mSeekListener);
mLabel = (TextView)findViewById(R.id.label);
mLabel = (TextView) findViewById(R.id.label);
mLabel.setText(a.getString(R.styleable.ToggleSlider_text));
a.recycle();
@@ -82,35 +81,6 @@ public class ToggleSlider extends RelativeLayout
}
}
public void onCheckedChanged(CompoundButton toggle, boolean checked) {
mSlider.setEnabled(checked);
if (mListener != null) {
mListener.onChanged(this, mTracking, checked, mSlider.getProgress());
}
}
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
if (mListener != null) {
mListener.onChanged(this, mTracking, mToggle.isChecked(), progress);
}
}
public void onStartTrackingTouch(SeekBar seekBar) {
mTracking = true;
if (mListener != null) {
mListener.onChanged(this, mTracking, mToggle.isChecked(), mSlider.getProgress());
}
mToggle.setChecked(false);
}
public void onStopTrackingTouch(SeekBar seekBar) {
mTracking = false;
if (mListener != null) {
mListener.onChanged(this, mTracking, mToggle.isChecked(), mSlider.getProgress());
}
}
public void setOnChangedListener(Listener l) {
mListener = l;
}
@@ -130,5 +100,49 @@ public class ToggleSlider extends RelativeLayout
public void setValue(int value) {
mSlider.setProgress(value);
}
private final OnCheckedChangeListener mCheckListener = new OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton toggle, boolean checked) {
mSlider.setEnabled(!checked);
if (mListener != null) {
mListener.onChanged(
ToggleSlider.this, mTracking, checked, mSlider.getProgress());
}
}
};
private final OnSeekBarChangeListener mSeekListener = new OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
if (mListener != null) {
mListener.onChanged(
ToggleSlider.this, mTracking, mToggle.isChecked(), progress);
}
}
@Override
public void onStartTrackingTouch(SeekBar seekBar) {
mTracking = true;
if (mListener != null) {
mListener.onChanged(
ToggleSlider.this, mTracking, mToggle.isChecked(), mSlider.getProgress());
}
mToggle.setChecked(false);
}
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
mTracking = false;
if (mListener != null) {
mListener.onChanged(
ToggleSlider.this, mTracking, mToggle.isChecked(), mSlider.getProgress());
}
}
};
}