diff options
| author | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:23:29 -0500 |
|---|---|---|
| committer | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:23:29 -0500 |
| commit | 01b86c8784cd1590bfd7c467abc89880e9a12814 (patch) | |
| tree | a04f8cc8c01c3499810b6eea0b38809ce7a7533e /samples/browseable/BasicImmersiveMode/res/menu/main.xml | |
| parent | 132f0a9d42a59fcb96a34c8781da690fa97332d7 (diff) | |
| parent | 99bfeb590ea8105d24ff0fdc6e41bed981483ee4 (diff) | |
| download | android_development-01b86c8784cd1590bfd7c467abc89880e9a12814.tar.gz android_development-01b86c8784cd1590bfd7c467abc89880e9a12814.tar.bz2 android_development-01b86c8784cd1590bfd7c467abc89880e9a12814.zip | |
Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2
Android 7.1.2 Release 2 (N2G47E)
# gpg: Signature made Mon 03 Apr 2017 01:41:41 AM CDT
# gpg: using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
Diffstat (limited to 'samples/browseable/BasicImmersiveMode/res/menu/main.xml')
| -rw-r--r-- | samples/browseable/BasicImmersiveMode/res/menu/main.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/samples/browseable/BasicImmersiveMode/res/menu/main.xml b/samples/browseable/BasicImmersiveMode/res/menu/main.xml index 2c3515dd4..498f2c60e 100644 --- a/samples/browseable/BasicImmersiveMode/res/menu/main.xml +++ b/samples/browseable/BasicImmersiveMode/res/menu/main.xml @@ -14,8 +14,9 @@ limitations under the License. --> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/sample_action" - android:showAsAction="ifRoom|withText" + app:showAsAction="ifRoom|withText" android:title="@string/sample_action" /> </menu> |