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

Commit 3ca81566 authored by Timi Rautamäki's avatar Timi Rautamäki
Browse files

SUW: use Gliflayout descriptions 

Set description via getGlifLayout().setDescriptionText instead of
writing it in layout to display it properly in two columns when
in landscape. No visual change in portrait.

Change-Id: I7465a7fbc5819d429bb886a5582fb1f1d4db9a47
parent 3d7c8284

res/layout-land/sim_missing_page.xml

+1 −9
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2015 The CyanogenMod Project

     Copyright (C) 2017-2021 The LineageOS Project

                   2017-2022 The LineageOS Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -39,14 +39,6 @@ 
                android:layout_height="match_parent"

                style="@style/SudContentFrame">



                <TextView

                    android:layout_width="0px"

                    android:layout_height="match_parent"

                    android:layout_weight="1"

                    android:id="@+id/sim_missing"

                    android:text="@string/sim_missing_summary"

                    style="@style/SudItemTitle.GlifDescription" />



                <ImageView

                    android:id="@+id/sim_slot_image"

                    android:layout_width="0px"

res/layout/intro_restore_activity.xml

+3 −23
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2015 The CyanogenMod Project

     Copyright (C) 2017-2021 The LineageOS Project

                   2017-2022 The LineageOS Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -28,30 +28,10 @@ 
        android:layout_height="match_parent"

        style="@style/SudContentFrame">



        <FrameLayout android:id="@+id/page"

        <View android:id="@+id/page"

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1">



            <ScrollView android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:fillViewport="true">



                <LinearLayout

                    android:orientation="vertical"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content">



                    <TextView

                        android:id="@+id/intro_restore_subtitle"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:text="@string/intro_restore_subtitle"

                        style="@style/SudItemTitle.GlifDescription" />



                </LinearLayout>

            </ScrollView>

        </FrameLayout>

            android:layout_weight="1"/>



        <org.lineageos.setupwizard.NavigationLayout

            android:id="@+id/navigation_bar"

res/layout/setup_datetime_page.xml

+1 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2013 The CyanogenMod Project

     Copyright (C) 2017-2021 The LineageOS Project

                   2017-2022 The LineageOS Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -44,12 +44,6 @@ 
                    android:layout_width="match_parent"

                    android:layout_height="wrap_content">



                    <TextView

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:text="@string/date_time_summary"

                        style="@style/SudItemTitle.GlifDescription" />



                    <Spinner

                        android:id="@+id/timezone_list"

                        android:layout_width="match_parent"

res/layout/setup_lineage_settings.xml

+0 −15
Original line number Diff line number Diff line
@@ -44,21 +44,6 @@ 
                    android:layout_width="match_parent"

                    android:layout_height="match_parent">



                    <!-- The caption about privacy policy -->

                    <TextView

                        android:id="@+id/privacy_policy"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        style="@style/SudItemTitle.GlifDescription"

                        android:text="@string/services_pp_explanation" />



                    <TextView

                        android:id="@+id/find_privacy_policy"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        style="@style/SudItemTitle.GlifDescription"

                        android:text="@string/services_find_privacy_policy" />



                    <!-- Whether or not to enable metrics -->

                    <LinearLayout

                        android:id="@+id/metrics"

res/layout/setup_lockscreen.xml

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

<!--

     Copyright (C) 2015 The CyanogenMod Project

     Copyright (C) 2017-2021 The LineageOS Project

                   2017-2022 The LineageOS Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -28,31 +28,10 @@ 
        android:layout_height="match_parent"

        style="@style/SudContentFrame">



        <FrameLayout android:id="@+id/page"

        <View android:id="@+id/page"

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1">



            <ScrollView android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:fillViewport="true">



                <LinearLayout

                    android:orientation="vertical"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:paddingStart="@dimen/content_margin_left"

                    android:paddingEnd="@dimen/content_margin_left">



                    <TextView

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:text="@string/lockscreen_setup_summary"

                        style="@style/SudItemTitle.GlifDescription" />



                </LinearLayout>

            </ScrollView>

        </FrameLayout>

            android:layout_weight="1"/>



        <org.lineageos.setupwizard.NavigationLayout

            android:id="@+id/navigation_bar"