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

Commit 3fb31117 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '1919-t-parental' into 'v1-t'

Parental control changes

See merge request !206
parents 74fe9c01 9fe4848c
Loading
Loading
Loading
Loading
+42 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright Murena SAS 2024
  ~ 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"
    android:width="32dp"
    android:height="32dp"
    android:viewportWidth="32"
    android:viewportHeight="32">
  <group>
    <clip-path
        android:pathData="M0,0h32v32h-32z"/>
    <path
        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
        android:fillColor="#953EB4"/>
    <path
        android:pathData="M18.5,15.75C19.19,15.75 19.75,15.19 19.75,14.5C19.75,13.81 19.19,13.25 18.5,13.25C17.81,13.25 17.25,13.81 17.25,14.5C17.25,15.19 17.81,15.75 18.5,15.75Z"
        android:fillColor="#ffffff"/>
    <path
        android:pathData="M13.5,15.75C14.19,15.75 14.75,15.19 14.75,14.5C14.75,13.81 14.19,13.25 13.5,13.25C12.81,13.25 12.25,13.81 12.25,14.5C12.25,15.19 12.81,15.75 13.5,15.75Z"
        android:fillColor="#ffffff"/>
    <path
        android:pathData="M16,21C18.01,21 19.74,19.77 20.5,18H11.5C12.26,19.77 13.99,21 16,21Z"
        android:fillColor="#ffffff"/>
    <path
        android:pathData="M23.859,19.497C22.519,22.503 19.506,24.6 16,24.6C12.494,24.6 9.481,22.503 8.141,19.497C6.568,19.112 5.4,17.692 5.4,16C5.4,14.308 6.568,12.888 8.141,12.503C9.481,9.497 12.494,7.4 16,7.4C19.506,7.4 22.519,9.497 23.859,12.503C25.432,12.888 26.6,14.308 26.6,16C26.6,17.692 25.432,19.112 23.859,19.497ZM22.716,17.98C21.862,20.882 19.178,23 16,23C12.822,23 10.138,20.882 9.284,17.98C9.191,17.993 9.096,18 9,18C7.895,18 7,17.105 7,16C7,14.896 7.895,14 9,14C9.096,14 9.191,14.007 9.284,14.02C10.138,11.118 12.822,9 16,9C19.178,9 21.862,11.118 22.716,14.02C22.809,14.007 22.904,14 23,14C24.105,14 25,14.896 25,16C25,17.105 24.105,18 23,18C22.904,18 22.809,17.993 22.716,17.98Z"
        android:fillColor="#ffffff"
        android:fillType="evenOdd"/>
  </group>
</vector>
+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@
            android:layout_height="wrap_content"
            android:layout_marginTop="16dp"
            android:gravity="center_horizontal"
            android:text="@string/disabled_by_policy_title"
            android:text="@string/e_disabled_by_policy_title"
            android:textAppearance="@style/TextAppearance.AdminDialogTitle"/>
    </LinearLayout>

+5 −0
Original line number Diff line number Diff line
@@ -62,4 +62,9 @@
    <string name="e_version_reboot_pending_summary">/e/OS v<xliff:g id="version" example="6.0">%1$s</xliff:g> - installed reboot required</string>

    <string name="e_developer_options">/e/OS developer options</string>

    <string name="parental_control_dashboard_title">Parental control</string>
    <string name="parental_control_dashboard_summary">Helps parent to control child device</string>

    <string name="e_disabled_by_policy_title">"This setting is blocked"</string>
</resources>
 No newline at end of file
+28 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  Copyright (C) 2019-2024 Murena 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="parental_control"
    android:title="@string/parental_control_dashboard_title">

    <Preference>
        <intent android:action="android.intent.action.MAIN"
            android:targetPackage="foundation.e.parentalcontrol"
            android:targetClass="foundation.e.parentalcontrol.MainActivity" />
    </Preference>
</PreferenceScreen>
+8 −0
Original line number Diff line number Diff line
@@ -185,6 +185,14 @@
        android:order="-35"
        android:fragment="com.android.settings.privacy.AdvancedPrivacyDashboardFragment"/>

    <com.android.settings.widget.HomepagePreference
        android:key="top_level_parental_control"
        android:title="@string/parental_control_dashboard_title"
        android:summary="@string/parental_control_dashboard_summary"
        android:icon="@drawable/ic_e_settings_parental_control"
        android:order="-32"
        android:fragment="com.android.settings.privacy.ParentalControlDashboardFragment"/>

    <com.android.settings.widget.HomepagePreference
        android:fragment="com.android.settings.location.LocationSettings"
        android:icon="@drawable/ic_e_settings_location"
Loading