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

Commit aac9f433 authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am 68d0089c: am 975590f2: Merge "Material design for screen pinning cling" into lmp-mr1-dev 

* commit '68d0089c':
  Material design for screen pinning cling
parents 81f5fa74 68d0089c

core/res/res/layout/lock_to_app_checkbox.xml

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

<!--

/* //device/apps/common/res/layout/alert_dialog.xml

**

** Copyright 2014, 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.

*/

-->

<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="15dip"

    android:paddingBottom="0dip"

    android:paddingStart="12dip"

    android:paddingEnd="25dip"

    >



    <CheckBox

        android:id="@+id/lock_to_app_checkbox"

        style="?android:attr/textAppearanceMedium"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" />



</FrameLayout>

core/res/res/values/strings.xml

+0 −10
Original line number Diff line number Diff line
@@ -4848,16 +4848,6 @@ 
    <string name="lock_to_app_toast_accessible">To unpin this screen, touch and hold Overview.</string>

    <!-- Notify user that they are locked in lock-to-app mode -->

    <string name="lock_to_app_toast_locked">Screen is pinned. Unpinning isn\'t allowed by your organization.</string>

    <!-- Lock-to-app dialog title. -->

    <string name="lock_to_app_title">Use screen pinning?</string>

    <!-- Lock-to-app dialog description. -->

    <string name="lock_to_app_description">Screen pinning locks the display in a single view.\n\nTo unpin, touch and hold Back and Overview at the same time.</string>

    <!-- Lock-to-app dialog description when in accessibility mode. -->

    <string name="lock_to_app_description_accessible">Screen pinning locks the display in a single view.\n\nTo unpin, touch and hold Overview.</string>

    <!-- Lock-to-app negative response. -->

    <string name="lock_to_app_negative">NO, THANKS</string>

    <!-- Lock-to-app positive response. -->

    <string name="lock_to_app_positive">START</string>

    <!-- Starting lock-to-app indication. -->

    <string name="lock_to_app_start">Screen pinned</string>

    <!-- Exting lock-to-app indication. -->

core/res/res/values/symbols.xml

+0 −7
Original line number Diff line number Diff line
@@ -668,13 +668,6 @@ 
  <java-symbol type="string" name="lock_to_app_toast" />

  <java-symbol type="string" name="lock_to_app_toast_accessible" />

  <java-symbol type="string" name="lock_to_app_toast_locked" />

  <java-symbol type="string" name="lock_to_app_title" />

  <java-symbol type="string" name="lock_to_app_description" />

  <java-symbol type="string" name="lock_to_app_description_accessible" />

  <java-symbol type="string" name="lock_to_app_negative" />

  <java-symbol type="string" name="lock_to_app_positive" />

  <java-symbol type="layout" name="lock_to_app_checkbox" />

  <java-symbol type="id" name="lock_to_app_checkbox" />

  <java-symbol type="string" name="lock_to_app_start" />

  <java-symbol type="string" name="lock_to_app_exit" />

  <java-symbol type="string" name="lock_to_app_unlock_pin" />

packages/SystemUI/res/drawable/screen_pinning_bg_circ.xml

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

<!--

/*

 * Copyright 2014, 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 xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval" >



    <solid android:color="@color/system_accent_color" />



    <size

        android:height="@dimen/screen_pinning_nav_highlight_size"

        android:width="@dimen/screen_pinning_nav_highlight_size" />



</shape>

packages/SystemUI/res/drawable/screen_pinning_light_bg_circ.xml

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

<!--

/*

 * Copyright 2014, 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 xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval" >



    <solid android:color="@color/screen_pinning_nav_icon_highlight_outer" />



    <size

        android:height="@dimen/screen_pinning_nav_highlight_outer_size"

        android:width="@dimen/screen_pinning_nav_highlight_outer_size" />



</shape>