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

Commit 61619eee authored by Isaac Katzenelson's avatar Isaac Katzenelson
Browse files

Layout changes for widget 

Bug: 7390795

Pinned clock to the top instead of centering it.
Removed the "loading" message since it was creating jank.
Removed extra left padding from left world clock

Change-Id: I744f0bac3bf96065dfd6fc88f45cdeab2c2e32ba
parent eff8529d

res/layout/appwidget_loading.xml

deleted100644 → 0
+0 −26
Original line number Original line 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.

-->



<!-- loading message for the digital widget -->

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

    android:text="@string/widget_loading_ms"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:singleLine="true"

    android:ellipsize="none"

    android:layout_gravity="center"

    style="@style/small_light"

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

res/layout/digital_appwidget.xml

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

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

    android:id="@+id/digital_appwidget"

    android:id="@+id/digital_appwidget"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="match_parent"

    android:layout_gravity="center_horizontal|top"

    android:orientation="vertical">

    android:orientation="vertical">





    <include layout="@layout/digital_widget_time"

    <include layout="@layout/digital_widget_time"

        android:id="@+id/digital_clock"

        android:id="@+id/digital_clock"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:layout_gravity="center_horizontal|top"

         />

         />





      <ListView

      <ListView

          android:id="@+id/digital_appwidget_listview"

          android:id="@+id/digital_appwidget_listview"

          android:layout_width="match_parent"

          android:layout_width="match_parent"

          android:layout_height="wrap_content"

          android:layout_height="wrap_content"

          android:layout_gravity="center"

          android:layout_gravity="center_horizontal|top"

          android:layout_marginTop="12dip"

          android:layout_marginTop="12dip"

          android:divider="@null" />

          android:divider="@null" />

</LinearLayout>
 
</LinearLayout>

res/layout/world_clock_remote_list_item.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ 
            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:layout_gravity="center"

            android:layout_marginLeft="8dip"

            android:gravity="center" >

            android:gravity="center" >





            <TextView

            <TextView

src/com/android/alarmclock/DigitalWidgetViewsFactory.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -148,8 +148,7 @@ public class DigitalWidgetViewsFactory extends BroadcastReceiver implements Remo 




    @Override

    @Override

    public RemoteViews getLoadingView() {

    public RemoteViews getLoadingView() {

        RemoteViews views = new RemoteViews(mContext.getPackageName(), R.layout.appwidget_loading);

        return null;

        return views;

    }

    }





    @Override

    @Override