Skip to content

Commit 2e9a237

Browse files
Justin HoAndroid (Google) Code Review
authored andcommitted
Merge "Add 480p default videos into the system."
2 parents 468fb9c + b3757d3 commit 2e9a237

File tree

6 files changed

+33
-2
lines changed

6 files changed

+33
-2
lines changed
1.44 MB
Binary file not shown.
2.75 MB
Binary file not shown.

data/videos/Sunset.480p.lq.mp4

1.52 MB
Binary file not shown.

data/videos/Sunset.480p.mq.mp4

2.77 MB
Binary file not shown.

data/videos/VideoPackage1.mk

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@
1414
# limitations under the License.
1515
#
1616

17+
# Lower-quality videos for space-constrained devices
18+
1719
LOCAL_PATH := frameworks/base/data/videos
1820
TARGET_PATH := system/media/video
1921

2022
PRODUCT_COPY_FILES += \
21-
$(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \
22-
$(LOCAL_PATH)/Sunset.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4
23+
$(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \
24+
$(LOCAL_PATH)/AndroidInSpace.480p.lq.mp4:$(TARGET_PATH)/AndroidInSpace.480p.mp4 \
25+
$(LOCAL_PATH)/Sunset.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4 \
26+
$(LOCAL_PATH)/Sunset.480p.lq.mp4:$(TARGET_PATH)/Sunset.480p.mp4
2327

data/videos/VideoPackage2.mk

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#
2+
# Copyright (C) 2011 The Android Open Source Project
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
# Good-quality videos for non-space-constrained devices
18+
19+
LOCAL_PATH := frameworks/base/data/videos
20+
TARGET_PATH := system/media/video
21+
22+
PRODUCT_COPY_FILES += \
23+
$(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \
24+
$(LOCAL_PATH)/AndroidInSpace.480p.mq.mp4:$(TARGET_PATH)/AndroidInSpace.480p.mp4 \
25+
$(LOCAL_PATH)/Sunset.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4 \
26+
$(LOCAL_PATH)/Sunset.480p.mq.mp4:$(TARGET_PATH)/Sunset.480p.mp4
27+

0 commit comments

Comments
 (0)