Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit effc01ce authored by Fan Zhang's avatar Fan Zhang
Browse files

Convert ListView to RecyclerView in AlarmClockFragment. 

Bug: 17425204
Bug: 23075718
Bug: 17324151
Change-Id: I85df81d7a8b352e37022953f57c5158a1d04797d
parent dad3bb30

res/layout-sw600dp-land/alarm_clock.xml

+21 −18
Original line number Diff line number Diff line
@@ -24,19 +24,17 @@ 
        android:id="@+id/alarm_layout"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="horizontal"

        android:baselineAligned="false" >

        android:baselineAligned="false"

        android:orientation="horizontal">



        <ListView

            android:id="@+id/alarms_list"

            android:layout_width="0dip"

        <android.support.v7.widget.RecyclerView

            android:id="@+id/alarms_recycler_view"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:paddingBottom="@dimen/button_footer_height"

            android:clipToPadding="false"

            android:descendantFocusability="beforeDescendants"

            android:divider="@null"

            android:dividerHeight="0dip" />

            android:fadingEdgeLength="0dp"

            android:scrollbarStyle="outsideOverlay"

            android:scrollbars="vertical" />



    </LinearLayout>
@@ -45,23 +43,27 @@ 
        android:layout_width="@dimen/footer_button_size"

        android:layout_height="@dimen/footer_button_size"

        android:layout_gravity="bottom|end">



        <ImageButton

            android:id="@+id/menu_button"

            android:contentDescription="@string/button_menu"

            style="?attr/actionOverflowButtonStyle"

            android:layout_gravity="end|center_vertical"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" />

            android:layout_height="wrap_content"

            android:layout_gravity="end|center_vertical"

            android:contentDescription="@string/button_menu" />

    </FrameLayout>



    <include layout="@layout/alarm_empty_view" />



    <FrameLayout android:id="@+id/undo_frame"

    <FrameLayout

        android:id="@+id/undo_frame"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone">



        <com.android.deskclock.widget.ActionableToastBar

            android:id="@+id/undo_bar"

            style="@style/ToastBarStyle"

            android:layout_width="match_parent"

            android:layout_height="64dip"

            android:layout_gravity="bottom"
@@ -69,7 +71,8 @@ 
            android:layout_marginLeft="@dimen/alarm_undo_bar_horizontal_margin"

            android:layout_marginStart="@dimen/alarm_undo_bar_horizontal_margin"

            android:layout_marginRight="@dimen/alarm_undo_bar_horizontal_margin"

            android:layout_marginEnd="@dimen/alarm_undo_bar_horizontal_margin"

            style="@style/ToastBarStyle" />

            android:layout_marginEnd="@dimen/alarm_undo_bar_horizontal_margin" />



    </FrameLayout>



</FrameLayout>

res/layout/alarm_clock.xml

+5 −7
Original line number Diff line number Diff line
@@ -20,16 +20,14 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <ListView

        android:id="@+id/alarms_list"

    <android.support.v7.widget.RecyclerView

        android:id="@+id/alarms_recycler_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingBottom="@dimen/button_footer_height"

        android:clipToPadding="false"

        android:descendantFocusability="beforeDescendants"

        android:divider="@null"

        android:dividerHeight="0dip"

        />

        android:fadingEdgeLength="0dp"

        android:scrollbarStyle="outsideOverlay"

        android:scrollbars="vertical" />



    <include layout="@layout/alarm_empty_view" />

res/layout/alarm_row.xml

+14 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 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.

-->



<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

res/layout/alarm_time_collapsed.xml

0 → 100644
+97 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 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.

-->



<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="?android:attr/selectableItemBackground"

    android:gravity="center_horizontal|top"

    android:orientation="vertical"

    android:paddingEnd="@dimen/alarm_side_padding"

    android:paddingStart="@dimen/alarm_side_padding">



    <include layout="@layout/alarm_time_summary" />



    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom">



        <View

            android:id="@+id/hairline"

            android:layout_width="match_parent"

            android:layout_height="@dimen/hairline_height"

            android:layout_gravity="bottom"

            android:layout_marginEnd="8dp"

            android:layout_marginStart="8dp"

            android:background="@color/hairline" />



        <com.android.deskclock.widget.EllipsizeLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="center_vertical"

            android:layout_marginEnd="@dimen/touch_target_min_size"

            android:gravity="center_vertical">



            <TextView

                android:id="@+id/label"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:ellipsize="none"

                android:paddingEnd="4dip"

                android:singleLine="true"

                android:textColor="@color/clock_gray"

                android:textSize="@dimen/alarm_text_font_size" />



            <TextView

                android:id="@+id/days_of_week"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:ellipsize="end"

                android:singleLine="true"

                android:textColor="@color/clock_white"

                android:textSize="@dimen/alarm_text_font_size"

                android:textStyle="bold" />



            <TextView

                android:id="@+id/upcoming_instance_label"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:ellipsize="end"

                android:singleLine="true"

                android:textColor="@color/clock_white"

                android:textSize="@dimen/alarm_text_font_size"

                android:textStyle="bold" />



        </com.android.deskclock.widget.EllipsizeLayout>



        <ImageButton

            android:id="@+id/arrow"

            android:layout_width="@dimen/touch_target_min_size"

            android:layout_height="@dimen/touch_target_min_size"

            android:layout_gravity="center_vertical|end"

            android:contentDescription="@string/expand_alarm"

            android:scaleType="center"

            android:src="@drawable/ic_expand_down" />



    </FrameLayout>



    <include

        android:id="@+id/preemptive_dismiss_container"

        layout="@layout/preemptive_dismiss" />



</LinearLayout>

res/layout/alarm_time.xml→res/layout/alarm_time_expanded.xml

+22 −109
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project

<!-- Copyright (C) 2015 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.
@@ -15,72 +15,38 @@ 
-->



<LinearLayout

    android:id="@+id/alarm_item"

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:dc="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="@dimen/alarm_side_padding"

    android:paddingEnd="@dimen/alarm_side_padding"

    android:background="@drawable/alarm_time_background"

    android:gravity="center_horizontal|top"

    android:orientation="vertical">

    <!-- TODO~: flatten this layout using gridLayout which supports layout_weight as of 21 -->



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/alarm_clock_vertical_margin"

        android:orientation="horizontal">



        <com.android.deskclock.widget.TextTime

            android:id="@+id/digital_clock"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="center"

            android:textColor="@color/clock_white"

            android:textSize="@dimen/alarm_time_font_size"

            android:fontFamily="sans-serif-thin"

            dc:format12Hour="@string/alarm_time_12_hours_format"

            dc:format24Hour="@string/clock_24_hours_format" />



        <Space

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1" />



        <android.support.v7.widget.SwitchCompat

            android:id="@+id/onoff"

            android:theme="@style/ControlAccentThemeOverlay"

            android:layout_width="wrap_content"

            android:layout_height="@dimen/touch_target_min_size"

            android:layout_gravity="center_vertical|end" />

    android:orientation="vertical"

    android:paddingEnd="@dimen/alarm_side_padding"

    android:paddingStart="@dimen/alarm_side_padding">



    </LinearLayout>

    <include layout="@layout/alarm_time_summary" />



    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



        <LinearLayout

            android:id="@+id/expand_area"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="bottom"

            android:layout_marginBottom="@dimen/collapse_expand_height"

            android:orientation="vertical"

            android:visibility="gone">

            android:orientation="vertical">



            <CheckBox

                android:id="@+id/repeat_onoff"

                android:layout_width="wrap_content"

                android:layout_height="48dip"

                android:layout_gravity="center_vertical|start"

                android:text="@string/alarm_repeat"

                android:textSize="@dimen/alarm_text_font_size"

                android:paddingStart="12dip"

                android:textColor="@color/clock_white" />

                android:text="@string/alarm_repeat"

                android:textColor="@color/clock_white"

                android:textSize="@dimen/alarm_text_font_size" />



            <!-- Day buttons are put here programmatically -->

            <LinearLayout

                android:id="@+id/repeat_days"

                android:layout_width="match_parent"
@@ -88,7 +54,6 @@ 
                android:layout_gravity="top"

                android:orientation="horizontal"

                android:visibility="gone" />

                <!-- Day buttons are put here programmatically -->



            <LinearLayout

                android:layout_width="match_parent"
@@ -104,17 +69,17 @@ 
                    android:layout_alignParentStart="true"

                    android:background="?android:attr/selectableItemBackground"

                    android:clickable="true"

                    android:paddingStart="4dip"

                    android:drawablePadding="16dp"

                    android:drawableStart="@drawable/ic_ringtone"

                    android:ellipsize="marquee"

                    android:gravity="center_vertical"

                    android:marqueeRepeatLimit="marquee_forever"

                    android:paddingStart="4dip"

                    android:scrollHorizontally="true"

                    android:singleLine="true"

                    android:textAlignment="viewStart"

                    android:textSize="@dimen/alarm_text_font_size"

                    android:textColor="@color/clock_white" />

                    android:textColor="@color/clock_white"

                    android:textSize="@dimen/alarm_text_font_size" />



                <CheckBox

                    android:id="@+id/vibrate_onoff"
@@ -123,10 +88,10 @@ 
                    android:layout_alignParentEnd="true"

                    android:layout_centerVertical="true"

                    android:includeFontPadding="false"

                    android:text="@string/alarm_vibrate"

                    android:paddingStart="16dip"

                    android:textSize="@dimen/alarm_text_font_size"

                    android:textColor="@color/white" />

                    android:text="@string/alarm_vibrate"

                    android:textColor="@color/white"

                    android:textSize="@dimen/alarm_text_font_size" />



            </LinearLayout>
@@ -143,8 +108,8 @@ 
                android:paddingStart="18dp"

                android:paddingTop="12dp"

                android:singleLine="true"

                android:textSize="@dimen/alarm_text_font_size"

                android:textColor="@color/white" />

                android:textColor="@color/white"

                android:textSize="@dimen/alarm_text_font_size" />



            <View

                android:layout_width="match_parent"
@@ -154,7 +119,7 @@ 
                android:background="@color/hairline" />



            <include

                android:id="@+id/preemptive_dismiss_expanded"

                android:id="@+id/preemptive_dismiss_container"

                layout="@layout/preemptive_dismiss" />



        </LinearLayout>
@@ -177,61 +142,13 @@ 
                android:scaleType="center"

                android:src="@drawable/ic_delete_small" />



            <View

                android:id="@+id/hairline"

                android:layout_width="match_parent"

                android:layout_height="@dimen/hairline_height"

                android:layout_gravity="bottom"

                android:layout_marginEnd="8dp"

                android:layout_marginStart="8dp"

                android:background="@color/hairline" />



            <com.android.deskclock.widget.EllipsizeLayout

                android:id="@+id/summary"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_gravity="center_vertical"

                android:layout_marginEnd="@dimen/touch_target_min_size"

                android:gravity="center_vertical">



                <TextView

                    android:id="@+id/label"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:ellipsize="none"

                    android:singleLine="true"

                    android:paddingEnd="4dip"

                    android:textSize="@dimen/alarm_text_font_size"

                    android:textColor="@color/clock_gray" />



                <TextView

                    android:id="@+id/daysOfWeek"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:ellipsize="end"

                    android:singleLine="true"

                    android:textSize="@dimen/alarm_text_font_size"

                    android:textStyle="bold"

                    android:textColor="@color/clock_white" />



                <TextView

                    android:id="@+id/tomorrowLabel"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:ellipsize="end"

                    android:singleLine="true"

                    android:textSize="@dimen/alarm_text_font_size"

                    android:textStyle="bold"

                    android:textColor="@color/clock_white" />



            </com.android.deskclock.widget.EllipsizeLayout>



            <ImageButton

                android:id="@+id/arrow"

                android:layout_width="@dimen/touch_target_min_size"

                android:layout_height="@dimen/touch_target_min_size"

                android:layout_gravity="center_vertical|end"

                android:contentDescription="@string/expand_alarm"

                android:rotation="@integer/chevron_rotate_180"

                android:scaleType="center"

                android:src="@drawable/ic_expand_down" />
@@ -239,8 +156,4 @@ 


    </FrameLayout>



    <include

        android:id="@+id/preemptive_dismiss_collapsed"

        layout="@layout/preemptive_dismiss" />



</LinearLayout>