diff options
author | Jason Monk <jmonk@google.com> | 2014-07-18 09:55:41 -0400 |
---|---|---|
committer | Jason Monk <jmonk@google.com> | 2014-07-21 09:01:43 -0400 |
commit | 27d7ea56f3f02ea7efaf1e57b5d6758ddb56c353 (patch) | |
tree | 7fd4d4b268089ad64b2fc4a30d96d68cd722f589 /res/layout | |
parent | d7bdf17aba66b0bd4530773401d54252cf6b180c (diff) | |
download | packages_apps_Settings-27d7ea56f3f02ea7efaf1e57b5d6758ddb56c353.zip packages_apps_Settings-27d7ea56f3f02ea7efaf1e57b5d6758ddb56c353.tar.gz packages_apps_Settings-27d7ea56f3f02ea7efaf1e57b5d6758ddb56c353.tar.bz2 |
Add Screen pinning back to settings
Adds a basic screen for screen pinning (previously lock-to-app) to
settings that describes the feature and allows it to be turned on
and off.
Bug: 16378448
Depends on Ide333463f86310eacb7a1d8b6dc7b1aea8722713 for Settings
constant
Change-Id: Id3ef8471794aa01de20efeb947bed95c50d6b954
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/screen_pinning_instructions.xml | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/res/layout/screen_pinning_instructions.xml b/res/layout/screen_pinning_instructions.xml new file mode 100644 index 0000000..22b2b37 --- /dev/null +++ b/res/layout/screen_pinning_instructions.xml @@ -0,0 +1,39 @@ +<?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. +*/ +--> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/instructions_area" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingStart="@dimen/screen_margin_sides" + android:paddingEnd="@dimen/screen_margin_sides"> + + <TextView + android:id="@+id/screen_pinning_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:paddingTop="@dimen/screen_pinning_textview_padding" + android:text="@string/screen_pinning_description" + android:textAppearance="@style/TextAppearance.Medium" + /> + +</LinearLayout> |