summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-07-06 23:08:13 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-07-06 23:08:13 +0000
commit84acba4ec822677071caa16ccab8540f40418331 (patch)
tree9a18b664b8cb402f91214877395f6e0e448f9324
parent94119b8ad662b852da30335911213e522728dc97 (diff)
parent1b0dedbf56a99173d1b4a5b156f0f929c34a93e3 (diff)
downloadMedia-84acba4ec822677071caa16ccab8540f40418331.tar.gz
Snap for 5709920 from 1b0dedbf56a99173d1b4a5b156f0f929c34a93e3 to qt-aml-releaseandroid-mainline-10.0.0_r3android-mainline-10.0.0_r1android10-mainline-release
Change-Id: I74954937a4f628f5998f70179d872ff7c9326f6d
-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>