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

Commit d58cca97 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge remote-tracking branch 'origin/lineage-15.1' into v1-oreo

parents 5ed8199f 7676d7d3

res/values/strings.xml

+1 −2
Original line number Diff line number Diff line
@@ -587,8 +587,7 @@ 
    <string name="weather_settings_button">Provider settings</string>

    <string name="weather_settings_activity_not_found">Unable to launch the settings menu of this provider</string>

    <string name="weather_settings_add_weather_provider">Add weather provider</string>

    <string name="weather_settings_play_store_market_url" translatable="false">market://search?q=lineageosweatherprovider&amp;c=apps</string>

    <string name="weather_settings_play_store_http_url" translatable="false">http://play.google.com/store/search?q=lineageosweatherprovider&amp;c=apps</string>

    <string name="weather_settings_provider_url" translatable="false">https://download.lineageos.org/extras</string>

    <string name="weather_settings_general_settings_title">General</string>

    <string name="weather_settings_providers_title">Providers</string>

    <string name="weather_settings_temp_units_title">Temperature unit</string>

src/org/lineageos/lineageparts/weather/WeatherServiceSettings.java

+3 −8
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The CyanogenMod Project

 * Copyright (C) 2019 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.
@@ -133,15 +134,9 @@ public class WeatherServiceSettings extends SettingsPreferenceFragment 
    }



    private void launchGetWeatherProviders() {

        try {

        startActivity(new Intent(Intent.ACTION_VIEW,

                    Uri.parse(getString(R.string.weather_settings_play_store_market_url)))

                    Uri.parse(getString(R.string.weather_settings_provider_url)))

                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));

        } catch (ActivityNotFoundException e) {

            startActivity(new Intent(Intent.ACTION_VIEW,

                    Uri.parse(getString(R.string.weather_settings_play_store_http_url)))

                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));

        }

    }



    private void unregisterPackageMonitor() {