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

Commit c2c88894 authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Android (Google) Code Review
Browse files

Merge "Add education promo for App-to-Web" into main

parents 5038cdcb 36530601

libs/WindowManager/Shell/res/drawable/desktop_windowing_education_promo_background.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2024 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.

  -->



<shape android:shape="rectangle"

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <solid android:color="?androidprv:attr/materialColorSurfaceContainerLow" />

    <corners android:radius="@dimen/desktop_windowing_education_promo_corner_radius" />

</shape>

libs/WindowManager/Shell/res/layout/desktop_windowing_education_promo.xml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2024 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.

  -->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/education_container"

    android:layout_width="@dimen/desktop_windowing_education_promo_width"

    android:layout_height="@dimen/desktop_windowing_education_promo_height"

    android:elevation="1dp"

    android:orientation="vertical"

    android:paddingHorizontal="32dp"

    android:paddingVertical="24dp"

    android:background="@drawable/desktop_windowing_education_promo_background">

    <TextView

        android:id="@+id/education_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textSize="24sp"

        android:lineHeight="32dp"

        android:textFontWeight="400"

        android:fontFamily="google-sans-text"

        android:layout_gravity="center_horizontal"

        android:gravity="center"/>

</LinearLayout>

libs/WindowManager/Shell/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -186,4 +186,6 @@ 


    <!-- Apps that can trigger Desktop Windowing App handle Education -->

    <string-array name="desktop_windowing_app_handle_education_allowlist_apps"></string-array>

    <!-- Apps that can trigger Desktop Windowing App-To-Web Education -->

    <string-array name="desktop_windowing_app_to_web_education_allowlist_apps"></string-array>

</resources>

libs/WindowManager/Shell/res/values/dimen.xml

+7 −0
Original line number Diff line number Diff line
@@ -650,4 +650,11 @@ 
    <dimen name="open_by_default_settings_dialog_radio_button_height">64dp</dimen>

    <!-- The width of radio buttons in the open by default settings dialog. -->

    <dimen name="open_by_default_settings_dialog_radio_button_width">316dp</dimen>



    <!-- The width of the desktop windowing education promo. -->

    <dimen name="desktop_windowing_education_promo_width">412dp</dimen>

    <!-- The height of the desktop windowing education promo. -->

    <dimen name="desktop_windowing_education_promo_height">352dp</dimen>

    <!-- The corner radius of the desktop windowing education promo. -->

    <dimen name="desktop_windowing_education_promo_corner_radius">28dp</dimen>

</resources>

libs/WindowManager/Shell/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -339,4 +339,7 @@ 
    <string name="open_by_default_dialog_in_browser_text">In your browser</string>

    <!-- Text for open by default settings dialog dismiss button. -->

    <string name="open_by_default_dialog_dismiss_button_text">OK</string>



    <!-- Text for the App-to-Web education promo. -->

    <string name="desktop_windowing_app_to_web_education_text">Quickly open apps in your browser here</string>

</resources>