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

Skip to content
Commits on Source (885)
stages:
- build
image:
name: registry.gitlab.e.foundation:5000/e/os/docker-lineage-cicd:latest
entrypoint: [""]
variables:
REPO_BRANCH: eelo-0.2
REPO_DIRECTORY: EELO_0_2
REPO_URL: https://gitlab.e.foundation/e/os/android.git
PROJECT_PATH: packages/apps/Settings
build_module:
variables:
GIT_STRATEGY: none
stage: build
script:
- cd /srv/src/${REPO_DIRECTORY}
- source build/envsetup.sh
- mka clean
- repo init -u "${REPO_URL}" -b "${REPO_BRANCH}"
- repo sync --force-sync -d
- cd packages/apps/Settings
- git fetch e
- git checkout ${CI_COMMIT_SHA}
- mma
- repo sync --force-sync -d .
- mka clean
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
...@@ -11,7 +12,8 @@ include $(BUILD_STATIC_JAVA_LIBRARY) ...@@ -11,7 +12,8 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
# Build the Settings APK # Build the Settings APK
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_JAVA_LIBRARIES := bouncycastle core-oj telephony-common ims-common LOCAL_JAVA_LIBRARIES := bouncycastle core-oj telephony-common telephony-ext ims-common
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v4 \ android-support-v4 \
android-support-v13 \ android-support-v13 \
...@@ -20,12 +22,14 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ ...@@ -20,12 +22,14 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v7-appcompat \ android-support-v7-appcompat \
android-support-v14-preference \ android-support-v14-preference \
jsr305 \ jsr305 \
settings-logtags settings-logtags \
org.cyanogenmod.platform.internal
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(call all-java-files-under, src) $(call all-java-files-under, src) \
src/com/android/settings/EventLogTags.logtags
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
frameworks/support/v7/preference/res \ frameworks/support/v7/preference/res \
......
...@@ -86,6 +86,11 @@ ...@@ -86,6 +86,11 @@
<uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/> <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
<uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/> <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
<uses-permission android:name="android.permission.DELETE_PACKAGES"/> <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
<uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />
<uses-permission android:name="cyanogenmod.permission.PROTECTED_APP" />
<uses-permission android:name="cyanogenmod.permission.WRITE_SETTINGS" />
<uses-permission android:name="cyanogenmod.permission.MANAGE_REMOTE_PREFERENCES" />
<application android:label="@string/settings_label" <application android:label="@string/settings_label"
android:icon="@mipmap/ic_launcher_settings" android:icon="@mipmap/ic_launcher_settings"
...@@ -312,7 +317,11 @@ ...@@ -312,7 +317,11 @@
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" /> android:value="true" />
</activity> </activity>
<activity android:name=".SubSettings$SavedAccessPointsSubSettings"
android:taskAffinity="com.android.settings"
android:configChanges="orientation|keyboardHidden|screenSize"
android:parentActivityName="Settings">
</activity>
<activity android:name="Settings$SavedAccessPointsSettingsActivity" <activity android:name="Settings$SavedAccessPointsSettingsActivity"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:label="@string/wifi_saved_access_points_label" android:label="@string/wifi_saved_access_points_label"
...@@ -402,7 +411,6 @@ ...@@ -402,7 +411,6 @@
android:launchMode="singleTask" android:launchMode="singleTask"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:parentActivityName="Settings$WirelessSettingsActivity"
android:process="com.android.phone"> android:process="com.android.phone">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.APN_SETTINGS" /> <action android:name="android.settings.APN_SETTINGS" />
...@@ -419,9 +427,16 @@ ...@@ -419,9 +427,16 @@
android:value="com.android.settings.ApnSettings" /> android:value="com.android.settings.ApnSettings" />
</activity> </activity>
<activity android:name=".SubSettings$BluetoothSubSettings"
android:taskAffinity="com.android.settings"
android:configChanges="orientation|keyboardHidden|screenSize"
android:parentActivityName="Settings">
</activity>
<activity android:name="Settings$BluetoothSettingsActivity" <activity android:name="Settings$BluetoothSettingsActivity"
android:label="@string/bluetooth_settings_title" android:label="@string/bluetooth_settings_title"
android:icon="@drawable/ic_settings_bluetooth" android:icon="@drawable/ic_settings_bluetooth"
android:configChanges="orientation|keyboardHidden|screenSize"
android:taskAffinity=""> android:taskAffinity="">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.BLUETOOTH_SETTINGS" /> <action android:name="android.settings.BLUETOOTH_SETTINGS" />
...@@ -455,6 +470,7 @@ ...@@ -455,6 +470,7 @@
<activity android:name=".bluetooth.DevicePickerActivity" <activity android:name=".bluetooth.DevicePickerActivity"
android:theme="@style/Theme.SubSettingsDialogWhenLarge" android:theme="@style/Theme.SubSettingsDialogWhenLarge"
android:label="@string/device_picker" android:label="@string/device_picker"
android:configChanges="orientation|keyboardHidden|screenSize"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
<intent-filter> <intent-filter>
<action android:name="android.bluetooth.devicepicker.action.LAUNCH" /> <action android:name="android.bluetooth.devicepicker.action.LAUNCH" />
...@@ -519,7 +535,6 @@ ...@@ -519,7 +535,6 @@
android:value="com.android.settings.wifi.p2p.WifiP2pSettings" /> android:value="com.android.settings.wifi.p2p.WifiP2pSettings" />
</activity> </activity>
<activity android:name="Settings$VpnSettingsActivity" <activity android:name="Settings$VpnSettingsActivity"
android:label="@string/vpn_settings_title" android:label="@string/vpn_settings_title"
android:icon="@drawable/ic_settings_wireless" android:icon="@drawable/ic_settings_wireless"
...@@ -555,7 +570,7 @@ ...@@ -555,7 +570,7 @@
<category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<intent-filter android:priority="5"> <intent-filter android:priority="6">
<action android:name="com.android.settings.action.SETTINGS" /> <action android:name="com.android.settings.action.SETTINGS" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.category" <meta-data android:name="com.android.settings.category"
...@@ -566,6 +581,23 @@ ...@@ -566,6 +581,23 @@
android:value="true" /> android:value="true" />
</activity> </activity>
<activity android:name="Settings$TimerSwitchSettingsActivity"
android:label="@string/timer_switch_settings_title"
android:icon="@drawable/ic_settings_timerswitch"
android:taskAffinity="">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter android:priority="5">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.system" />
<meta-data android:name="com.android.settings.ACTIVITY_ACTION"
android:value="qualcomm.intent.action.TIMER_SWITCH" />
</activity>
<activity android:name="DateTimeSettingsSetupWizard" <activity android:name="DateTimeSettingsSetupWizard"
android:label="@string/date_and_time" android:label="@string/date_and_time"
android:theme="@android:style/Theme.DeviceDefault.Light.NoActionBar" android:theme="@android:style/Theme.DeviceDefault.Light.NoActionBar"
...@@ -599,7 +631,8 @@ ...@@ -599,7 +631,8 @@
android:label="@string/language_keyboard_settings_title" android:label="@string/language_keyboard_settings_title"
android:icon="@drawable/ic_settings_language" android:icon="@drawable/ic_settings_language"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"> android:parentActivityName="Settings"
android:configChanges="keyboard|keyboardHidden">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.VOICE_LAUNCH" />
...@@ -1262,11 +1295,10 @@ ...@@ -1262,11 +1295,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="@*cyanogenmod.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" />
...@@ -1277,7 +1309,6 @@ ...@@ -1277,7 +1309,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"
...@@ -1291,6 +1322,30 @@ ...@@ -1291,6 +1322,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="@*cyanogenmod.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="@*cyanogenmod.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"
...@@ -1717,6 +1772,7 @@ ...@@ -1717,6 +1772,7 @@
<activity android:name="ChooseLockGeneric" <activity android:name="ChooseLockGeneric"
android:label="@string/lockpassword_choose_lock_generic_header" android:label="@string/lockpassword_choose_lock_generic_header"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:theme="@style/SetupWizardTheme.Light"
android:exported="false" /> android:exported="false" />
<activity android:name=".password.SetNewPasswordActivity" <activity android:name=".password.SetNewPasswordActivity"
...@@ -1764,6 +1820,7 @@ ...@@ -1764,6 +1820,7 @@
<activity android:name="ChooseLockGeneric$InternalActivity" android:exported="false" <activity android:name="ChooseLockGeneric$InternalActivity" android:exported="false"
android:label="@string/lockpassword_choose_lock_generic_header" android:label="@string/lockpassword_choose_lock_generic_header"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:theme="@style/SetupWizardTheme.Light"
/> />
<activity android:name="SetupChooseLockPattern" <activity android:name="SetupChooseLockPattern"
...@@ -1771,6 +1828,10 @@ ...@@ -1771,6 +1828,10 @@
android:taskAffinity="com.android.wizard" android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardTheme.Light" /> android:theme="@style/SetupWizardTheme.Light" />
<activity android:name="ChooseLockPatternSize"
android:exported="false"
android:theme="@style/SetupWizardTheme.Light" />
<activity android:name="ChooseLockPattern" <activity android:name="ChooseLockPattern"
android:exported="false" android:exported="false"
android:theme="@style/SetupWizardTheme.Light" /> android:theme="@style/SetupWizardTheme.Light" />
...@@ -2437,11 +2498,11 @@ ...@@ -2437,11 +2498,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" />
...@@ -2465,6 +2526,25 @@ ...@@ -2465,6 +2526,25 @@
android:value="com.android.settings.datausage.DataUsageSummary" /> android:value="com.android.settings.datausage.DataUsageSummary" />
</activity> </activity>
<activity android:name="Settings$RoamingSettingsActivity"
android:label="@string/label_global_roaming_settings"
android:icon="@drawable/ic_settings_roaming"
android:taskAffinity=""
android:enabled="false">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
<intent-filter android:priority="1">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.wireless" />
<meta-data android:name="com.android.settings.ACTIVITY_ACTION"
android:value="com.android.action.roamingsettings" />
</activity>
<activity android:name="Settings$DreamSettingsActivity" <activity android:name="Settings$DreamSettingsActivity"
android:label="@string/screensaver_settings_title" android:label="@string/screensaver_settings_title"
android:icon="@drawable/ic_settings_display" android:icon="@drawable/ic_settings_display"
...@@ -2522,8 +2602,6 @@ ...@@ -2522,8 +2602,6 @@
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="com.android.settings.action.SETTINGS" /> <action android:name="com.android.settings.action.SETTINGS" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.device" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.nfc.PaymentSettings" /> android:value="com.android.settings.nfc.PaymentSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
...@@ -2544,7 +2622,7 @@ ...@@ -2544,7 +2622,7 @@
<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:parentActivityName="Settings$PaymentSettingsActivity"> android:parentActivityName="Settings$PaymentSettingsActivity"
android:excludeFromRecents="true"> android:excludeFromRecents="true">
</activity> </activity>
...@@ -2746,6 +2824,15 @@ ...@@ -2746,6 +2824,15 @@
android:value="true" /> android:value="true" />
</activity> </activity>
<activity android:name=".applications.LockPatternActivity"
android:label="@string/protected_apps"
android:excludeFromRecents="true">
<intent-filter>
<action android:name=".applications.LockPatternActivity" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<receiver android:name=".widget.SettingsAppWidgetProvider" <receiver android:name=".widget.SettingsAppWidgetProvider"
android:label="@string/gadget_title" android:label="@string/gadget_title"
android:exported="false" android:exported="false"
...@@ -3089,7 +3176,60 @@ ...@@ -3089,7 +3176,60 @@
android:theme="@android:style/Theme.NoDisplay" android:theme="@android:style/Theme.NoDisplay"
android:permission="android.permission.DUMP" android:permission="android.permission.DUMP"
android:enabled="@bool/config_has_help" /> android:enabled="@bool/config_has_help" />
<!-- This is the longest AndroidManifest.xml ever. --> <!-- This is the longest AndroidManifest.xml ever. -->
<receiver
android:name=".cyanogenmod.ProtectedAppsReceiver"
android:permission="cyanogenmod.permission.PROTECTED_APP">
<intent-filter>
<action android:name="cyanogenmod.intent.action.PACKAGE_PROTECTED" />
</intent-filter>
</receiver>
<activity android:name=".applications.ProtectedAppsActivity"
android:label="@string/protected_apps"
android:excludeFromRecents="true"
android:configChanges="orientation">
<intent-filter>
<action android:name=".applications.ProtectedAppsActivity" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".applications.LockPatternActivity"
android:label="@string/protected_apps"
android:excludeFromRecents="true">
<intent-filter>
<action android:name=".applications.LockPatternActivity" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".CarrierSelection"
android:label="@string/shortcut_carrier_title"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"
android:excludeFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
</activity>
<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 android:priority="6">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.system" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.MicroGSettings" />
</activity>
</application> </application>
</manifest> </manifest>
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
-keep class com.android.settings.display.*FragmentForSetupWizard -keep class com.android.settings.display.*FragmentForSetupWizard
-keep class com.android.settings.display.NightDisplaySettings -keep class com.android.settings.display.NightDisplaySettings
-keep class com.android.settings.cyanogenmod.*Settings
# Keep click responders # Keep click responders
-keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity { -keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {
*** onClick*(...); *** onClick*(...);
......
...@@ -14,47 +14,7 @@ ...@@ -14,47 +14,7 @@
limitations under the License. limitations under the License.
--> -->
<TabHost xmlns:android="http://schemas.android.com/apk/res/android" <selector xmlns:android="http://schemas.android.com/apk/res/android">
android:id="@android:id/tabhost" <item android:state_enabled="false" android:color="#24000000" />
android:layout_width="match_parent" <item android:color="#8a000000" />
android:layout_height="match_parent"> </selector>
<LinearLayout
android:id="@+id/tabs_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none"
android:fillViewport="true">
<TabWidget
android:id="@android:id/tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
style="?android:attr/tabWidgetStyle" />
</HorizontalScrollView>
<!-- give an empty content area to make tabhost happy -->
<FrameLayout
android:id="@android:id/tabcontent"
android:layout_width="0dip"
android:layout_height="0dip" />
<FrameLayout
android:id="@+id/prefs_container"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:clipChildren="false"
android:clipToPadding="false"
android:smoothScrollbar="false" />
</LinearLayout>
</TabHost>