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

Commit 814c5449 authored by Romain Hunault's avatar Romain Hunault
Browse files

Fix build issues

parent c2824695
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ stages:

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

before_script:
- export GRADLE_USER_HOME=$(pwd)/.gradle
@@ -12,7 +13,6 @@ before_script:
- unzip /gradle.zip -d /gradle
- PATH="$PATH:/gradle/${GRADLE_VERSION}/bin"
- JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS} -Dfile.encoding=UTF8"
- git submodule update --recursive --init --remote
- gradle dependencies

cache:

res/values/standalone_strings.xml

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2006 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.
-->
<resources>
     <string name="standalone_app_label">Calendar</string>

</resources>
+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- This is the app label used for alert notifications -->
    <string name="standalone_app_label" translatable="false">Etar</string>
    <string name="standalone_app_label" translatable="false">Calendar</string>
    <!-- This is the label underneath the icon for Calendar -->
    <string name="app_label">Calendar</string>

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ import android.preference.PreferenceFragment;
import android.preference.PreferenceManager;
import android.preference.PreferenceScreen;

import ws.xsoh.etar.R;
import foundation.e.calendar.R;


public class ViewDetailsPreferences extends PreferenceFragment {