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

Commit 6ca8c340 authored by Mohit Mali's avatar Mohit Mali
Browse files

fixed merge conflict on MR

parents d6c17ca4 af81c6c7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ stages:
- build

variables:
  GRADLE_VERSION: "gradle-4.10.2"
  GRADLE_VERSION: "gradle-5.4.1"
  GIT_SUBMODULE_STRATEGY: "recursive"

before_script:
+3 −3
Original line number Diff line number Diff line
[submodule "external/colorpicker"]
	path = external/colorpicker
	url = https://github.com/Etar-Group/android_frameworks_opt_colorpicker.git
	branch = master
	branch = rebase
[submodule "external/datetimepicker"]
	path = external/datetimepicker
	url = https://github.com/Etar-Group/android_frameworks_opt_datetimepicker.git
@@ -20,5 +20,5 @@
	branch = master
[submodule "external/chips"]
	path = external/chips
	url = https://github.com/Etar-Group/android_frameworks_opt_chips
	branch = master
	url = https://github.com/Etar-Group/android_frameworks_opt_chips.git
	branch = rebase
+4 −7
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="foundation.e.calendar"
    android:installLocation="auto"
    android:versionCode="17"
    android:versionName="1.0.15">
    android:versionCode="20"
    android:versionName="1.0.18">
<!--         android:sharedUserLabel="@string/app_label"> -->

    <!--
@@ -31,15 +31,12 @@

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
    <uses-permission android:name="android.permission.VIBRATE"/>
    <uses-permission android:name="android.permission.READ_CONTACTS"/>
    <uses-permission android:name="android.permission.READ_CALENDAR" />
    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.mail" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

    <application android:name="com.android.calendar.CalendarApplication"
@@ -189,7 +186,7 @@
        </activity>

        <provider
            android:name="android.support.v4.content.FileProvider"
            android:name="androidx.core.content.FileProvider"
            android:authorities="${applicationId}.provider"
            android:exported="false"
            android:grantUriPermissions="true">
+28 −23
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ buildscript {
    }

    dependencies {
        classpath 'com.android.tools.build:gradle:3.1.3'
        classpath 'com.android.tools.build:gradle:3.5.2'

    }
}

@@ -20,12 +21,12 @@ project(':external:calendar') {
    apply plugin: 'android-library'

    android {
        compileSdkVersion 27
        buildToolsVersion '27.0.3'
        compileSdkVersion 29
        buildToolsVersion '29.0.2'

        defaultConfig {
            minSdkVersion 19
            targetSdkVersion 27
            targetSdkVersion 29
        }

        sourceSets {
@@ -51,12 +52,12 @@ project(':external:colorpicker') {
    apply plugin: 'android-library'

    android {
        compileSdkVersion 27
        buildToolsVersion '27.0.3'
        compileSdkVersion 29
        buildToolsVersion '29.0.2'

        defaultConfig {
            minSdkVersion 19
            targetSdkVersion 27
            targetSdkVersion 29
        }

        sourceSets {
@@ -70,6 +71,10 @@ project(':external:colorpicker') {
                    assets.srcDirs = ['assets']
            }
        }

        lintOptions {
            abortOnError false
        }
    }
}

@@ -77,16 +82,16 @@ project(':external:datetimepicker') {
    apply plugin: 'android-library'

    dependencies {
        implementation 'com.android.support:support-v4:27.1.1'
        implementation 'androidx.legacy:legacy-support-v4:1.0.0'
    }

    android {
        compileSdkVersion 27
        buildToolsVersion '27.0.3'
        compileSdkVersion 29
        buildToolsVersion '29.0.2'

        defaultConfig {
            minSdkVersion 19
            targetSdkVersion 27
            targetSdkVersion 29
        }

        sourceSets {
@@ -111,16 +116,16 @@ project(':external:timezonepicker') {
    apply plugin: 'android-library'

    dependencies {
        implementation 'com.android.support:support-v4:27.1.1'
        implementation 'androidx.legacy:legacy-support-v4:1.0.0'
    }

    android {
        compileSdkVersion 27
        buildToolsVersion '27.0.3'
        compileSdkVersion 29
        buildToolsVersion '29.0.2'

        defaultConfig {
            minSdkVersion 19
            targetSdkVersion 27
            targetSdkVersion 29
        }

        sourceSets {
@@ -144,12 +149,12 @@ project(':external:chips') {
    apply plugin: 'android-library'

    android {
        compileSdkVersion 27
        buildToolsVersion '27.0.3'
        compileSdkVersion 29
        buildToolsVersion '29.0.2'

        defaultConfig {
            minSdkVersion 19
            targetSdkVersion 27
            targetSdkVersion 29
        }

        sourceSets {
@@ -174,8 +179,8 @@ project(':external:chips') {
apply plugin: 'com.android.application'

dependencies {
    implementation 'com.android.support:support-v4:27.1.1'
    implementation 'com.android.support:design:27.1.1'
    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
    implementation 'com.google.android.material:material:1.0.0'
    implementation project(':external:calendar')
    implementation project(':external:colorpicker')
    implementation project(':external:datetimepicker')
@@ -184,12 +189,12 @@ dependencies {
}

android {
    compileSdkVersion 27
    buildToolsVersion '27.0.3'
    compileSdkVersion 29
    buildToolsVersion '29.0.2'

    defaultConfig {
        minSdkVersion 19
        targetSdkVersion 27
        targetSdkVersion 29
    }

    useLibrary 'org.apache.http.legacy'
+0 −24
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>

<!--
  ~ Copyright (C) 2013 The Android Open Source Project
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
  ~ You may obtain a copy of the License at
  ~
  ~      http://www.apache.org/licenses/LICENSE-2.0
  ~
  ~ Unless required by applicable law or agreed to in writing, software
  ~ distributed under the License is distributed on an "AS IS" BASIS,
  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License
  -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_enabled="false"
          android:color="@color/done_text_color_disabled"/>
    <item
          android:color="@android:color/black"/>
</selector>
Loading