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

Commit 454853a1 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '94-UI_improvement' into 'master'

94 - UI Improvement

See merge request !23
parents 907110bd 9298a86c
Loading
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ android {
    compileSdkVersion 29
    compileOptions.encoding = 'UTF-8'

    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }

    defaultConfig {
        applicationId "foundation.e.camera"
        minSdkVersion 21
@@ -19,6 +24,10 @@ android {
    }

    buildTypes {
        debug {
            applicationIdSuffix ".debug"
        }

        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
@@ -46,6 +55,7 @@ android {
dependencies {
    compileOnly files("../e-ui-sdk.jar")
    //noinspection GradleCompatible
    implementation 'com.android.support:support-v4:28.0.0'
    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
    implementation "androidx.constraintlayout:constraintlayout:2.1.3"
    testImplementation 'junit:junit:4.13'
}
+1 −3
Original line number Diff line number Diff line
package net.sourceforge.opencamera.test;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.IOException;
import java.text.SimpleDateFormat;
@@ -59,7 +57,7 @@ import android.os.Environment;
import android.preference.PreferenceManager;
import android.provider.MediaStore;
import android.renderscript.Allocation;
import android.support.annotation.RequiresApi;
import androidx.annotation.RequiresApi;
import android.test.ActivityInstrumentationTestCase2;
import android.test.TouchUtils;
import android.util.Log;
+5 −5
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@
        <activity
            android:name="net.sourceforge.opencamera.TakePhoto"
            android:label="@string/take_photo"
            android:icon="@drawable/ic_launcher_take_photo"
            android:icon="@mipmap/ic_launcher"
            android:screenOrientation="landscape"
            android:configChanges="orientation|screenSize|keyboardHidden"
            android:taskAffinity=""
@@ -110,7 +110,7 @@
        </receiver> 
        <!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
        <receiver
            android:icon="@drawable/ic_launcher_take_photo"
            android:icon="@mipmap/ic_launcher"
            android:label="@string/take_photo"
            android:name="net.sourceforge.opencamera.MyWidgetProviderTakePhoto" >
            <intent-filter >
@@ -123,7 +123,7 @@
        <!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
        <service
            android:name="net.sourceforge.opencamera.MyTileService"
            android:icon="@lineageos.platform:drawable/ic_camera_photo"
            android:icon="@drawable/ic_switch_camera"
            android:label="@string/camera"
            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
            <intent-filter>
@@ -133,7 +133,7 @@
        <!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
        <service
            android:name="net.sourceforge.opencamera.MyTileServiceVideo"
            android:icon="@drawable/ic_videocam_white_48dp"
            android:icon="@drawable/ic_switch_video"
            android:label="@string/record_video"
            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
            <intent-filter>
@@ -143,7 +143,7 @@
        <!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
        <service
            android:name="net.sourceforge.opencamera.MyTileServiceFrontCamera"
            android:icon="@drawable/ic_face_white_48dp"
            android:icon="@drawable/ic_face"
            android:label="@string/selfie"
            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
            <intent-filter>
+1 −3
Original line number Diff line number Diff line
package net.sourceforge.opencamera;

import java.io.File;
import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -24,7 +22,7 @@ import android.renderscript.Script;
import android.renderscript.ScriptIntrinsicHistogram;
//import android.renderscript.ScriptIntrinsicResize;
import android.renderscript.Type;
import android.support.annotation.RequiresApi;
import androidx.annotation.RequiresApi;
import android.util.Log;

public class HDRProcessor {
+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import android.net.Uri;
import android.os.Build;
import android.os.ParcelFileDescriptor;
import android.renderscript.Allocation;
import android.support.annotation.RequiresApi;
import androidx.annotation.RequiresApi;
import android.util.Log;
import android.util.Xml;

Loading