diff options
| author | Adrian Roos <roosa@google.com> | 2014-10-28 20:27:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-28 20:27:41 +0000 |
| commit | 579a7f99408a5d310ab8eb2e1b6bc938e1a74c4a (patch) | |
| tree | 73afbca5704deb6ee274774f72316cf8c1a9116a /packages/SystemUI/res/layout | |
| parent | 2896517ba13d9b670a749a626ea1270bb446017c (diff) | |
| parent | 2d1ef3012c98c07877816f3587514cca98609550 (diff) | |
| download | frameworks_base-579a7f99408a5d310ab8eb2e1b6bc938e1a74c4a.zip frameworks_base-579a7f99408a5d310ab8eb2e1b6bc938e1a74c4a.tar.gz frameworks_base-579a7f99408a5d310ab8eb2e1b6bc938e1a74c4a.tar.bz2 | |
Merge "Close keyguard user switcher on tap outside" into lmp-mr1-dev
Diffstat (limited to 'packages/SystemUI/res/layout')
| -rw-r--r-- | packages/SystemUI/res/layout/keyguard_user_switcher.xml | 25 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded.xml | 8 |
2 files changed, 18 insertions, 15 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_user_switcher.xml b/packages/SystemUI/res/layout/keyguard_user_switcher.xml index 3730bbe..773da9a 100644 --- a/packages/SystemUI/res/layout/keyguard_user_switcher.xml +++ b/packages/SystemUI/res/layout/keyguard_user_switcher.xml @@ -14,13 +14,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<com.android.keyguard.AlphaOptimizedLinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/keyguard_user_switcher" - android:orientation="vertical" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:gravity="end" - android:visibility="gone" - android:paddingTop="4dp"> -</com.android.keyguard.AlphaOptimizedLinearLayout> +<view xmlns:android="http://schemas.android.com/apk/res/android" + class="com.android.systemui.statusbar.policy.KeyguardUserSwitcher$Container" + android:layout_height="match_parent" + android:layout_width="match_parent"> + <com.android.keyguard.AlphaOptimizedLinearLayout + android:id="@+id/keyguard_user_switcher_inner" + android:orientation="vertical" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_marginTop="@dimen/status_bar_header_height_keyguard" + android:layout_gravity="end" + android:gravity="end" + android:paddingTop="4dp"> + </com.android.keyguard.AlphaOptimizedLinearLayout> +</view>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 96f9b91..f6d4be5 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -101,11 +101,9 @@ <ViewStub android:id="@+id/keyguard_user_switcher" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_marginTop="@dimen/status_bar_header_height_keyguard" - android:layout_gravity="end" - android:layout="@layout/keyguard_user_switcher" /> + android:layout="@layout/keyguard_user_switcher" + android:layout_height="match_parent" + android:layout_width="match_parent" /> <include layout="@layout/keyguard_status_bar" |