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

Commit 02f58a0d authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

Merge branch 'epic13-s-bringup' into 'v1-s' 

Dialer: Setup CI to update from upstream

See merge request e/os/android_packages_apps_Dialer!72
parents 5447a596 bc838239

.gitlab-ci.yml

0 → 100644
+7 −0
Original line number Diff line number Diff line 
stages:

  - update-from-upstream



include:

  - project: 'e/templates'

    ref: master

    file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml'

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
  <uses-permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>

  <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>

  <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>

  <uses-permission android:name="android.permission.DIALER_ORIGIN"/>



  <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/>

  <!-- We use this to disable the status bar buttons of home, back and recent

java/com/android/dialer/about/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
  <string name="privacy_policy_label">Privacy policy</string>



  <!-- URL for privacy policy -->

  <string name="privacy_policy_url" translatable="false">http://www.google.com/policies/privacy</string>

  <string name="privacy_policy_url" translatable="false">https://e.foundation/legal-notice-privacy/</string>



  <!-- Label shown on the About Phone screen for the terms of service option [CHAR LIMIT=50]-->

  <string name="terms_of_service_label">Terms of service</string>
@@ -34,6 +34,6 @@ 
  <string name="terms_of_service_key" translatable="false">terms_of_service</string>



  <!-- URL for terms of service -->

  <string name="terms_of_service_url" translatable="false">http://www.google.com/policies/terms</string>

  <string name="terms_of_service_url" translatable="false">https://e.foundation/legal-notice-privacy/</string>



</resources>

java/com/android/dialer/app/res/layout/search_edittext.xml

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
      android:clickable="true"

      android:contentDescription="@string/description_start_voice_search"

      android:scaleType="center"

      android:visibility="gone"

      android:src="@drawable/ic_mic_grey600"

      android:tint="?colorIcon"/>

java/com/android/dialer/backup/AndroidManifest.xml

+1 −8
Original line number Diff line number Diff line
@@ -15,11 +15,4 @@ 
 -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.dialer.backup">





  <!-- Android backup service key -->

  <!-- https://developer.android.com/google/backup/signup.html -->

  <meta-data

      android:name="com.google.android.backup.api_key"

      android:value="AEdPqrEAAAAIn3-Y3JKit1mrzfvcdbVhUiJn2ICtKfhGYLy0Bg"/>

</manifest>