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

Commit 813fa19e authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes I005af1af,I4867aab1,Ibd7ee399,I61296722,I35a3a46f, ... 

* changes:
  Enforce lint MissingClass and fix usages
  Enforce lint RtlHardcoded and fix usages
  Enforce lint UseValueOf and fix usages
  Enforce lint UseSparseArrays and fix usages
  Enforce lint ObsoleteSdkInt and fix usages
  Enforce lint Recycle and fix usages
  Fix manifest and enforce lint EXTRA_TEXT
parents 496f28ad ee025d8c

android/app/Android.bp

+10 −1
Original line number Diff line number Diff line
@@ -257,7 +257,16 @@ android_app { 
    javacflags: ["-Aroom.schemaLocation=packages/modules/Bluetooth/android/app/tests/unit/src/com/android/bluetooth/btservice/storage/schemas"],



    lint: {

        error_checks: ["NewApi"],

        error_checks: [

            "ExtraText",

            "MissingClass",

            "NewApi",

            "ObsoleteSdkInt",

            "Recycle",

            "RtlHardcoded",

            "UseSparseArrays",

            "UseValueOf",

        ],

        strict_updatability_linting: true,

    },

android/app/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ 
             android:process="@string/process"

             android:excludeFromRecents="true"

             android:theme="@style/dialog"

             android:enabled="false">>

             android:enabled="false">

        </activity>

        <activity android:name="com.android.bluetooth.opp.BluetoothOppBtEnablingActivity"

             android:process="@string/process"

android/app/lint-baseline.xml

+18 −378

File changed.

Preview size limit exceeded, changes collapsed.

android/app/res/layout/bluetooth_map_settings_account_group.xml

+4 −4
Original line number Diff line number Diff line
@@ -24,22 +24,22 @@ 
        android:id="@+id/bluetooth_map_settings_group_icon"

        android:layout_width="64dp"

        android:layout_height="64dp"

        android:layout_alignParentLeft="true"

        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true"

        android:maxWidth="64dp"

        android:maxHeight="64dp"

        android:layout_marginLeft="30dp"

        android:layout_marginStart="30dp"

         />

    <TextView

        android:id ="@+id/bluetooth_map_settings_group_text_view"

        android:layout_width ="wrap_content"

        android:layout_height ="wrap_content"

        android:layout_toRightOf="@id/bluetooth_map_settings_group_icon"/>

        android:layout_toEndOf="@id/bluetooth_map_settings_group_icon"/>

    <CheckBox

        android:id ="@+id/bluetooth_map_settings_group_checkbox"

        android:layout_width ="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentRight="true"

        android:layout_alignParentEnd="true"

        android:layout_centerVertical="true"

        android:focusable="false"/>

android/app/res/layout/bluetooth_map_settings_account_item.xml

+5 −5
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
    android:clickable="true"

    android:gravity="fill_vertical"

    android:orientation="horizontal"

    android:paddingLeft="51dp"

    android:paddingRight="25dp"

    android:paddingEnd="51dp"

    android:paddingStart="25dp"

    tools:context=".BluetoothMapSettings" android:baselineAligned="false">



        <TextView
@@ -31,13 +31,13 @@ 
            android:layout_width="match_parent"

            android:layout_height="51dp"

            android:layout_weight="1"

            android:gravity="left|center_vertical"/>

            android:gravity="start|center_vertical"/>



        <CheckBox

            android:id="@+id/bluetooth_map_settings_item_check"

            android:layout_width="110dp"

            android:layout_height="51dp"

            android:layout_gravity="right"

            android:layout_gravity="end"

            android:layout_weight="2"

            android:gravity="right|center_vertical" />

            android:gravity="end|center_vertical" />

</LinearLayout>