summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-07-09 03:00:23 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-07-09 03:00:23 +0000
commit4b5c1d35e21329369b3681f3c8b69850a158f561 (patch)
tree9a18b664b8cb402f91214877395f6e0e448f9324
parent1af90d4d9b4f97047d959fe3cf16d41104e721cc (diff)
parent1b0dedbf56a99173d1b4a5b156f0f929c34a93e3 (diff)
downloadMedia-android10-s1-release.tar.gz
Snap for 5713174 from 1b0dedbf56a99173d1b4a5b156f0f929c34a93e3 to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-release
Change-Id: I8d778efaf6f30485f0a6736b610d7d9d3a03e7f8
-rw-r--r--res/values-w1280dp/integers.xml20
-rw-r--r--res/values/integers.xml5
2 files changed, 21 insertions, 4 deletions
diff --git a/res/values-w1280dp/integers.xml b/res/values-w1280dp/integers.xml
new file mode 100644
index 0000000..f4873dc
--- /dev/null
+++ b/res/values-w1280dp/integers.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2019, 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.
+-->
+<resources>
+ <!-- Number of columns in the browse view -->
+ <integer name="num_browse_columns">4</integer>
+</resources>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index 1ceb462..b17d7e0 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -21,11 +21,8 @@
<!-- The maximum number of lines for the artist of a currently playing media item. -->
<integer name="media_artist_max_lines">1</integer>
- <!-- Maximum number of browse tabs -->
- <integer name="max_browse_tabs">4</integer>
-
<!-- Number of columns in the browse view -->
- <integer name="num_browse_columns">4</integer>
+ <integer name="num_browse_columns">3</integer>
<!-- The amount of time it takes for the app selector to fade in and out -->
<integer name="app_selector_fade_duration">500</integer>