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

Commit 9944e673 authored by rachelzhang's avatar rachelzhang Committed by Android (Google) Code Review
Browse files

Merge "Adding new layout files for timer UX" into lmp-dev

parents 021fba3a 88864203

res/layout-land/timer_fragment.xml

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

<!-- 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.

-->



<FrameLayout

    android:id="@+id/timers_list_page"

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:paddingTop="32dip"

    android:baselineAligned="false">



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



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



</FrameLayout>
 
 No newline at end of file

res/layout/timer_full_screen_fragment.xml

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

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

-->



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

             android:layout_width="match_parent"

             android:layout_height="match_parent"

             android:orientation="vertical"

             android:paddingTop="?android:attr/actionBarSize">



    <FrameLayout

        android:id="@+id/timers_list_page"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">



        <com.android.deskclock.widget.sgv.StaggeredGridView

            android:id="@+id/timers_list"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:divider="@null"

            android:dividerHeight="@dimen/timer_divider_height"

            android:paddingBottom="88dp"/>



        <ImageButton

            android:id="@+id/fab"

            android:layout_width="@dimen/footer_button_size"

            android:layout_height="@dimen/footer_button_size"

            android:layout_gravity="center_horizontal|bottom"

            android:layout_margin="@dimen/footer_button_layout_margin"

            android:background="@drawable/floating_action_button"

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



    </FrameLayout>



    <com.android.deskclock.TimerSetupView

        android:id="@+id/timer_setup"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginEnd="16dip"

        android:layout_marginStart="16dip"/>



</FrameLayout>

res/layout/timer_setup_view.xml

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

<!-- 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.

-->



<com.android.deskclock.TimerSetupView

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

    android:id="@+id/timer_setup"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_margin="16dip" />

res/layout/timer_timer_view.xml

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

<!-- 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.

-->



<FrameLayout

    android:id="@+id/timer_view"

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="horizontal">



    <LinearLayout

        android:id="@+id/page_indicators"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_gravity="end|center_vertical"

        android:gravity="center"

        android:orientation="vertical">



        <ImageView

            android:id="@+id/page_indicator0"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:scaleType="center"/>



        <ImageView

            android:id="@+id/page_indicator1"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>



        <ImageView

            android:id="@+id/page_indicator2"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>



        <ImageView

            android:id="@+id/page_indicator3"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>



        <Space

            android:layout_width="match_parent"

            android:layout_height="@dimen/footer_button_size"

            android:layout_margin="@dimen/footer_button_layout_margin"/>



    </LinearLayout>



    <view

        android:id="@+id/vertical_view_pager"

        class="com.android.deskclock.VerticalViewPager"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



</FrameLayout>