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

Settings: Make downtime days scrollable.

Browse Source 
Bug:17428288
Change-Id: I389aece9d79d002426a0bcb03d4a523293012892
This commit is contained in:
John Spurlock
2014-09-10 10:04:44 -04:00
parent 72e5583d2a
commit cddb29544a
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/zen_downtime_day.xml
View File

@@ -20,6 +20,4 @@
android:minHeight="?android:attr/listPreferredItemHeightSmall" android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingStart="@dimen/zen_downtime_checkbox_padding" android:paddingStart="@dimen/zen_downtime_checkbox_padding" />
android:layout_marginStart="@dimen/zen_downtime_margin"
android:layout_marginEnd="@dimen/zen_downtime_margin" />

2
res/values/dimens.xml
View File

@@ -93,7 +93,7 @@
<dimen name="notification_app_icon_badge_margin">4dp</dimen> <dimen name="notification_app_icon_badge_margin">4dp</dimen>
<dimen name="zen_mode_dropdown_width">160dp</dimen> <dimen name="zen_mode_dropdown_width">160dp</dimen>
<dimen name="zen_downtime_checkbox_padding">7dp</dimen> <dimen name="zen_downtime_checkbox_padding">7dp</dimen>
<dimen name="zen_downtime_margin">10dp</dimen> <dimen name="zen_downtime_margin">17dp</dimen>
<!-- Default text size for caption preview samples. Uses dp rather than sp because captions are not scaled. --> <!-- Default text size for caption preview samples. Uses dp rather than sp because captions are not scaled. -->
<dimen name="caption_preview_text_size">48dp</dimen> <dimen name="caption_preview_text_size">48dp</dimen>

12
src/com/android/settings/notification/ZenModeDowntimeDaysSelection.java
View File

@@ -22,6 +22,7 @@ import android.util.SparseBooleanArray;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.ScrollView;
import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.LinearLayout; import android.widget.LinearLayout;
@@ -30,7 +31,7 @@ import com.android.settings.R;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
public class ZenModeDowntimeDaysSelection extends LinearLayout { public class ZenModeDowntimeDaysSelection extends ScrollView {
private static final int[] DAYS = { private static final int[] DAYS = {
Calendar.MONDAY, Calendar.TUESDAY, Calendar.WEDNESDAY, Calendar.THURSDAY, Calendar.FRIDAY, Calendar.MONDAY, Calendar.TUESDAY, Calendar.WEDNESDAY, Calendar.THURSDAY, Calendar.FRIDAY,
Calendar.SATURDAY, Calendar.SUNDAY Calendar.SATURDAY, Calendar.SUNDAY
@@ -38,16 +39,21 @@ public class ZenModeDowntimeDaysSelection extends LinearLayout {
private static final SimpleDateFormat DAY_FORMAT = new SimpleDateFormat("EEEE"); private static final SimpleDateFormat DAY_FORMAT = new SimpleDateFormat("EEEE");
private final SparseBooleanArray mDays = new SparseBooleanArray(); private final SparseBooleanArray mDays = new SparseBooleanArray();
private final LinearLayout mLayout;
public ZenModeDowntimeDaysSelection(Context context, String mode) { public ZenModeDowntimeDaysSelection(Context context, String mode) {
super(context); super(context);
mLayout = new LinearLayout(mContext);
final int hPad = context.getResources().getDimensionPixelSize(R.dimen.zen_downtime_margin);
mLayout.setPadding(hPad, 0, hPad, 0);
addView(mLayout);
final int[] days = ZenModeConfig.tryParseDays(mode); final int[] days = ZenModeConfig.tryParseDays(mode);
if (days != null) { if (days != null) {
for (int i = 0; i < days.length; i++) { for (int i = 0; i < days.length; i++) {
mDays.put(days[i], true); mDays.put(days[i], true);
} }
} }
setOrientation(VERTICAL); mLayout.setOrientation(LinearLayout.VERTICAL);
final Calendar c = Calendar.getInstance(); final Calendar c = Calendar.getInstance();
final LayoutInflater inflater = LayoutInflater.from(context); final LayoutInflater inflater = LayoutInflater.from(context);
for (int i = 0; i < DAYS.length; i++) { for (int i = 0; i < DAYS.length; i++) {
@@ -64,7 +70,7 @@ public class ZenModeDowntimeDaysSelection extends LinearLayout {
onChanged(getMode()); onChanged(getMode());
} }
}); });
addView(checkBox); mLayout.addView(checkBox);
} }
} }