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

Commit eab5b2fe authored by Jackson Fan's avatar Jackson Fan Committed by Jaikumar Ganesh
Browse files

Cleanup resources of OPP 

Modify according to Ranian's comments
- adjust layout
- remove Capitalized resource names
- format
parent db50bb44

android/app/res/layout/bluetooth_pin_entry.xml

+2 −3
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ 
    android:layout_width="fill_parent">



    <LinearLayout

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

        android:layout_height="fill_parent"

        android:layout_height="wrap_content"

        android:layout_width="fill_parent"

        android:orientation="vertical">

android/app/res/layout/bt_enabling_progress.xml

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
        android:id="@+id/progress_info"

        android:layout_height="fill_parent"

        android:layout_width="wrap_content"

        android:layout_marginLeft="10px"

        android:gravity="left"

        android:layout_marginLeft="10dip"

    />



 </LinearLayout>

android/app/res/layout/confirm_dialog.xml

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

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

    android:orientation="vertical"

    android:layout_width="fill_parent"

    android:layout_height="fill_parent"

    >



    <TextView

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

    android:id="@+id/content"

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:text="@string/hello"

    android:layout_marginLeft="10dip"

/>

</LinearLayout>

android/app/res/layout/file_transfer.xml

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



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

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

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:gravity="center_horizontal"

    android:orientation="vertical">





    <TextView

        android:id="@+id/line1_view"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_marginLeft="6px"

        android:layout_marginLeft="6dip"

        android:textSize="16sp"

        android:text="@string/download_line1" />
@@ -19,7 +17,7 @@ 
        android:id="@+id/line2_view"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_marginLeft="6px"

        android:layout_marginLeft="6dip"

        android:textSize="16sp"

        android:text="@string/download_line2" />
@@ -27,7 +25,7 @@ 
        android:id="@+id/line3_view"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_marginLeft="6px"

        android:layout_marginLeft="6dip"

        android:textSize="16sp"

        android:text="@string/download_line3" />
@@ -35,7 +33,7 @@ 
        android:id="@+id/line4_view"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_marginLeft="6px"

        android:layout_marginLeft="6dip"

        android:textSize="16sp"

        android:text="@string/download_line4" />
@@ -47,7 +45,7 @@ 
        android:textSize="16sp"

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



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

    <LinearLayout

        android:orientation="horizontal"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent"
@@ -57,19 +55,18 @@ 
            android:id="@+id/progress_percent"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

        android:layout_marginLeft="10px"

        android:gravity="left"

        />

            android:layout_marginLeft="10dip"

            android:gravity="left"/>



        <ProgressBar android:id="@+id/progress_transfer"

            style="?android:attr/progressBarStyleHorizontal"

        android:layout_marginLeft="10px"

        android:layout_marginRight="10px"

        android:layout_width="fill_parent"

            android:layout_marginLeft="10dip"

            android:layout_marginRight="10dip"

            android:layout_width="0dip"

            android:layout_weight="1"

            android:layout_height="wrap_content"

            android:max="100"

            android:progress="100" />



    </LinearLayout>



</TableLayout>
 
</LinearLayout>

android/app/res/layout/preference_progress_category.xml

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



<!-- Layout used for ProgressCategory in bluetooth settings. -->

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

    android:layout_width="fill_parent"

    android:layout_height="27dip"

    android:background="@*android:drawable/settings_header">

    style="?android:attr/listSeparatorTextViewStyle">



    <!-- This and the other text view have the style of the list separator text view without the background and padding -->

    <TextView 

        android:id="@+android:id/title"

        style="?android:attr/listSeparatorTextViewStyle"

        android:background="@null"

        android:paddingLeft="0dip"

        android:id="@+android:id/title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentLeft="true"

        android:layout_centerVertical="true"

    />



    <ProgressBar
@@ -23,13 +27,14 @@ 
        />



    <TextView 

        style="?android:attr/listSeparatorTextViewStyle"

        android:background="@null"

        android:paddingLeft="0dip"

        android:id="@+id/scanning_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerVertical="true"

        android:layout_toLeftOf="@id/scanning_progress"

        android:textSize="18sp"

        android:textColor="@android:color/primary_text_light"

        android:layout_marginRight="5sp"

        android:text="@string/progress_scanning"

        />