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

Commit 7e5642ae authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

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

lineage-sdk: Setup CI to update from upstream

See merge request !98
parents 35ee5eb1 df4166ab

.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'

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ include $(CLEAR_VARS) 
lineage_platform_res := APPS/org.lineageos.platform-res_intermediates/aapt



# List of packages used in lineage-api-stubs

lineage_stub_packages := lineageos.app:lineageos.content:lineageos.hardware:lineageos.media:lineageos.os:lineageos.preference:lineageos.profiles:lineageos.providers:lineageos.platform:lineageos.util:lineageos.trust

lineage_stub_packages := lineageos.app:lineageos.content:lineageos.hardware:lineageos.media:lineageos.os:lineageos.preference:lineageos.profiles:lineageos.providers:lineageos.platform:lineageos.util:lineageos.weather:lineageos.weatherservice:lineageos.trust



lineage_framework_module := $(LOCAL_INSTALLED_MODULE)

api/lineage_current.txt

+251 −0
Original line number Diff line number Diff line
@@ -336,14 +336,18 @@ package lineageos.platform { 


  public static final class Manifest.permission {

    ctor public Manifest.permission();

    field public static final java.lang.String ACCESS_WEATHER_MANAGER = "lineageos.permission.ACCESS_WEATHER_MANAGER";

    field public static final java.lang.String BIND_WEATHER_PROVIDER_SERVICE = "lineageos.permission.BIND_WEATHER_PROVIDER_SERVICE";

    field public static final java.lang.String HARDWARE_ABSTRACTION_ACCESS = "lineageos.permission.HARDWARE_ABSTRACTION_ACCESS";

    field public static final java.lang.String MANAGE_LIVEDISPLAY = "lineageos.permission.MANAGE_LIVEDISPLAY";

    field public static final java.lang.String MANAGE_REMOTE_PREFERENCES = "lineageos.permission.MANAGE_REMOTE_PREFERENCES";

    field public static final java.lang.String MODIFY_PROFILES = "lineageos.permission.MODIFY_PROFILES";

    field public static final java.lang.String PERFORMANCE_ACCESS = "lineageos.permission.PERFORMANCE_ACCESS";

    field public static final java.lang.String READ_WEATHER = "lineageos.permission.READ_WEATHER";

    field public static final java.lang.String TRUST_INTERFACE = "lineageos.permission.TRUST_INTERFACE";

    field public static final java.lang.String WRITE_SECURE_SETTINGS = "lineageos.permission.WRITE_SECURE_SETTINGS";

    field public static final java.lang.String WRITE_SETTINGS = "lineageos.permission.WRITE_SETTINGS";

    field public static final java.lang.String WRITE_WEATHER = "lineageos.permission.WRITE_WEATHER";

  }



  public final class R {
@@ -668,6 +672,7 @@ package lineageos.providers { 
    method public static boolean putString(android.content.ContentResolver, java.lang.String, java.lang.String);

    field public static final android.net.Uri CONTENT_URI;

    field public static final java.lang.String SYS_PROP_LINEAGE_SETTING_VERSION = "sys.lineage_settings_global_version";

    field public static final java.lang.String WEATHER_TEMPERATURE_UNIT = "weather_temperature_unit";

  }



  public static class LineageSettings.LineageSettingNotFoundException extends android.util.AndroidException {
@@ -788,6 +793,7 @@ package lineageos.providers { 
    field public static final java.lang.String STATUS_BAR_IME_SWITCHER = "status_bar_ime_switcher";

    field public static final java.lang.String STATUS_BAR_QUICK_QS_PULLDOWN = "qs_quick_pulldown";

    field public static final java.lang.String STATUS_BAR_SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";

    field public static final java.lang.String STATUS_BAR_SHOW_WEATHER = "status_bar_show_weather";

    field public static final java.lang.String STYLUS_ICON_ENABLED = "stylus_icon_enabled";

    field public static final java.lang.String SWAP_VOLUME_KEYS_ON_ROTATION = "swap_volume_keys_on_rotation";

    field public static final java.lang.String SYSTEM_PROFILES_ENABLED = "system_profiles_enabled";
@@ -805,6 +811,95 @@ package lineageos.providers { 
    field public static final java.lang.String ZEN_PRIORITY_ALLOW_LIGHTS = "zen_priority_allow_lights";

  }



  public class WeatherContract {

    ctor public WeatherContract();

    field public static final java.lang.String AUTHORITY = "org.lineageos.weather";

    field public static final android.net.Uri AUTHORITY_URI;

  }



  public static class WeatherContract.WeatherColumns {

    ctor public WeatherContract.WeatherColumns();

    field public static final android.net.Uri CONTENT_URI;

    field public static final android.net.Uri CURRENT_AND_FORECAST_WEATHER_URI;

    field public static final java.lang.String CURRENT_CITY = "city";

    field public static final java.lang.String CURRENT_CONDITION = "condition";

    field public static final java.lang.String CURRENT_CONDITION_CODE = "condition_code";

    field public static final java.lang.String CURRENT_HUMIDITY = "humidity";

    field public static final java.lang.String CURRENT_TEMPERATURE = "temperature";

    field public static final java.lang.String CURRENT_TEMPERATURE_UNIT = "temperature_unit";

    field public static final java.lang.String CURRENT_TIMESTAMP = "timestamp";

    field public static final android.net.Uri CURRENT_WEATHER_URI;

    field public static final java.lang.String CURRENT_WIND_DIRECTION = "wind_direction";

    field public static final java.lang.String CURRENT_WIND_SPEED = "wind_speed";

    field public static final java.lang.String CURRENT_WIND_SPEED_UNIT = "wind_speed_unit";

    field public static final java.lang.String FORECAST_CONDITION = "forecast_condition";

    field public static final java.lang.String FORECAST_CONDITION_CODE = "forecast_condition_code";

    field public static final java.lang.String FORECAST_HIGH = "forecast_high";

    field public static final java.lang.String FORECAST_LOW = "forecast_low";

    field public static final android.net.Uri FORECAST_WEATHER_URI;

    field public static final java.lang.String TODAYS_HIGH_TEMPERATURE = "todays_high";

    field public static final java.lang.String TODAYS_LOW_TEMPERATURE = "todays_low";

  }



  public static final class WeatherContract.WeatherColumns.TempUnit {

    field public static final int CELSIUS = 1; // 0x1

    field public static final int FAHRENHEIT = 2; // 0x2

  }



  public static final class WeatherContract.WeatherColumns.WeatherCode {

    field public static final int BLOWING_SNOW = 14; // 0xe

    field public static final int BLUSTERY = 22; // 0x16

    field public static final int CLEAR_NIGHT = 30; // 0x1e

    field public static final int CLOUDY = 25; // 0x19

    field public static final int COLD = 24; // 0x18

    field public static final int DRIZZLE = 9; // 0x9

    field public static final int DUST = 18; // 0x12

    field public static final int FAIR_DAY = 33; // 0x21

    field public static final int FAIR_NIGHT = 32; // 0x20

    field public static final int FOGGY = 19; // 0x13

    field public static final int FREEZING_DRIZZLE = 8; // 0x8

    field public static final int FREEZING_RAIN = 10; // 0xa

    field public static final int HAIL = 16; // 0x10

    field public static final int HAZE = 20; // 0x14

    field public static final int HEAVY_SNOW = 39; // 0x27

    field public static final int HOT = 35; // 0x23

    field public static final int HURRICANE = 2; // 0x2

    field public static final int ISOLATED_THUNDERSHOWERS = 44; // 0x2c

    field public static final int ISOLATED_THUNDERSTORMS = 36; // 0x24

    field public static final int LIGHT_SNOW_SHOWERS = 13; // 0xd

    field public static final int MIXED_RAIN_AND_HAIL = 34; // 0x22

    field public static final int MIXED_RAIN_AND_SLEET = 6; // 0x6

    field public static final int MIXED_RAIN_AND_SNOW = 5; // 0x5

    field public static final int MIXED_SNOW_AND_SLEET = 7; // 0x7

    field public static final int MOSTLY_CLOUDY_DAY = 27; // 0x1b

    field public static final int MOSTLY_CLOUDY_NIGHT = 26; // 0x1a

    field public static final int NOT_AVAILABLE = 3200; // 0xc80

    field public static final int PARTLY_CLOUDY = 41; // 0x29

    field public static final int PARTLY_CLOUDY_DAY = 29; // 0x1d

    field public static final int PARTLY_CLOUDY_NIGHT = 28; // 0x1c

    field public static final int SCATTERED_SHOWERS = 38; // 0x26

    field public static final int SCATTERED_SNOW_SHOWERS = 40; // 0x28

    field public static final int SCATTERED_THUNDERSTORMS = 37; // 0x25

    field public static final int SEVERE_THUNDERSTORMS = 3; // 0x3

    field public static final int SHOWERS = 11; // 0xb

    field public static final int SLEET = 17; // 0x11

    field public static final int SMOKY = 21; // 0x15

    field public static final int SNOW = 15; // 0xf

    field public static final int SNOW_FLURRIES = 12; // 0xc

    field public static final int SNOW_SHOWERS = 43; // 0x2b

    field public static final int SUNNY = 31; // 0x1f

    field public static final int THUNDERSHOWER = 42; // 0x2a

    field public static final int THUNDERSTORMS = 4; // 0x4

    field public static final int TORNADO = 0; // 0x0

    field public static final int TROPICAL_STORM = 1; // 0x1

    field public static final int WINDY = 23; // 0x17

  }



  public static final class WeatherContract.WeatherColumns.WindSpeedUnit {

    field public static final int KPH = 1; // 0x1

    field public static final int MPH = 2; // 0x2

  }



}



package lineageos.trust {
@@ -845,3 +940,159 @@ package lineageos.util { 
  }



}



package lineageos.weather {



  public class LineageWeatherManager {

    method public void cancelRequest(int);

    method public java.lang.String getActiveWeatherServiceProviderLabel();

    method public static lineageos.weather.LineageWeatherManager getInstance(android.content.Context);

    method public int lookupCity(java.lang.String, lineageos.weather.LineageWeatherManager.LookupCityRequestListener);

    method public void registerWeatherServiceProviderChangeListener(lineageos.weather.LineageWeatherManager.WeatherServiceProviderChangeListener);

    method public int requestWeatherUpdate(android.location.Location, lineageos.weather.LineageWeatherManager.WeatherUpdateRequestListener);

    method public int requestWeatherUpdate(lineageos.weather.WeatherLocation, lineageos.weather.LineageWeatherManager.WeatherUpdateRequestListener);

    method public void unregisterWeatherServiceProviderChangeListener(lineageos.weather.LineageWeatherManager.WeatherServiceProviderChangeListener);

  }



  public static abstract interface LineageWeatherManager.LookupCityRequestListener {

    method public abstract void onLookupCityRequestCompleted(int, java.util.List<lineageos.weather.WeatherLocation>);

  }



  public static final class LineageWeatherManager.RequestStatus {

    field public static final int ALREADY_IN_PROGRESS = -3; // 0xfffffffd

    field public static final int COMPLETED = 1; // 0x1

    field public static final int FAILED = -1; // 0xffffffff

    field public static final int NO_MATCH_FOUND = -4; // 0xfffffffc

    field public static final int SUBMITTED_TOO_SOON = -2; // 0xfffffffe

  }



  public static abstract interface LineageWeatherManager.WeatherServiceProviderChangeListener {

    method public abstract void onWeatherServiceProviderChanged(java.lang.String);

  }



  public static abstract interface LineageWeatherManager.WeatherUpdateRequestListener {

    method public abstract void onWeatherRequestCompleted(int, lineageos.weather.WeatherInfo);

  }



  public final class RequestInfo implements android.os.Parcelable {

    method public int describeContents();

    method public java.lang.String getCityName();

    method public android.location.Location getLocation();

    method public int getRequestType();

    method public int getTemperatureUnit();

    method public lineageos.weather.WeatherLocation getWeatherLocation();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<lineageos.weather.RequestInfo> CREATOR;

    field public static final int TYPE_LOOKUP_CITY_NAME_REQ = 3; // 0x3

    field public static final int TYPE_WEATHER_BY_GEO_LOCATION_REQ = 1; // 0x1

    field public static final int TYPE_WEATHER_BY_WEATHER_LOCATION_REQ = 2; // 0x2

  }



  public final class WeatherInfo implements android.os.Parcelable {

    method public int describeContents();

    method public java.lang.String getCity();

    method public int getConditionCode();

    method public java.util.List<lineageos.weather.WeatherInfo.DayForecast> getForecasts();

    method public double getHumidity();

    method public double getTemperature();

    method public int getTemperatureUnit();

    method public long getTimestamp();

    method public double getTodaysHigh();

    method public double getTodaysLow();

    method public double getWindDirection();

    method public double getWindSpeed();

    method public int getWindSpeedUnit();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<lineageos.weather.WeatherInfo> CREATOR;

  }



  public static class WeatherInfo.Builder {

    ctor public WeatherInfo.Builder(java.lang.String, double, int);

    method public lineageos.weather.WeatherInfo build();

    method public lineageos.weather.WeatherInfo.Builder setForecast(java.util.List<lineageos.weather.WeatherInfo.DayForecast>);

    method public lineageos.weather.WeatherInfo.Builder setHumidity(double);

    method public lineageos.weather.WeatherInfo.Builder setTimestamp(long);

    method public lineageos.weather.WeatherInfo.Builder setTodaysHigh(double);

    method public lineageos.weather.WeatherInfo.Builder setTodaysLow(double);

    method public lineageos.weather.WeatherInfo.Builder setWeatherCondition(int);

    method public lineageos.weather.WeatherInfo.Builder setWind(double, double, int);

  }



  public static class WeatherInfo.DayForecast implements android.os.Parcelable {

    method public int describeContents();

    method public int getConditionCode();

    method public double getHigh();

    method public double getLow();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<lineageos.weather.WeatherInfo.DayForecast> CREATOR;

  }



  public static class WeatherInfo.DayForecast.Builder {

    ctor public WeatherInfo.DayForecast.Builder(int);

    method public lineageos.weather.WeatherInfo.DayForecast build();

    method public lineageos.weather.WeatherInfo.DayForecast.Builder setHigh(double);

    method public lineageos.weather.WeatherInfo.DayForecast.Builder setLow(double);

  }



  public final class WeatherLocation implements android.os.Parcelable {

    method public int describeContents();

    method public java.lang.String getCity();

    method public java.lang.String getCityId();

    method public java.lang.String getCountry();

    method public java.lang.String getCountryId();

    method public java.lang.String getPostalCode();

    method public java.lang.String getState();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<lineageos.weather.WeatherLocation> CREATOR;

  }



  public static class WeatherLocation.Builder {

    ctor public WeatherLocation.Builder(java.lang.String, java.lang.String);

    ctor public WeatherLocation.Builder(java.lang.String);

    method public lineageos.weather.WeatherLocation build();

    method public lineageos.weather.WeatherLocation.Builder setCountry(java.lang.String);

    method public lineageos.weather.WeatherLocation.Builder setCountryId(java.lang.String);

    method public lineageos.weather.WeatherLocation.Builder setPostalCode(java.lang.String);

    method public lineageos.weather.WeatherLocation.Builder setState(java.lang.String);

  }



}



package lineageos.weatherservice {



  public final class ServiceRequest {

    method public void complete(lineageos.weatherservice.ServiceRequestResult);

    method public void fail();

    method public lineageos.weather.RequestInfo getRequestInfo();

    method public void reject(int);

  }



  public final class ServiceRequestResult implements android.os.Parcelable {

    method public int describeContents();

    method public java.util.List<lineageos.weather.WeatherLocation> getLocationLookupList();

    method public lineageos.weather.WeatherInfo getWeatherInfo();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<lineageos.weatherservice.ServiceRequestResult> CREATOR;

  }



  public static class ServiceRequestResult.Builder {

    ctor public ServiceRequestResult.Builder();

    ctor public ServiceRequestResult.Builder(lineageos.weather.WeatherInfo);

    ctor public ServiceRequestResult.Builder(java.util.List<lineageos.weather.WeatherLocation>);

    method public lineageos.weatherservice.ServiceRequestResult build();

  }



  public abstract class WeatherProviderService extends android.app.Service {

    ctor public WeatherProviderService();

    method protected final void attachBaseContext(android.content.Context);

    method public final android.os.IBinder onBind(android.content.Intent);

    method protected void onConnected();

    method protected void onDisconnected();

    method protected abstract void onRequestCancelled(lineageos.weatherservice.ServiceRequest);

    method protected abstract void onRequestSubmitted(lineageos.weatherservice.ServiceRequest);

    field public static final java.lang.String SERVICE_INTERFACE = "lineageos.weatherservice.WeatherProviderService";

    field public static final java.lang.String SERVICE_META_DATA = "lineageos.weatherservice";

  }



}

host/migration/src/LineageSettings.java

+7 −0
Original line number Diff line number Diff line
@@ -373,6 +373,12 @@ public final class LineageSettings { 
         */

        public static final String DOUBLE_TAP_SLEEP_GESTURE = "double_tap_sleep_gesture";



        /**

         * Boolean value on whether to show weather in the statusbar

         * @hide

         */

        public static final String STATUS_BAR_SHOW_WEATHER = "status_bar_show_weather";



        /**

         * Show search bar in recents

         * @hide
@@ -593,6 +599,7 @@ public final class LineageSettings { 
                LineageSettings.System.DISPLAY_COLOR_ADJUSTMENT,

                LineageSettings.System.LIVE_DISPLAY_HINTED,

                LineageSettings.System.DOUBLE_TAP_SLEEP_GESTURE,

                LineageSettings.System.STATUS_BAR_SHOW_WEATHER,

                LineageSettings.System.RECENTS_SHOW_SEARCH_BAR,

                LineageSettings.System.NAVBAR_LEFT_IN_LANDSCAPE,

                LineageSettings.System.T9_SEARCH_INPUT_LOCALE,

lineage/lib/main/java/org/lineageos/platform/internal/LineageWeatherManagerService.java

0 → 100644
+518 −0

File added.

Preview size limit exceeded, changes collapsed.