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

Commit 95e52269 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Merge branch '1111-a14-find-my-device' into 'a14'

Adding Find my device to the top level settings menu

See merge request !226
parents 7e1f968b abdbb95d
Loading
Loading
Loading
Loading
+29 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright Murena SAS 2025
  ~ 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 3 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 <https://www.gnu.org/licenses/>.
  -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:viewportWidth="32" android:viewportHeight="32" android:width="32dp" android:height="32dp">
<group>
<clip-path android:pathData="M0 0H32V32H0V0Z"/>
<path android:pathData="M7 0H25A7 7 0 0 1 32 7V25A7 7 0 0 1 25 32H7A7 7 0 0 1 0 25V7A7 7 0 0 1 7 0Z" android:fillColor="#0088ED"/>
<path android:pathData="M22.2808 4.54504H11.6445C10.744 4.54504 10.0072 5.28182 10.0072 6.18232V8.45287H11.6445V7.00096H22.2808V24.999H11.6445V23.5471H10.0072L10.0072 25.8176C10.0072 26.7181 10.744 27.4549 11.6445 27.4549H22.2808C23.1813 27.4549 23.918 26.7181 23.918 25.8176V6.18232C23.918 5.28182 23.1813 4.54504 22.2808 4.54504Z" android:fillColor="#FFFFFF"/>
<path android:pathData="M11.2351 12.6733C12.7868 12.8444 14.0184 14.0761 14.1896 15.6278H14.9561V16.372H14.1896C14.0184 17.9237 12.7868 19.1554 11.2351 19.3266V20.0931H10.4909V19.3266C8.93916 19.1554 7.70749 17.9237 7.53632 16.372H6.76978V15.6278H7.53632C7.70749 14.0761 8.93916 12.8444 10.4909 12.6733V11.9067H11.2351V12.6733ZM8.81661 15.9999C8.81661 14.8692 9.73246 13.9534 10.8632 13.9534C11.9939 13.9534 12.9098 14.8692 12.9098 15.9999C12.9098 17.1307 11.9939 18.0465 10.8632 18.0465C9.73246 18.0465 8.81661 17.1307 8.81661 15.9999Z" android:fillType="evenOdd" android:fillColor="#FFFFFF"/>
<path android:pathData="M10.8632 15.1813C10.4109 15.1813 10.0446 15.5476 10.0446 15.9999C10.0446 16.4522 10.4109 16.8186 10.8632 16.8186C11.3155 16.8186 11.6818 16.4522 11.6818 15.9999C11.6818 15.5476 11.3155 15.1813 10.8632 15.1813Z" android:fillColor="#FFFFFF"/>
<path android:pathData="M13.3193 15.1813H15.75166V16.81858H13.3193V15.1813Z" android:fillColor="#FFFFFF"/>
<path android:pathData="M10.0446 11.0813H11.68188V13.54398H10.0446V11.0813Z" android:fillColor="#FFFFFF"/>
<path android:pathData="M5.95544 15.1813H8.40746V16.81858H5.95544V15.1813Z" android:fillColor="#FFFFFF"/>
<path android:pathData="M10.0446 18.4561H11.68188V20.88328H10.0446V18.4561Z" android:fillColor="#FFFFFF"/>
</group>
</vector>
 No newline at end of file
+4 −0
Original line number Diff line number Diff line
@@ -70,4 +70,8 @@
 
    <!-- Refresh rate -->
    <string name="e_peak_refresh_rate_summary">Turn on this option to raise the refresh rate from 60 to %1$d Hz</string>

    <!-- /e/ Find my device -->
    <string name="find_my_device_dashboard_title" translatable="false">Find my Device</string>
    <string name="find_my_device_dashboard_summary">Will help you reveal this device location in case you cannot find it</string>
</resources>
+28 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  Copyright (C) 2019-2025 ECORP SAS

  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.
  -->

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:settings="http://schemas.android.com/apk/res-auto"
    android:key="find_my_device"
    android:title="@string/find_my_device_dashboard_title">

    <Preference>
        <intent android:action="android.intent.action.MAIN"
            android:targetPackage="foundation.e.findmydevice"
            android:targetClass="foundation.e.findmydevice.activity.FindMyDeviceActivity" />
    </Preference>
</PreferenceScreen>
+8 −0
Original line number Diff line number Diff line
@@ -193,6 +193,14 @@
        android:order="-32"
        android:fragment="com.android.settings.privacy.ParentalControlDashboardFragment"/>

    <com.android.settings.widget.HomepagePreference
        android:key="top_level_find_my_device"
        android:title="@string/find_my_device_dashboard_title"
        android:summary="@string/find_my_device_dashboard_summary"
        android:icon="@drawable/ic_e_settings_find_my_device"
        android:order="-31"
        android:fragment="com.android.settings.findmydevice.FindMyDeviceDashboardFragment"/>

    <com.android.settings.widget.HomepagePreference
        android:fragment="com.android.settings.location.LocationSettings"
        android:icon="@drawable/ic_e_settings_location"
+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ import com.android.settings.display.SmartAutoRotatePreferenceFragment;
import com.android.settings.display.darkmode.DarkModeSettingsFragment;
import com.android.settings.dream.DreamSettings;
import com.android.settings.enterprise.EnterprisePrivacySettings;
import com.android.settings.findmydevice.FindMyDeviceDashboardFragment;
import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;
import com.android.settings.fuelgauge.batterysaver.BatterySaverScheduleSettings;
import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings;
@@ -392,6 +393,7 @@ public class SettingsGateway {
            VibrationIntensitySettingsFragment.class.getName(),
            AdvancedPrivacyDashboardFragment.class.getName(),
            ParentalControlDashboardFragment.class.getName(),
            FindMyDeviceDashboardFragment.class.getName(),
    };

    public static final String[] SETTINGS_FOR_RESTRICTED = {
Loading