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

Commit dae2b315 authored by Michael Jurka's avatar Michael Jurka Committed by Android Git Automerger
Browse files

am f31af7d1: am ef2b86b4: am a487bca4: Updated layouts for keyguard widget picker 

* commit 'f31af7d1':
  Updated layouts for keyguard widget picker
parents e2d65f1d f31af7d1

res/layout/keyguard_appwidget_item.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -24,8 +24,8 @@ 
    android:background="@drawable/appwidget_item_bg"

    android:background="@drawable/appwidget_item_bg"

    android:layout_marginTop="2dip"

    android:layout_marginTop="2dip"

    android:layout_marginBottom="2dip"

    android:layout_marginBottom="2dip"

    android:layout_marginLeft="8dip"

    android:layout_marginLeft="2dip"

    android:layout_marginRight="8dip"

    android:layout_marginRight="2dip"

    android:paddingLeft="16dip"

    android:paddingLeft="16dip"

    android:paddingRight="16dip"

    android:paddingRight="16dip"

    android:paddingTop="16dip"

    android:paddingTop="16dip"
@@ -37,11 +37,11 @@ 
       android:scaleType="center" />

       android:scaleType="center" />

      <TextView

      <TextView

       android:id="@+id/label"

       android:id="@+id/label"

       style="@style/KeyguardAppWidgetItem"

       android:layout_width="match_parent"

       android:layout_width="match_parent"

       android:layout_height="match_parent"

       android:layout_height="match_parent"

       android:paddingLeft="24dip"

       android:paddingLeft="24dip"

       android:paddingBottom="8dip"

       android:paddingBottom="8dip"

       android:textAppearance="?android:attr/textAppearanceMedium"

       android:gravity="left|bottom" />

       android:gravity="left|bottom" />

  </LinearLayout>

  </LinearLayout>

</FrameLayout>
 
</FrameLayout>

res/layout/keyguard_appwidget_pick_layout.xml→res/layout/keyguard_appwidget_picker_layout.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -18,12 +18,16 @@ 
        android:id="@+id/layout_root"

        android:id="@+id/layout_root"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="match_parent"

        android:layout_marginLeft="@dimen/keyguard_appwidget_picker_margin_left"

        android:layout_marginRight="@dimen/keyguard_appwidget_picker_margin_right"

        android:paddingTop="2dip"

        android:paddingTop="2dip"

        android:paddingBottom="2dip"

        android:paddingBottom="2dip"

        android:orientation="vertical" >

        android:orientation="vertical" >

  <GridView android:layout_width="match_parent"

  <GridView android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_height="0dp"

            android:layout_weight="1"

            android:layout_weight="1"

            android:numColumns="@integer/keyguard_appwidget_picker_cols"

            android:layout_gravity="center_horizontal"

            android:listSelector="@android:color/transparent"

            android:listSelector="@android:color/transparent"

            android:id="@+id/widget_list" />

            android:id="@+id/widget_list" />

</LinearLayout>
 
</LinearLayout>

res/values-land/dimens.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -17,4 +17,9 @@ 
<resources>

<resources>

    <dimen name="appwidget_width">421dip</dimen>

    <dimen name="appwidget_width">421dip</dimen>

    <dimen name="appwidget_height">68dip</dimen>

    <dimen name="appwidget_height">68dip</dimen>

    <dimen name="appwidget_preview_width">120dip</dimen>

    <dimen name="appwidget_preview_height">70dip</dimen>

    <dimen name="keyguard_appwidget_picker_margin_left">2dip</dimen>

    <dimen name="keyguard_appwidget_picker_margin_right">2dip</dimen>

    <integer name="keyguard_appwidget_picker_cols">2</integer>

</resources>
 
</resources>

res/values-land/styles.xml

0 → 100644
+21 −0
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.

-->



<resources>

    <style name="KeyguardAppWidgetItem">

        <item name="android:textSize">16sp</item>

    </style>

</resources>

res/values-sw600dp-land/dimens.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -18,4 +18,6 @@ 
    <dimen name="screen_margin_sides">128dip</dimen>

    <dimen name="screen_margin_sides">128dip</dimen>

    <dimen name="screen_margin_top">72dip</dimen>

    <dimen name="screen_margin_top">72dip</dimen>

    <dimen name="screen_margin_bottom">48dip</dimen>

    <dimen name="screen_margin_bottom">48dip</dimen>

    <dimen name="appwidget_preview_height">80dip</dimen>

    <dimen name="keyguard_appwidget_picker_width">720dip</dimen>

</resources>
 
</resources>