This repository has been archived by the owner on Jun 3, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/pr586' into apache-0.16-dev
# Conflicts: # android/sdk/libs/x86/libweexjsc.so
- Loading branch information
Showing
97 changed files
with
10,990 additions
and
8,674 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
android/sdk/src/main/java/com/taobao/weex/ui/animation/CameraDistanceProperty.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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. | ||
| */ | ||
| package com.taobao.weex.ui.animation; | ||
|
|
||
| import android.os.Build.VERSION; | ||
| import android.os.Build.VERSION_CODES; | ||
| import android.util.Property; | ||
| import android.view.View; | ||
|
|
||
|
|
||
| class CameraDistanceProperty extends Property<View, Float> { | ||
|
|
||
| private final static String TAG = "CameraDistance"; | ||
| private static CameraDistanceProperty instance; | ||
|
|
||
| static Property<View, Float> getInstance(){ | ||
| return instance; | ||
| } | ||
|
|
||
| private CameraDistanceProperty() { | ||
| super(Float.class, TAG); | ||
| } | ||
|
|
||
| @Override | ||
| public Float get(View view) { | ||
| if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN) { | ||
| return view.getCameraDistance(); | ||
| } | ||
| else{ | ||
| return Float.NaN; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void set(View object, Float value) { | ||
| object.setCameraDistance(value); | ||
| } | ||
| } |
Oops, something went wrong.