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

Skip to content
Commits on Source (306)
stages:
- build
image:
name: registry.gitlab.e.foundation:5000/e/os/docker-lineage-cicd:latest
entrypoint: [""]
variables:
REPO_BRANCH: v1-oreo
REPO_DIRECTORY: OREO
REPO_URL: https://gitlab.e.foundation/e/os/android.git
PROJECT_PATH: packages/apps/Settings
SRC_PATH: /srv/src/${REPO_DIRECTORY}
APK_NAME: Settings.apk
APK_PATH: /srv/src/${REPO_DIRECTORY}/out/target/product/generic/system/priv-app/Settings/${APK_NAME}
build_module:
variables:
GIT_STRATEGY: none
artifacts:
name: "$CI_JOB_NAME"
paths:
- apks/*
stage: build
script:
- mkdir -p ${CI_PROJECT_DIR}/apks
- echo src=${SRC_PATH}
- echo apk=${APK_PATH}
- cd ${SRC_PATH}
- source build/envsetup.sh
- mka clean
- repo init -u "${REPO_URL}" -b "${REPO_BRANCH}"
- repo sync --force-sync -d
- cd ${PROJECT_PATH}
- git fetch e
- git checkout ${CI_COMMIT_SHA}
- mma
- cp ${APK_PATH} ${CI_PROJECT_DIR}/apks/${APK_NAME}
- repo sync --force-sync -d .
- git clean -fd
- mka clean
...@@ -36,7 +36,8 @@ LOCAL_JAVA_LIBRARIES := \ ...@@ -36,7 +36,8 @@ LOCAL_JAVA_LIBRARIES := \
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
jsr305 \ jsr305 \
settings-logtags settings-logtags \
org.lineageos.platform.internal
LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_PROGUARD_FLAG_FILES := proguard.flags
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<uses-permission android:name="android.permission.NETWORK_SETTINGS" /> <uses-permission android:name="android.permission.NETWORK_SETTINGS" />
<application android:label="@string/settings_label" <application android:label="@string/settings_label"
android:icon="@drawable/ic_launcher_settings" android:icon="@mipmap/ic_launcher"
android:taskAffinity="" android:taskAffinity=""
android:theme="@style/Theme.Settings" android:theme="@style/Theme.Settings"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
...@@ -1207,11 +1207,10 @@ ...@@ -1207,11 +1207,10 @@
</intent-filter> </intent-filter>
</activity> </activity>
<!--
<activity android:name="Settings$AppOpsSummaryActivity" <activity android:name="Settings$AppOpsSummaryActivity"
android:label="@string/app_ops_settings" android:label="@*lineageos.platform:string/privacy_guard_manager_title"
android:taskAffinity="" android:taskAffinity=""
android:enabled="false"> android:excludeFromRecents="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.APP_OPS_SETTINGS" /> <action android:name="android.settings.APP_OPS_SETTINGS" />
...@@ -1222,7 +1221,6 @@ ...@@ -1222,7 +1221,6 @@
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.applications.AppOpsSummary" /> android:value="com.android.settings.applications.AppOpsSummary" />
</activity> </activity>
-->
<activity android:name="Settings$BackgroundCheckSummaryActivity" <activity android:name="Settings$BackgroundCheckSummaryActivity"
android:label="@string/background_check_title" android:label="@string/background_check_title"
...@@ -1236,6 +1234,30 @@ ...@@ -1236,6 +1234,30 @@
android:value="com.android.settings.applications.BackgroundCheckSummary" /> android:value="com.android.settings.applications.BackgroundCheckSummary" />
</activity> </activity>
<!-- Still need a top-level activity for showing app ops details. Aliasing
trick is so the code that is now a fragment can still be called
AppOpsDetails. -->
<activity android:name=".applications.AppOpsDetailsTop"
android:label="@*lineageos.platform:string/privacy_guard_manager_title"
android:exported="true"
android:taskAffinity=""
android:excludeFromRecents="true"
android:parentActivityName="Settings$AppOpsSummaryActivity">
</activity>
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name=".applications.AppOpsDetails"
android:label="@*lineageos.platform:string/privacy_guard_manager_title"
android:exported="true"
android:excludeFromRecents="true"
android:targetActivity=".applications.AppOpsDetailsTop">
<intent-filter>
<action android:name="android.settings.APP_OPS_DETAILS_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="package" />
</intent-filter>
</activity-alias>
<activity android:name="Settings$LocationSettingsActivity" <activity android:name="Settings$LocationSettingsActivity"
android:label="@string/location_settings_title" android:label="@string/location_settings_title"
android:icon="@drawable/ic_settings_location" android:icon="@drawable/ic_settings_location"
...@@ -1258,7 +1280,7 @@ ...@@ -1258,7 +1280,7 @@
</activity> </activity>
<activity android:name="Settings$SecuritySettingsActivity" <activity android:name="Settings$SecuritySettingsActivity"
android:label="@string/security_settings_title" android:label="@string/security_privacy_settings_title"
android:icon="@drawable/ic_settings_security" android:icon="@drawable/ic_settings_security"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:taskAffinity="" android:taskAffinity=""
...@@ -1316,7 +1338,7 @@ ...@@ -1316,7 +1338,7 @@
<!-- Keep compatibility with old shortcuts. --> <!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="SecuritySettings" <activity-alias android:name="SecuritySettings"
android:label="@string/security_settings_title" android:label="@string/security_privacy_settings_title"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:exported="true" android:exported="true"
android:targetActivity="Settings$SecuritySettingsActivity"> android:targetActivity="Settings$SecuritySettingsActivity">
...@@ -1727,6 +1749,10 @@ ...@@ -1727,6 +1749,10 @@
android:taskAffinity="com.android.wizard" android:taskAffinity="com.android.wizard"
android:theme="@style/GlifTheme.Light" /> android:theme="@style/GlifTheme.Light" />
<activity android:name=".password.ChooseLockPatternSize"
android:exported="false"
android:theme="@style/GlifTheme.Light" />
<activity android:name=".password.ChooseLockPattern" <activity android:name=".password.ChooseLockPattern"
android:exported="false" android:exported="false"
android:theme="@style/GlifTheme.Light" /> android:theme="@style/GlifTheme.Light" />
...@@ -1983,15 +2009,6 @@ ...@@ -1983,15 +2009,6 @@
android:value="com.android.settings.print.PrintJobSettingsFragment" /> android:value="com.android.settings.print.PrintJobSettingsFragment" />
</activity> </activity>
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="DevelopmentSettings"
android:exported="true"
android:label="@string/development_settings_title"
android:targetActivity="Settings$DevelopmentSettingsActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.development.DevelopmentSettings" />
</activity-alias>
<activity android:name=".development.AppPicker" <activity android:name=".development.AppPicker"
android:label="@string/select_application" android:label="@string/select_application"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" /> android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
...@@ -2378,11 +2395,11 @@ ...@@ -2378,11 +2395,11 @@
android:label="@string/crypt_keeper_encrypt_title"> android:label="@string/crypt_keeper_encrypt_title">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.app.action.START_ENCRYPTION" /> <action android:name="android.app.action.START_ENCRYPTION" />
<category android:name="android.intent.category.DEFAULT" /> /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.CryptKeeperSettings" /> android:value="com.android.settings.CryptKeeperSettings" />
...@@ -2509,8 +2526,8 @@ ...@@ -2509,8 +2526,8 @@
<activity android:name=".nfc.HowItWorks" <activity android:name=".nfc.HowItWorks"
android:label="@string/nfc_payment_settings_title" android:label="@string/nfc_payment_settings_title"
android:excludeFromRecents="true"
android:parentActivityName="Settings$PaymentSettingsActivity"> android:parentActivityName="Settings$PaymentSettingsActivity">
android:excludeFromRecents="true">
</activity> </activity>
<activity android:name=".SmsDefaultDialog" <activity android:name=".SmsDefaultDialog"
...@@ -3292,6 +3309,39 @@ ...@@ -3292,6 +3309,39 @@
</intent-filter> </intent-filter>
</activity> </activity>
<!-- /e/ specific changes -->
<activity android:name="Settings$MicroGActivity"
android:label="@string/micro_g"
android:icon="@drawable/ic_microg_settings">
<intent-filter android:priority="1">
<action android:name="android.settings.MICROG_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.homepage" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.MicroGSettings" />
</activity>
<activity android:name="Settings$OpenKeychainActivity"
android:label="@string/open_keychain"
android:icon="@drawable/ic_open_keychain">
<intent-filter android:priority="1">
<action android:name="android.settings.OPENKEYCHAIN_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.homepage" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.OpenKeychainSettings" />
</activity>
<!-- This is the longest AndroidManifest.xml ever. --> <!-- This is the longest AndroidManifest.xml ever. -->
</application> </application>
</manifest> </manifest>
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
*** get*(); *** get*();
} }
-keep class com.android.settings.lineageos.*Settings
# Keep classes that may be inflated from XML. # Keep classes that may be inflated from XML.
-keepclasseswithmembers class * { -keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet); public <init>(android.content.Context, android.util.AttributeSet);
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 The Android Open Source Project <!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
...@@ -13,8 +13,9 @@ ...@@ -13,8 +13,9 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<com.android.settings.display.AppGridView
xmlns:android="http://schemas.android.com/apk/res/android" <selector xmlns:android="http://schemas.android.com/apk/res/android">
android:layout_width="match_parent" <item android:state_enabled="false" android:color="#24000000" />
android:layout_height="match_parent" <item android:color="#8a000000" />
android:importantForAccessibility="noHideDescendants" /> </selector>