.gitlab-ci.yml

+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

Android.mk

@@ -36,7 +36,8 @@ LOCAL_JAVA_LIBRARIES := \
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     jsr305 \
-    settings-logtags
+    settings-logtags \
+    org.lineageos.platform.internal
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 

AndroidManifest.xml

@@ -88,7 +88,7 @@
     <uses-permission android:name="android.permission.NETWORK_SETTINGS" />
 
     <application android:label="@string/settings_label"
-            android:icon="@drawable/ic_launcher_settings"
+            android:icon="@mipmap/ic_launcher"
             android:taskAffinity=""
             android:theme="@style/Theme.Settings"
             android:hardwareAccelerated="true"
@@ -1207,11 +1207,10 @@
             </intent-filter>
         </activity>
 
-        <!--
         <activity android:name="Settings$AppOpsSummaryActivity"
-                android:label="@string/app_ops_settings"
+                android:label="@*lineageos.platform:string/privacy_guard_manager_title"
                 android:taskAffinity=""
-                android:enabled="false">
+                android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APP_OPS_SETTINGS" />
@@ -1222,7 +1221,6 @@
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.AppOpsSummary" />
         </activity>
-        -->
 
         <activity android:name="Settings$BackgroundCheckSummaryActivity"
                 android:label="@string/background_check_title"
@@ -1236,6 +1234,30 @@
                 android:value="com.android.settings.applications.BackgroundCheckSummary" />
         </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"
                 android:label="@string/location_settings_title"
                 android:icon="@drawable/ic_settings_location"
@@ -1258,7 +1280,7 @@
         </activity>
 
         <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:configChanges="orientation|keyboardHidden|screenSize"
                 android:taskAffinity=""
@@ -1316,7 +1338,7 @@
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="SecuritySettings"
-                android:label="@string/security_settings_title"
+                android:label="@string/security_privacy_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:exported="true"
                 android:targetActivity="Settings$SecuritySettingsActivity">
@@ -1727,6 +1749,10 @@
             android:taskAffinity="com.android.wizard"
             android:theme="@style/GlifTheme.Light" />
 
+        <activity android:name=".password.ChooseLockPatternSize"
+            android:exported="false"
+            android:theme="@style/GlifTheme.Light" />
+
         <activity android:name=".password.ChooseLockPattern"
             android:exported="false"
             android:theme="@style/GlifTheme.Light" />
@@ -1983,15 +2009,6 @@
                 android:value="com.android.settings.print.PrintJobSettingsFragment" />
         </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"
                   android:label="@string/select_application"
                   android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
@@ -2378,11 +2395,11 @@
                 android:label="@string/crypt_keeper_encrypt_title">
             <intent-filter android:priority="1">
                 <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>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" /> />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.CryptKeeperSettings" />
@@ -2509,8 +2526,8 @@
 
         <activity android:name=".nfc.HowItWorks"
                   android:label="@string/nfc_payment_settings_title"
+                  android:excludeFromRecents="true"
                   android:parentActivityName="Settings$PaymentSettingsActivity">
-                  android:excludeFromRecents="true">
         </activity>
 
         <activity android:name=".SmsDefaultDialog"
@@ -3292,6 +3309,39 @@
             </intent-filter>
         </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. -->
     </application>
 </manifest>

proguard.flags

@@ -20,6 +20,8 @@
     *** get*();
 }
 
+-keep class com.android.settings.lineageos.*Settings
+
 # Keep classes that may be inflated from XML.
 -keepclasseswithmembers class * {
     public <init>(android.content.Context, android.util.AttributeSet);

res/layout/screen_zoom_preview_2.xml → res/color/audio_icon.xml

 <?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");
      you may not use this file except in compliance with the License.
@@ -13,8 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.settings.display.AppGridView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:importantForAccessibility="noHideDescendants" />
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#24000000" />
+    <item android:color="#8a000000" />
+</selector>
+