Commit 21675677 authored by Romain Hunault's avatar Romain Hunault

Call to Synchronizer

parent f85e7bb9
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2017 The LineageOS 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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="512dp"
android:height="320dp"
android:viewportWidth="512"
android:viewportHeight="320">
<path
android:fillColor="@color/accent"
android:pathData="M157.89,271.64a1.83,1.83,0,0,1-1.89-1.89V248.42h4.65v19.32H171v3.9Z" />
<path
android:fillColor="@color/accent"
android:pathData="M185,271.64V248.42h4.68v23.22Z" />
<path
android:fillColor="@color/accent"
android:pathData="M221.17,248.42h4.26v22a1.23,1.23,0,0,1-.67,1.09,3.17,3.17,0,0,1-1.67 .41
,4,4,0,0,1-1.71-.29,3.11,3.11,0,0,1-1.12-1L210,256v15.61h-4.32v-21.5a1.56,1.56,0,0,1,.68-1.4,3.18,3.18,0,0,1,1.79-.46,3.59,3.59,0,0,1,1.9
.39 ,5.91,5.91,0,0,1,1.41,1.56l9.72,13.59Z" />
<path
android:fillColor="@color/accent"
android:pathData="M256.9,252.36H246.2v5.5h9.63v3.93H246.2v5.89H256.6v4H241.51V250.31a1.74,1.74,0,0,1,.59-1.37,2,2,0,0,1,1.4-.52h13.4Z" />
<path
android:fillColor="@color/accent"
android:pathData="M286.38,271.64l-2-5.76h-8.49l-2,5.76h-4.85l7.87-21.5q.68-1.85,3.15-1.85t3.19,1.89l7.87,21.46ZM277.27,262h5.82l-2.93-8.62Z" />
<path
android:fillColor="@color/accent"
android:pathData="M314.33,272a11,11,0,0,1-8.36-3.19,11.93,11.93,0,0,1-3.06-8.62,12.12,12.12,0,0,1,3.25-8.89,11.56,11.56,0,0,1,8.62-3.3,11.44,11.44,0,0,1,6,1.5,9,9,0,0,1,3.63,3.93l-3.74,2q-1.69-3.41-6-3.41a6.53,6.53,0,0,0-5.14,2.16,8.58,8.58,0,0,0-1.92,5.9,8.67,8.67,0,0,0,1.79,5.8,6.11,6.11,0,0,0,4.91,2.1,6.74,6.74,0,0,0,4.6-1.58,5.26,5.26,0,0,0,1.87-4h-5.89v-3.67h10.5v2.57a10.19,10.19,0,0,1-3.12,7.72A11.12,11.12,0,0,1,314.33,272Z" />
<path
android:fillColor="@color/accent"
android:pathData="M356,252.36H345.3v5.5h9.63v3.93H345.3v5.89h10.41v4H340.62V250.31a1.74,1.74,0,0,1,.59-1.37,2,2,0,0,1,1.4-.52H356Z" />
<path
android:fillColor="@color/accent"
android:pathData="M416,128a39.92,39.92,0,0,0-31.11,14.87l-1.5-.6A294.79,294.79,0,0,0,336,128.14s0-.09,0-.14a80,80,0,1,0-160,0s0,.09,0,.13l-1.72
.38 a293.48,293.48,0,0,0-45.67,13.76l-1.5 .6
a40,40,0,1,0,7.39,14.28h0a277.33,277.33,0,0,1,43.1-13,80,80,0,0,0,156.73,0,277.3,277.3,0,0,1,43.11,13h0A40,40,0,1,0,416,128ZM96,192a24,24,0,1,1,24-24A24,24,0,0,1,96,192Zm160,0a64,64,0,1,1,64-64A64.07,64.07,0,0,1,256,192Zm160,0a24,24,0,1,1,24-24A24,24,0,0,1,416,192ZM288,128a32,32,0,1,1-32-32A32,32,0,0,1,288,128Z" />
<vector android:height="24dp" android:viewportHeight="1024.0"
android:viewportWidth="1024.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M536.3,663.5c-2.2,-5.4 -5.4,-10.4 -9.6,-14.7c-4.1,-4.2 -8.9,-7.4 -14.2,-9.7c-5.3,-2.2 -10.9,-3.4 -16.8,-3.4c-5.9,0 -11.5,1.1 -16.8,3.4c-5.3,2.2 -10.1,5.5 -14.2,9.7c-4.2,4.5 -7.5,9.5 -9.7,14.9c-2.2,5.4 -3.3,11.2 -3.3,17.2c0,6 1.1,11.7 3.3,17.2c2.2,5.4 5.5,10.4 9.7,14.8c4.1,4.2 8.9,7.5 14.2,9.7c5.3,2.2 10.9,3.3 16.8,3.3c5.8,0 11.5,-1.1 16.8,-3.3c3.4,-1.4 6.7,-3.3 9.7,-5.7l1.5,-1.2l-9.5,-4.9l-0.6,0.4c-5.2,3.5 -11.2,5.3 -17.9,5.3c-9.4,0 -17.5,-3.5 -24,-10.4c-5.4,-5.7 -8.6,-12.6 -9.6,-20.4h77.1l0.1,-1.2c0.1,-1.3 0.2,-2.5 0.2,-3.7C539.6,674.8 538.5,669 536.3,663.5L536.3,663.5zM529.1,676h-66.9c0.9,-8 4.1,-14.9 9.6,-20.7c6.5,-6.9 14.6,-10.4 24,-10.4c9.3,0 17.4,3.5 23.8,10.3C525,661 528.3,668 529.1,676z"/>
<path android:fillColor="#FF000000" android:pathData="M441.4,663.5c-2.2,-5.4 -5.4,-10.4 -9.6,-14.7c-4.1,-4.2 -8.9,-7.4 -14.2,-9.7c-5.3,-2.2 -10.9,-3.4 -16.8,-3.4c-5.9,0 -11.5,1.1 -16.8,3.4c-5.3,2.2 -10.1,5.5 -14.2,9.7c-4.2,4.5 -7.5,9.5 -9.7,14.9c-2.2,5.4 -3.3,11.2 -3.3,17.2c0,6 1.1,11.7 3.3,17.2c2.2,5.4 5.5,10.4 9.7,14.8c4.1,4.2 8.9,7.5 14.2,9.7c5.3,2.2 10.9,3.3 16.8,3.3c5.8,0 11.5,-1.1 16.8,-3.3c3.4,-1.4 6.7,-3.3 9.7,-5.7l1.5,-1.2l-9.5,-4.9l-0.6,0.4c-5.2,3.5 -11.2,5.3 -17.9,5.3c-9.4,0 -17.5,-3.5 -24,-10.4c-5.4,-5.7 -8.6,-12.6 -9.6,-20.4h77.1l0.1,-1.2c0.1,-1.3 0.2,-2.6 0.2,-3.7C444.7,674.8 443.6,669 441.4,663.5L441.4,663.5zM434.2,676h-66.9c0.9,-8 4.1,-14.9 9.6,-20.7c6.5,-6.9 14.6,-10.4 24,-10.4c9.3,0 17.4,3.5 23.8,10.3C430.1,661 433.3,668 434.2,676z"/>
<path android:fillColor="#FF000000" android:pathData="M554.2,596.9h9.8v127.7h-9.8z"/>
<path android:fillColor="#FF000000" android:pathData="M663.5,663.7c-2.2,-5.4 -5.4,-10.4 -9.6,-14.7c-4.1,-4.2 -8.9,-7.4 -14.2,-9.7c-5.3,-2.2 -10.9,-3.4 -16.8,-3.4c-5.9,0 -11.5,1.1 -16.8,3.4c-5.3,2.2 -10.1,5.5 -14.2,9.7c-4.2,4.5 -7.5,9.5 -9.7,14.9c-2.2,5.4 -3.3,11.2 -3.3,17.2c0,6 1.1,11.7 3.3,17.2c2.2,5.4 5.5,10.4 9.7,14.8c4.1,4.2 8.9,7.5 14.2,9.7c5.3,2.2 10.9,3.3 16.8,3.3c5.9,0 11.5,-1.1 16.8,-3.3c5.3,-2.2 10.1,-5.5 14.2,-9.7c4.2,-4.3 7.4,-9.2 9.6,-14.7c2.2,-5.4 3.3,-11.3 3.3,-17.3C666.7,675 665.6,669.1 663.5,663.7zM656.6,680.9c0,9.9 -3.3,18.5 -9.8,25.4c-6.5,6.9 -14.5,10.4 -23.8,10.4c-9.4,0 -17.5,-3.5 -24,-10.4c-6.5,-6.9 -9.8,-15.5 -9.8,-25.5c0,-10 3.3,-18.6 9.8,-25.5c6.5,-6.9 14.6,-10.4 24,-10.4c9.3,0 17.4,3.5 23.8,10.3C653.3,662.3 656.6,670.9 656.6,680.9z"/>
<path android:fillColor="#FF000000" android:pathData="M511.9,578.8c-65.6,0 -119,-53.4 -119,-119c0,-65.6 53.4,-119 119,-119s119,53.4 119,119c0,12.4 -10.1,22.5 -22.5,22.5h-96.5c-12.4,0 -22.5,-10.1 -22.5,-22.5c0,-12.4 10.1,-22.5 22.5,-22.5h70.5c-9.5,-29.8 -37.6,-51.5 -70.5,-51.5c-40.8,0 -74,33.2 -74,74c0,40.8 33.2,74 74,74c12.4,0 22.5,10.1 22.5,22.5C534.4,568.7 524.3,578.8 511.9,578.8z"/>
</vector>
......@@ -21,25 +21,30 @@
<!-- Partner SUW Strings -->
<string name="next">Siguiente</string>
<string name="skip">Saltar</string>
<string name="start">Entamar</string>
<string name="start">Aniciar</string>
<string name="done">Fecho</string>
<string name="ok">Aceutar</string>
<string name="loading">Un segundu\u2026</string>
<string name="setup_complete">Completóse la configuración</string>
<string name="setup_complete">La configuración completóse</string>
<string name="setup_welcome">Afáyate</string>
<string name="setup_locale">Llingua</string>
<string name="setup_wifi">Esbilla de Wi-Fi</string>
<string name="setup_wifi">Esbillar Wi-Fi</string>
<string name="setup_sim_missing">Falta la tarxeta SIM</string>
<string name="setup_choose_data_sim">Escueyi una SIM pa datos</string>
<string name="setup_location">Servicios d\'allugamientu</string>
<string name="setup_other">Otros servicios</string>
<string name="setup_datetime">Data y hora</string>
<string name="setup_current_date">Data actual</string>
<string name="setup_current_time">Hora actual</string>
<string name="sim_missing_summary" product="default">Nun se deteutó denguna tarxeta SIM nel to teléfonu. Pa inxertar una, llei les instrucciones que vienen col preséu.</string>
<string name="date_time_summary">Afita\'l to fusu horariu y axusta la data y hora actuales si ye preciso</string>
<string name="location_services_summary">Los servicios d\'allugamientu permiten al sistema y aplicaciones de terceros recoyer y usar datos como\'l to allugamientu aproximáu. Por exemplu, una aplicación pue usar l\'allugamientu aproximáu p\'allugar cafeteríes averaes.</string>
<string name="location_battery_saving"><b>Amenorgar consumu de batería</b> torgando\'l númberu d\'anovamientos GPS per hora.</string>
<string name="setup_mobile_data_no_service">Ensin serviciu</string>
<string name="setup_mobile_data_emergency_only">Namái llamaes d\'emerxencia</string>
<string name="enable_mobile_data_summary">¿Quies usar los datos móviles na configuración? Activalos quiciabes puean tar suxetos a cargos de datos.</string>
<string name="no">Non</string>
<string name="yes"></string>
<string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
<string name="emergency_call">Llamada d\'emerxencia</string>
<string name="setup_services">Carauterístiques de LineageOS</string>
<string name="services_explanation" product="tablet">Esto servicios furrulen por ti pa estender les capacidaes de la to tableta. Los datos usaránse acordies cola <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string>
......@@ -47,8 +52,13 @@
<string name="services_privacy_policy">Política de privacidá</string>
<string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> unviando automáticamente diagnósticos y usu de datos a LineageOS. Esta información nun pue usase pa indentificate y écha-yos un gabitu a los equipos pa trabayar en coses como\'l consumu de batería, el rindimientu d\'aplicaciones, y les carauterístiques nueves de <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
<string name="services_os_privacy_guard"><b>Habilitar Guardián de privacidá</b> pa facer que los tos datos personales como contautos, mensaxes, rexistros de llamaes... etc, nun tean disponibles p\'aplicaciones que teas acabante d\'instalar</string>
<string name="setup_unlock">Desbloquiar</string>
<string name="setup_require_cyanogen_label"><b>Riquir la contraseña de la to cuenta</b> pa usar el to preséu incluso dempués de reafitalu.</string>
<!-- Fingerprint setup -->
<string name="settings_fingerprint_setup_details">¿Cómo te prestaría bloquiar la to pantalla?</string>
<string name="fingerprint_setup_title">Configuración de buelga</string>
<string name="fingerprint_setup_add_fingerprint">Amiesta la to buelga</string>
<!-- secure lock screen -->
<string name="lockscreen_setup_summary"><b>Protexe esti preséu</b> y riquirá un PIN, patrón o contraseña pa desbloquiar la pantalla</string>
<string name="lockscreen_setup_screen_lock_setup">Configurar</string>
</resources>
......@@ -27,7 +27,6 @@
<string name="loading">Samo trenutak\u2026</string>
<string name="setup_complete">Postavljanje je završeno.</string>
<string name="setup_welcome">Dobro došli!</string>
<string name="setup_locale">Jezik</string>
<string name="setup_wifi">Odaberite Wi-Fi</string>
<string name="setup_sim_missing">Nema SIM kartice</string>
<string name="setup_choose_data_sim">Odaberite SIM karticu za podatke</string>
......@@ -57,17 +56,11 @@
<string name="yes">Da</string>
<string name="data_sim_name">SIM <xliff:g id="sub">%d </xliff:g> - <xliff:g id="name">%s </xliff:g></string>
<string name="emergency_call">Hitan poziv</string>
<string name="setup_services">Značajke LineageOS-a</string>
<string name="services_explanation" product="tablet">Ove usluge rade za vas da povećaju mogućnosti vašeg tableta. Podatci će se upotrebljavati u suglasnosti s LineageOS-ovom <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
<string name="services_explanation" product="default">Ove usluge rade za vas da povećaju mogućnosti vašeg telefona. Podatci će se upotrebljavati u suglasnosti s LineageOS-ovom <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
<string name="services_privacy_policy">Pravila privatnosti</string>
<string name="services_help_improve_cm">Pomozite poboljšati <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
<string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> automatskim slanjem dijagnostike i podataka o korištenju LineageOS-u. Ove se informacije ne mogu upotrebljavati kako bi vas identificirale i puno pomažu timovima koji rade na stvarima kao što su vijek baterije, izvedba aplikacija i nove <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> značajke.</string>
<string name="services_os_nav_keys_label"><b>Koristite navigacijske tipke na zaslonu</b>umjesto hardverskih tipki.</string>
<string name="services_os_privacy_guard"><b>Omogućite Nadzor privatnosti</b> da biste učinili svoje osobne podatke poput kontakata, poruka ili zapisa poziva nedostupnima za novo instalirane aplikacije.</string>
<string name="setup_unlock">Otključaj</string>
<string name="setup_device_locked">Uređaj je zaključao korisnik.</string>
<string name="setup_require_cyanogen_label"><b>Zahtijeva lozinku vašeg računa</b>za korištenje vašim uređajem čak i nakon vraćanja na tvorničke postavke.</string>
<string name="setup_device_locked_instructions"><i>Da bi isključili/uključili ovo, idite u Postavke &gt; Privatnost</i></string>
<!-- Fingerprint setup -->
<string name="settings_fingerprint_setup_title">Izaberite rezerni tip zaključavanja zaslona</string>
......@@ -83,5 +76,4 @@
<string name="settings_lockscreen_setup_details">Kako želite zaključati vaš zaslon?</string>
<string name="lockscreen_setup_title">Zaštitite svoj telefon</string>
<string name="lockscreen_setup_summary"><b>Zaštiti uređaj</b> i zahtijevaj PIN, uzorak ili zaporku za otključavanje zaslona</string>
<string name="lockscreen_setup_screen_lock_setup">Postavljanje</string>
</resources>
......@@ -18,14 +18,6 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Partner SUW Strings -->
<string name="skip">Brinca</string>
<string name="start">Incumintza</string>
<string name="done">Fatu</string>
<string name="ok">AB</string>
<string name="setup_locale">Limba</string>
<string name="no">Nono</string>
<string name="yes">Eja</string>
<string name="services_privacy_policy">Polìtica de riservadesa</string>
<!-- Fingerprint setup -->
<!-- secure lock screen -->
</resources>
......@@ -62,7 +62,7 @@
<string name="services_explanation" product="default">Te storitve vam omogočajo, da razširite zmogljivosti svojega telefona. Podatki se uporabijo v skladu z <xliff:g id="name" example="Privacy Policy">%s </xliff:g> LineageOS.</string>
<string name="services_privacy_policy">Pravilnik o zasebnosti</string>
<string name="services_help_improve_cm">Pomagajte izboljšati <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
<string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> s samodejnim pošiljanjem diagnostičnih podatkov in podatkov uporabe LineageOS-a. Ti podatki se ne uporabljajo za vaše prepoznavanje in ekipi pomagajo pri izboljšanju npr. življenjske dobe baterije, zmogljivosti aplikacij in novih značilnosti <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
<string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> s samodejnim pošiljanjem diagnostičnih podatkov in podatkov uporabe LineageOSa. Ti podatki se ne uporabljajo za vaše prepoznavanje in ekipi pomagajo pri izboljšanju npr. življenjske dobe baterije, zmogljivosti aplikacij in novih značilnosti <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
<string name="services_os_nav_keys_label"><b>Uporabite zaslonske tipke za krmarjenje</b> namesto fizičnih tipk.</string>
<string name="services_os_privacy_guard"><b>Omogočite Privacy guard</b>, da vaši osebni podatki, kot so stiki, sporočila ali dnevniki klicev ne bodo na voljo na novo nameščenim aplikacijam</string>
<string name="setup_unlock">Odkleni</string>
......@@ -82,5 +82,6 @@
<string name="settings_lockscreen_setup_title">Izberite način zaklepanja zaslona</string>
<string name="settings_lockscreen_setup_details">Kako bi radi zaklenili svoj zaslon?</string>
<string name="lockscreen_setup_title">Zaščitite vaš telefon</string>
<string name="lockscreen_setup_summary"><b>Zaščiti napravo</b> in za odklenitev zaslona zahtevaj kodo PIN, vzorec ali geslo</string>
<string name="lockscreen_setup_screen_lock_setup">Nastavi</string>
</resources>
/*
* Copyright (C) 2016 The CyanogenMod Project
* Copyright (C) 2017 The LineageOS Project
* Copyright (C) 2018 eelo
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -64,19 +65,54 @@ public class FinishActivity extends BaseSetupWizardActivity {
private volatile boolean mIsFinishing = false;
private final static int EELO_SYNCHRONIZER_REQUEST_CODE = 0x01;
private boolean hasError = false;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (LOGV) {
logActivityState("onCreate savedInstanceState=" + savedInstanceState);
hasError = false;
try {
Intent intent = new Intent("io.eelo.synchronizer.LAUNCHER"); // TODO static
intent.putExtra("EELO_SETTINGS_LAUNCHER", "SETUP_WIZARD");
startActivityForResult(intent, EELO_SYNCHRONIZER_REQUEST_CODE);
} catch (android.content.ActivityNotFoundException err) {
hasError = true;
}
mSetupWizardApp = (SetupWizardApp) getApplication();
mReveal = (ImageView) findViewById(R.id.reveal);
mEnableAccessibilityController =
EnableAccessibilityController.getInstance(getApplicationContext());
setNextText(R.string.start);
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
//super must be called
//super.onActivityResult(requestCode, resultCode, data);
if(requestCode==EELO_SYNCHRONIZER_REQUEST_CODE ) {
//String message=data.getStringExtra("MESSAGE");
//alert(message);
if (resultCode == RESULT_CANCELED) {
//This is a BACK, or the Activity has not been found.
if (!hasError) {
// If the activity has not been found do *NOT* return back! (we will be in a (custom) loop)
onBackPressed();
}
}
}
}
@Override
protected int getTransition() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment