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

Commit 73b515c2 authored by Jorge Ruesga's avatar Jorge Ruesga Committed by Gerrit Code Review
Browse files

Merge "CMFM: Fix association dialog layout" into cm-11.0

parents 92a6d7c3 8003d529

res/layout/associations_dialog.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
        android:stretchMode="columnWidth"

        android:scrollbars="vertical"

        android:horizontalSpacing="@dimen/default_margin"

        android:numColumns="3" />

        android:numColumns="@integer/associations_items_per_row" />



    <CheckBox android:id="@+id/associations_remember"

        android:layout_width="match_parent"

res/layout/associations_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
      android:layout_height="wrap_content"

      android:layout_alignParentBottom="true"

      android:textAppearance="@style/secondary_text_appearance"

      android:paddingBottom="@dimen/default_margin"

      android:layout_margin="@dimen/default_margin"

      android:gravity="center"

      android:textStyle="bold"

      android:singleLine="true"

res/values-sw600dp/integers.xml

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

<!--

     Copyright (C) 2012-2013 The CyanogenMod 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Association items per row -->

    <integer name="associations_items_per_row">5</integer>

</resources>

res/values-sw720dp/integers.xml

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

<!--

     Copyright (C) 2012-2013 The CyanogenMod 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Association items per row -->

    <integer name="associations_items_per_row">6</integer>

</resources>

res/values/integers.xml

+3 −0
Original line number Diff line number Diff line
@@ -27,4 +27,7 @@ 


    <!-- Normal edit text sise -->

    <integer name="default_edit_text_ems">8</integer>



    <!-- Association items per row -->

    <integer name="associations_items_per_row">3</integer>

</resources>