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

Commit 8ddb8126 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch 'r_aosp_theming_epics_231' into 'v1-r' 

R aosp theming epics 231

See merge request !22
parents 430d7448 accb88fa

app/proguard-rules.pro

+0 −1
Original line number Diff line number Diff line
@@ -15,4 +15,3 @@ 
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {

#   public *;

#}
 
-dontwarn lineageos.**

app/src/main/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -33,9 +33,8 @@ android_app { 
        "androidx.appcompat_appcompat",

        "androidx.recyclerview_recyclerview",

        "com.google.android.material_material",

        "org.lineageos.platform.sdk",

    ],



    platform_apis: true,

    sdk_version: "current",



}

app/src/main/java/org/lineageos/recorder/DialogActivity.java

+5 −5
Original line number Diff line number Diff line
@@ -18,19 +18,19 @@ package org.lineageos.recorder; 
import android.Manifest;

import android.content.pm.PackageManager;

import android.os.Bundle;

import android.widget.Switch;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.appcompat.app.AlertDialog;

import androidx.appcompat.app.AppCompatActivity;

import androidx.appcompat.widget.SwitchCompat;



import org.lineageos.recorder.utils.Utils;



public class DialogActivity extends AppCompatActivity {

    private static final int REQUEST_LOCATION_PERMS = 214;



    private SwitchCompat mLocationSwitch;

    private Switch mLocationSwitch;



    @Override

    protected void onCreate(@Nullable Bundle savedInstance) {
@@ -51,7 +51,7 @@ public class DialogActivity extends AppCompatActivity { 
        if (mLocationSwitch != null) {

            setupLocationSwitch(mLocationSwitch, isRecording);

        }

        final SwitchCompat highQualitySwitch = dialog.findViewById(

        final Switch highQualitySwitch = dialog.findViewById(

                R.id.dialog_content_settings_high_quality_switch);

        if (highQualitySwitch != null) {

            setupHighQualitySwitch(highQualitySwitch, isRecording);
@@ -101,7 +101,7 @@ public class DialogActivity extends AppCompatActivity { 
        overridePendingTransition(0, android.R.anim.fade_out);

    }



    private void setupLocationSwitch(@NonNull SwitchCompat locationSwitch,

    private void setupLocationSwitch(@NonNull Switch locationSwitch,

                                     boolean isRecording) {

        final boolean tagWithLocation;

        if (Utils.getTagWithLocation(this)) {
@@ -135,7 +135,7 @@ public class DialogActivity extends AppCompatActivity { 
        }

    }



    private void setupHighQualitySwitch(@NonNull SwitchCompat highQualitySwitch,

    private void setupHighQualitySwitch(@NonNull Switch highQualitySwitch,

                                        boolean isRecording) {

        final boolean highQuality = Utils.getRecordInHighQuality(this);

        highQualitySwitch.setChecked(highQuality);

app/src/main/java/org/lineageos/recorder/RecorderActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ public class RecorderActivity extends AppCompatActivity implements 
            }

        } else {

            mRecordingText.setText(getString(R.string.main_sound_action));

            mSoundFab.setImageResource(lineageos.platform.R.drawable.ic_mic);

            mSoundFab.setImageResource(R.drawable.ic_action_record);

            mRecordingVisualizer.setVisibility(View.INVISIBLE);

            mPauseResume.setVisibility(View.GONE);

            if (mSoundService != null) {

app/src/main/res/drawable/ic_delete.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ 
    android:viewportHeight="24"

    android:viewportWidth="24">

    <path

        android:fillColor="?android:attr/colorAccent"

        android:fillColor="?android:attr/textColorPrimary"

        android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z"/>

</vector>