diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-04-25 15:52:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-25 15:52:20 +0000 |
| commit | bea6990e6448cfde0f2995c6555ce071c1ba9c62 (patch) | |
| tree | 62c9aba49bb00f4bc258be490a8ea3e7b222d6d3 /packages/SystemUI/res | |
| parent | bbd90e7fc3d8c8c1085d76b110999f6f12ca5a98 (diff) | |
| parent | fb2b6bc62d54a6abdc2ec61c2299e060b6ae6671 (diff) | |
| download | frameworks_base-bea6990e6448cfde0f2995c6555ce071c1ba9c62.zip frameworks_base-bea6990e6448cfde0f2995c6555ce071c1ba9c62.tar.gz frameworks_base-bea6990e6448cfde0f2995c6555ce071c1ba9c62.tar.bz2 | |
am fb2b6bc6: Merge "Add text view for double-tap and unlock hint on Keyguard."
* commit 'fb2b6bc62d54a6abdc2ec61c2299e060b6ae6671':
Add text view for double-tap and unlock hint on Keyguard.
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/keyguard_bottom_area.xml | 10 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 6 |
2 files changed, 16 insertions, 0 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index 88b01c7..809adcd 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -31,4 +31,14 @@ android:scaleType="center" android:contentDescription="@string/accessibility_camera_button" systemui:glowBackground="@drawable/ic_sysbar_highlight_land" /> + + <com.android.systemui.statusbar.phone.KeyguardIndicationTextView + android:id="@+id/keyguard_indication_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="100dp" + android:layout_gravity="bottom|center_horizontal" + android:textStyle="italic" + android:textAppearance="?android:attr/textAppearanceMedium"/> + </com.android.systemui.statusbar.phone.KeyguardBottomAreaView>
\ No newline at end of file diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index f3c956c..b4a13d4 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -546,4 +546,10 @@ <plurals name="keyguard_more_overflow_text"> <item quantity="other">%d more</item> </plurals> + + <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] --> + <string name="notification_tap_again">Tap again to open</string> + + <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] --> + <string name="keyguard_unlock">Swipe up to unlock</string> </resources> |