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

Commit 4c68a4b7 authored by Sam Blitzstein's avatar Sam Blitzstein
Browse files

Use Keep's StaggeredGridView for timers. 

Also update header and background layouts.

Bug: 10516184
Change-Id: Ibe73ce965acb11796c21e9df4b35e6bb830aabb3
parent e55e149c

res/layout/clock_fragment.xml

+36 −43
Original line number Diff line number Diff line
@@ -15,15 +15,9 @@ 
-->



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

    android:id="@+id/clock_background"

    android:layout_width="match_parent"

    android:background="@drawable/blackish_transition"

    android:layout_height="match_parent" >

    <FrameLayout

        android:id="@+id/clock_foreground"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

        android:background="@drawable/blackish_transition" >

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

    <ListView

        android:id="@+id/cities"

        android:clickable="false"
@@ -61,4 +55,3 @@ 
            android:layout_height="@dimen/footer_button_size" />

    </FrameLayout>

</FrameLayout>
 
</FrameLayout>

res/layout/timer_alert_full_screen.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
    android:id="@+id/fragment_container"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@color/black"/>
 
    android:background="@color/blackish"/>

res/layout/timer_fragment.xml

+5 −3
Original line number Diff line number Diff line
@@ -16,19 +16,21 @@ 
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">

    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">

        <ListView

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

            android:id="@+id/timers_list"

            android:divider="@null"

            android:dividerHeight="@dimen/timer_divider_height"

            android:layout_width="match_parent"

            android:layout_height="match_parent"/>

            android:layout_height="match_parent"

            android:paddingBottom="88dp"/>

        <FrameLayout

            android:id="@+id/timer_footer"

            android:background="@drawable/footer_bg"

res/values-sw600dp-land/config.xml

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

<!--

/*

** Copyright 2013, 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.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <item type="integer" name="timer_column_count">2</item>

</resources>

res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,4 +23,5 @@ 
    <bool name="config_requiresScreenSaver">true</bool>

    <bool name="config_dockAppEnabled">true</bool>

    <bool name="config_rotateAlarmAlert">false</bool>

    <item type="integer" name="timer_column_count">1</item>

</resources>