PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop using Switch.

Browse Source 
Bug: 4082929
Change-Id: Idcf8f891e9e3257ed7b0a2727fe11fe540c8a141
This commit is contained in:
Daisuke Miyakawa
2011-03-11 12:12:06 -08:00
parent 04d9894827
commit d4fa73f877
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
res/layout-xlarge/date_time_settings_setupwizard.xml
View File

@@ -75,6 +75,34 @@
android:layout_marginLeft="32dip" android:layout_marginLeft="32dip"
android:layout_alignParentRight="true"> android:layout_alignParentRight="true">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/time_zone_button"
android:layout_alignParentRight="true">
<TextView
android:id="@+id/date_time_auto_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:layout_marginLeft="16dip"
android:text="@string/date_time_auto"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20dip"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/date_time_auto_button"
android:gravity="left|center_vertical" />
<CheckBox
android:id="@+id/date_time_auto_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentRight="true" />
</RelativeLayout>
<!--
<Switch <Switch
android:id="@+id/date_time_auto_button" android:id="@+id/date_time_auto_button"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -83,7 +111,7 @@
android:layout_marginLeft="16dip" android:layout_marginLeft="16dip"
android:text="@string/date_time_auto" android:text="@string/date_time_auto"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20dip" /> android:textSize="20dip" /> -->
<!-- Divider --> <!-- Divider -->
<View <View

5
src/com/android/settings/DateTimeSettingsSetupWizard.java
View File

@@ -27,7 +27,6 @@ import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException; import android.provider.Settings.SettingNotFoundException;
import android.text.format.DateFormat;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@@ -41,6 +40,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.DatePicker; import android.widget.DatePicker;
import android.widget.ListPopupWindow; import android.widget.ListPopupWindow;
import android.widget.SimpleAdapter; import android.widget.SimpleAdapter;
import android.widget.TextView;
import android.widget.TimePicker; import android.widget.TimePicker;
import java.util.Calendar; import java.util.Calendar;
@@ -119,7 +119,8 @@ public class DateTimeSettingsSetupWizard extends Activity
mAutoDateTimeButton = (CompoundButton)findViewById(R.id.date_time_auto_button); mAutoDateTimeButton = (CompoundButton)findViewById(R.id.date_time_auto_button);
mAutoDateTimeButton.setChecked(autoDateTimeEnabled); mAutoDateTimeButton.setChecked(autoDateTimeEnabled);
mAutoDateTimeButton.setText(autoDateTimeEnabled ? R.string.date_time_auto_summaryOn : ((TextView)findViewById(R.id.date_time_auto_text))
.setText(autoDateTimeEnabled ? R.string.date_time_auto_summaryOn :
R.string.date_time_auto_summaryOff); R.string.date_time_auto_summaryOff);
mAutoDateTimeButton.setOnCheckedChangeListener(this); mAutoDateTimeButton.setOnCheckedChangeListener(this);