add lockscreen fragment
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c429015..42fdea8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,6 +13,7 @@
<entry key="app/src/main/res/drawable/ic_homepage_bars.xml" value="0.5109375" />
<entry key="app/src/main/res/drawable/ic_launcher_background.xml" value="0.3067708333333333" />
<entry key="app/src/main/res/drawable/ic_launcher_foreground.xml" value="0.2869791666666667" />
+ <entry key="app/src/main/res/drawable/ic_lockscreen_tile.xml" value="0.5130208333333334" />
<entry key="app/src/main/res/drawable/ic_settings_buttons.xml" value="0.3078125" />
<entry key="app/src/main/res/drawable/ic_settings_more.xml" value="0.30885416666666665" />
<entry key="app/src/main/res/drawable/ic_settings_omnigears.xml" value="0.3098958333333333" />
@@ -28,15 +29,13 @@
<entry key="app/src/main/res/xml/bars_settings_preferences.xml" value="0.3098958333333333" />
<entry key="app/src/main/res/xml/bottom_navigation.xml" value="0.2375" />
<entry key="app/src/main/res/xml/button_settings_preferences.xml" value="0.4979166666666667" />
+ <entry key="app/src/main/res/xml/lockscreen_settings_preferences.xml" value="0.49583333333333335" />
<entry key="app/src/main/res/xml/more_settings_preferences.xml" value="0.29375" />
<entry key="app/src/main/res/xml/root_preferences.xml" value="0.4979166666666667" />
<entry key="app/src/main/res/xml/settings_preferences.xml" value="0.23541666666666666" />
</map>
</option>
</component>
- <component name="ProjectPlainTextFileTypeManager">
- <file url="file://$PROJECT_DIR$/app/src/main/res/xml/bars_settings_preferences.xml" />
- </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e46aed6..aa8a6ad 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
- android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.OmniControl">
<activity
diff --git a/app/src/main/java/org/omnirom/control/GridViewFragment.kt b/app/src/main/java/org/omnirom/control/GridViewFragment.kt
index 838611c..33cda82 100644
--- a/app/src/main/java/org/omnirom/control/GridViewFragment.kt
+++ b/app/src/main/java/org/omnirom/control/GridViewFragment.kt
@@ -99,6 +99,14 @@
ButtonSettingsFragment()
)
)
+ gridItems.add(
+ FragmentGridItem(
+ R.string.lockscreen_item_title,
+ R.string.lockscreen_item_summary,
+ R.drawable.ic_lockscreen_tile,
+ LockscreenSettingsFragment()
+ )
+ )
if (Utils.isAvailableApp(requireContext(), "org.omnirom.omnistyle")) {
val wallpaperIntent = Intent()
wallpaperIntent.component = ComponentName(
diff --git a/app/src/main/java/org/omnirom/control/LockscreenSettingsFragment.kt b/app/src/main/java/org/omnirom/control/LockscreenSettingsFragment.kt
new file mode 100644
index 0000000..730dadc
--- /dev/null
+++ b/app/src/main/java/org/omnirom/control/LockscreenSettingsFragment.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2021 The OmniROM Project
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.omnirom.control
+
+import android.os.Bundle
+import android.provider.Settings
+import androidx.appcompat.app.AppCompatActivity
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+
+
+class LockscreenSettingsFragment : PreferenceFragmentCompat() {
+
+ override fun onResume() {
+ super.onResume()
+ (activity as? AppCompatActivity)?.supportActionBar?.setDisplayHomeAsUpEnabled(true)
+ (activity as? SettingsActivity)?.updateFragmentTitle(resources.getString(R.string.lockscreen_item_title))
+ }
+
+ override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+ setPreferencesFromResource(R.xml.lockscreen_settings_preferences, rootKey)
+ }
+
+ override fun onPreferenceTreeClick(preference: Preference?): Boolean {
+ return super.onPreferenceTreeClick(preference)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/omnirom/control/preference/SecureCheckBoxPreference.java b/app/src/main/java/org/omnirom/omnilib/preference/SecureCheckBoxPreference.java
similarity index 97%
rename from app/src/main/java/org/omnirom/control/preference/SecureCheckBoxPreference.java
rename to app/src/main/java/org/omnirom/omnilib/preference/SecureCheckBoxPreference.java
index 508fc7b..bf0b228 100644
--- a/app/src/main/java/org/omnirom/control/preference/SecureCheckBoxPreference.java
+++ b/app/src/main/java/org/omnirom/omnilib/preference/SecureCheckBoxPreference.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.omnirom.control.preference;
+package org.omnirom.omnilib.preference;
import android.content.Context;
import android.provider.Settings;
diff --git a/app/src/main/java/org/omnirom/control/preference/SecureSettingSwitchPreference.java b/app/src/main/java/org/omnirom/omnilib/preference/SecureSettingSwitchPreference.java
similarity index 97%
rename from app/src/main/java/org/omnirom/control/preference/SecureSettingSwitchPreference.java
rename to app/src/main/java/org/omnirom/omnilib/preference/SecureSettingSwitchPreference.java
index e4fc15b..65b4eaa 100644
--- a/app/src/main/java/org/omnirom/control/preference/SecureSettingSwitchPreference.java
+++ b/app/src/main/java/org/omnirom/omnilib/preference/SecureSettingSwitchPreference.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.omnirom.control.preference;
+package org.omnirom.omnilib.preference;
import android.content.Context;
import androidx.preference.SwitchPreference;
diff --git a/app/src/main/java/org/omnirom/control/preference/SystemCheckBoxPreference.java b/app/src/main/java/org/omnirom/omnilib/preference/SystemCheckBoxPreference.java
similarity index 97%
rename from app/src/main/java/org/omnirom/control/preference/SystemCheckBoxPreference.java
rename to app/src/main/java/org/omnirom/omnilib/preference/SystemCheckBoxPreference.java
index 4044947..9b025ea 100644
--- a/app/src/main/java/org/omnirom/control/preference/SystemCheckBoxPreference.java
+++ b/app/src/main/java/org/omnirom/omnilib/preference/SystemCheckBoxPreference.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.omnirom.control.preference;
+package org.omnirom.omnilib.preference;
import android.content.Context;
import androidx.preference.CheckBoxPreference;
diff --git a/app/src/main/java/org/omnirom/control/preference/SystemSettingSwitchPreference.java b/app/src/main/java/org/omnirom/omnilib/preference/SystemSettingSwitchPreference.java
similarity index 97%
rename from app/src/main/java/org/omnirom/control/preference/SystemSettingSwitchPreference.java
rename to app/src/main/java/org/omnirom/omnilib/preference/SystemSettingSwitchPreference.java
index f1316b1..aec0725 100644
--- a/app/src/main/java/org/omnirom/control/preference/SystemSettingSwitchPreference.java
+++ b/app/src/main/java/org/omnirom/omnilib/preference/SystemSettingSwitchPreference.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.omnirom.control.preference;
+package org.omnirom.omnilib.preference;
import android.content.Context;
import android.provider.Settings;
diff --git a/app/src/main/res/drawable/ic_lockscreen_tile.xml b/app/src/main/res/drawable/ic_lockscreen_tile.xml
new file mode 100644
index 0000000..881b1b4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lockscreen_tile.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Copyright (C) 2015 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.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:tint="?android:textColorPrimary"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M18,8H17V6A5,5 0 0,0 12,1A5,5 0 0,0 7,6V8H6A2,2 0 0,0 4,10V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V10A2,2 0 0,0 18,8M8.9,6C8.9,4.29 10.29,2.9 12,2.9C13.71,2.9 15.1,4.29 15.1,6V8H8.9V6M16,16H13V19H11V16H8V14H11V11H13V14H16V16Z" />
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aaa84b0..6dbd34b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,4 +44,9 @@
<string name="device_settings_title">Device settings</string>
<string name="device_settings_summary">Advanced device specific settings</string>
+
+ <string name="lockscreen_item_title">Lock screen items</string>
+ <string name="lockscreen_item_summary">Configure visibility of lock screen items</string>
+ <string name="lockscreen_weather_title">Show weather condition</string>
+ <string name="lockscreen_weather_summary">Show current weather condition and temperature</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/bars_settings_preferences.xml b/app/src/main/res/xml/bars_settings_preferences.xml
index dcbb0ff..e7c948e 100644
--- a/app/src/main/res/xml/bars_settings_preferences.xml
+++ b/app/src/main/res/xml/bars_settings_preferences.xml
@@ -4,7 +4,7 @@
android:key="statusbar_settings_category"
android:title="@string/statusbar_settings_category">
- <org.omnirom.control.preference.SecureSettingSwitchPreference
+ <org.omnirom.omnilib.preference.SecureSettingSwitchPreference
android:key="clock_seconds"
android:title="@string/status_bar_clock_seconds_title"
android:summary="@string/status_bar_clock_seconds_summary"
@@ -17,10 +17,11 @@
android:key="category_navigationbar"
android:title="@string/navigationbar_title">
- <org.omnirom.control.preference.SystemSettingSwitchPreference
+ <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
android:key="navbar_visibility"
android:title="@string/navigation_bar_show_title"
- android:summary="@string/navigation_bar_show_summary" />
+ android:summary="@string/navigation_bar_show_summary"
+ android:defaultValue="true"/>
</PreferenceCategory>
</PreferenceScreen>
diff --git a/app/src/main/res/xml/button_settings_preferences.xml b/app/src/main/res/xml/button_settings_preferences.xml
index fd0e52d..2ebedbd 100644
--- a/app/src/main/res/xml/button_settings_preferences.xml
+++ b/app/src/main/res/xml/button_settings_preferences.xml
@@ -7,7 +7,7 @@
android:key="button_power"
android:title="@string/global_actions_power_title" >
- <org.omnirom.control.preference.SystemSettingSwitchPreference
+ <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
android:key="advanced_reboot"
android:title="@string/global_actions_advanced_reboot_title"
android:summary="@string/global_actions_advanced_reboot_summary_new"
diff --git a/app/src/main/res/xml/lockscreen_settings_preferences.xml b/app/src/main/res/xml/lockscreen_settings_preferences.xml
new file mode 100644
index 0000000..fc09e06
--- /dev/null
+++ b/app/src/main/res/xml/lockscreen_settings_preferences.xml
@@ -0,0 +1,13 @@
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/lockscreen_item_title"
+ android:key="lockscreen_item">
+
+ <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
+ android:key="lockscreen_weather_enabled"
+ android:title="@string/lockscreen_weather_title"
+ android:summary="@string/lockscreen_weather_summary"
+ android:defaultValue="false" />
+
+</PreferenceScreen>
+