-
-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/origin/active_development'
# Conflicts: # README.md
- Loading branch information
Showing
194 changed files
with
8,672 additions
and
2,234 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,3 +41,4 @@ proguard-project.txt | |
| credentials.xml | ||
| /automotive/stable/ | ||
| /automotive/debug/ | ||
| /.kotlin/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| -keepclassmembers class com.ixam97.carStatsViewer.liveDataApi.http.HttpDataSet {!transient <fields>;} | ||
| -keepclassmembers class com.ixam97.carStatsViewer.database.tripData.DrivingPoint {!transient <fields>;} | ||
| -keepclassmembers class com.ixam97.carStatsViewer.database.tripData.ChargingSession {!transient <fields>;} | ||
| -keepclassmembers class com.ixam97.carStatsViewer.database.tripData.ChargingPoint {!transient <fields>;} | ||
| -keepclassmembers class com.ixam97.carStatsViewer.liveDataApi.abrpLiveData.AbrpDataSet {!transient <fields>;} | ||
|
|
||
| -keepattributes LineNumberTable,SourceFile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android"> | ||
|
|
||
| <uses-feature | ||
| android:name="android.software.car.templates_host" | ||
| android:required="true" /> | ||
| <uses-feature | ||
| android:name="android.hardware.wifi" | ||
| android:required="false" /> | ||
| <uses-feature | ||
| android:name="android.hardware.screen.portrait" | ||
| android:required="false" /> | ||
| <uses-feature | ||
| android:name="android.hardware.screen.landscape" | ||
| android:required="false" /> | ||
|
|
||
| <application | ||
| android:name=".CarStatsViewer" | ||
| android:allowBackup="true" | ||
| android:icon="@mipmap/ic_launcher" | ||
| android:label="@string/app_name" | ||
| android:supportsRtl="true" | ||
| android:hasFragileUserData="true" | ||
| android:theme="@style/AppTheme"> | ||
| <receiver android:name=".AutoStartReceiver" | ||
| android:exported="true" | ||
| android:enabled="true" | ||
| android:permission="android.permission.RECEIVE_BOOT_COMPLETED" > | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.BOOT_COMPLETED"/> | ||
| </intent-filter> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MY_PACKAGE_REPLACED" /> | ||
| </intent-filter> | ||
| <intent-filter> | ||
| <action android:name="com.ixam97.carStatsViewer.RestartAction" /> | ||
| </intent-filter> | ||
| <intent-filter> | ||
| <action android:name="com.ixam97.carStatsViewer.NOTIFICATION_DELETE" /> | ||
| </intent-filter> | ||
| </receiver> | ||
| <service | ||
| android:name=".carApp.CarStatsViewerService" | ||
| android:exported="true"> | ||
| <intent-filter> | ||
| <action android:name="androidx.car.app.CarAppService"/> | ||
| <category android:name="androidx.car.app.category.IOT"/> | ||
| </intent-filter> | ||
| </service> | ||
|
|
||
|
|
||
| <activity | ||
| android:exported="true" | ||
| android:theme="@android:style/Theme.DeviceDefault.NoActionBar" | ||
| android:name="androidx.car.app.activity.CarAppActivity" | ||
| android:launchMode="singleTask" | ||
| android:label="@string/app_name"> | ||
|
|
||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| </intent-filter> | ||
| <meta-data android:name="distractionOptimized" android:value="true"/> | ||
| </activity> | ||
|
|
||
| <activity android:name=".ui.activities.PermissionsActivity" android:exported="false" /> | ||
| <!--<activity android:name=".ui.activities.MainActivity" android:exported="true" />--> | ||
| <activity android:name=".ui.activities.SettingsActivity" android:exported="true"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.APPLICATION_PREFERENCES"/> | ||
| </intent-filter> | ||
| </activity> | ||
| <!--<activity android:name=".ui.activities.HistoryActivity" android:exported="true" />--> | ||
| <activity android:name=".ui.activities.SettingsMainViewActivity" android:exported="false"/> | ||
| <!--<activity android:name=".ui.activities.SettingsVehicleActivity" android:exported="false"/>--> | ||
| <activity android:name=".ui.activities.LibsActivity" android:exported="false" /> | ||
| <activity android:name=".ui.activities.AboutActivity" android:exported="false" /> | ||
| <activity android:name=".ui.activities.SettingsApisActivity" android:exported="false" /> | ||
| <activity android:name=".ui.activities.DebugActivity" android:exported="false" /> | ||
| <activity android:name=".compose.ComposeSettingsActivity" android:exported="false" /> | ||
|
|
||
| <meta-data android:name="com.android.automotive" | ||
| android:resource="@xml/automotive_app_desc"/> | ||
| <meta-data | ||
| android:name="androidx.car.app.minCarApiLevel" | ||
| android:value="6"/> | ||
| <service android:name=".dataCollector.DataCollector" | ||
| android:foregroundServiceType="location" | ||
| android:enabled="true" | ||
| android:exported="true"/> | ||
| <service android:name=".liveDataApi.uploadService.UploadService" | ||
| android:enabled="true" | ||
| android:exported="true"/> | ||
| </application> | ||
|
|
||
| </manifest> |
24 changes: 24 additions & 0 deletions
24
automotive/src/carapp/java/com/ixam97/carStatsViewer/carApp/CarStatsViewerService.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package com.ixam97.carStatsViewer.carApp | ||
|
|
||
| import android.content.pm.ApplicationInfo | ||
| import androidx.car.app.CarAppService | ||
| import androidx.car.app.Session | ||
| import androidx.car.app.SessionInfo | ||
| import androidx.car.app.validation.HostValidator | ||
|
|
||
|
|
||
| class CarStatsViewerService : CarAppService() { | ||
| override fun onCreateSession(sessionInfo: SessionInfo): Session { | ||
| return CarStatsViewerSession() | ||
| } | ||
|
|
||
| override fun createHostValidator(): HostValidator { | ||
| return if (applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0) { | ||
| HostValidator.ALLOW_ALL_HOSTS_VALIDATOR | ||
| } else { | ||
| HostValidator.Builder(applicationContext) | ||
| .addAllowedHosts(androidx.car.app.R.array.hosts_allowlist_sample) | ||
| .build() | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.