Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6_2_X][TIMOB-24664] Android: Update bundled Android libraries to 25.3.1 #9258

Merged
merged 3 commits into from
Aug 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions android/build/common.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Common ant tasks and macros for building Android-based Titanium modules and proj

<property name="v7appcompat.project.dir" location="${ti.android.root}/modules/appcompat"/>
<property name="v7cardview.project.dir" location="${ti.android.root}/modules/cardview"/>
<property name="design.project.dir" location="${ti.android.root}/modules/design"/>
<property name="titanium.project.dir" location="${ti.android.root}/titanium"/>
<property name="kroll.apt.project.dir" location="${ti.android.root}/kroll-apt"/>
<property name="kroll.common.project.dir" location="${ti.android.root}/runtime/common"/>
Expand Down Expand Up @@ -147,6 +148,7 @@ Common ant tasks and macros for building Android-based Titanium modules and proj
<fileset dir="${titanium.project.dir}/lib" includes="**/*.jar"/>
<fileset dir="${v7appcompat.project.dir}/lib" includes="**/*.jar"/>
<fileset dir="${v7cardview.project.dir}/lib" includes="**/*.jar"/>
<fileset dir="${design.project.dir}/lib" includes="**/*.jar"/>
</path>

<macrodef name="build.project">
Expand Down
11 changes: 7 additions & 4 deletions android/dependency.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"min_api_level": "13",
"min_api_level": "16",
"dependencies":
{
"appcompat":[],
"cardview":[],
"design":[],
"accelerometer":[],
"analytics":[],
"android":["filesystem"],
Expand All @@ -19,7 +20,7 @@
"media":["filesystem"],
"network":["xml"],
"platform":[],
"ui":["filesystem","media","appcompat","cardview"],
"ui":["filesystem","media","appcompat","cardview","design"],
"utils":[],
"xml":[]
},
Expand All @@ -29,8 +30,9 @@
"android":["jaxen-1.1.1.jar","ti-commons-codec-1.3.jar","kroll-common.jar","titanium.jar","filesystem.jar","android-support-multidex.jar"],
"xml":["jaxen-1.1.1.jar"],
"ui":["nineoldandroids-appc-2.4.0.jar"],
"appcompat":["android-support-annotations.jar", "android-support-v4.jar", "android-support-v4-internal_impl.jar", "android-support-v7-appcompat.jar"],
"cardview":["cardview-v7-23.4.0.jar"],
"appcompat":["android-support-v4.jar", "android-support-v7-appcompat.jar", "android-support-animated-vector-drawable.jar", "android-support-annotations.jar", "android-support-compat.jar", "android-support-core-ui.jar", "android-support-core-utils.jar", "android-support-fragment.jar", "android-support-media-compat.jar", "android-support-vector-drawable.jar", "android-support-transition.jar", "android-support-v7-recyclerview.jar"],
"cardview":["android-support-v7-cardview.jar"],
"design":["android-support-design.jar"],
"analytics":["aps-analytics.jar"]
},
"runtimes":
Expand All @@ -42,6 +44,7 @@
{
"appcompat":"android.support.v7.appcompat",
"cardview":"android.support.v7.cardview",
"design":"android.support.design",
"ui":"ti.modules.titanium.ui"
}
}
2 changes: 1 addition & 1 deletion android/dev/TitaniumTest/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.titanium.test" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24"/>
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="25"/>
<application android:icon="@drawable/appicon" android:label="TitaniumTest" android:name=".TitaniumTestApplication" android:theme="@style/Theme.AppCompat">
<activity android:name=".TitaniumTestActivity" android:label="@string/app_name" android:theme="@style/Theme.Titanium" android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,11 @@ protected void genModules(String modulesDestDir)
ArrayList<String> cardViewHack = new ArrayList<String>();
cardViewHack.add("cardview");
modulesJSON.put("titanium-cardview.jar", cardViewHack);

//Hack in the design module for now. revisit later.
ArrayList<String> designHack = new ArrayList<String>();
designHack.add("design");
modulesJSON.put("titanium-design.jar", designHack);

File modules = new File(modulesDestDir, "modules.json");

Expand Down
2 changes: 1 addition & 1 deletion android/modules/accelerometer/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

android.library=true
# Project target.
target=android-23
target=android-25
android.library.reference.1=../../runtime/common
android.library.reference.2=../../titanium
2 changes: 1 addition & 1 deletion android/modules/analytics/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

android.library=true
# Project target.
target=android-23
target=android-25
android.library.reference.1=../../runtime/common
android.library.reference.2=../../titanium
2 changes: 1 addition & 1 deletion android/modules/android/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

android.library=true
# Project target.
target=android-23
target=android-25
android.library.reference.1=../../runtime/common
android.library.reference.2=../../titanium
android.library.reference.3=../filesystem
2 changes: 1 addition & 1 deletion android/modules/app/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

android.library=true
# Project target.
target=android-23
target=android-25
android.library.reference.1=../../runtime/common
android.library.reference.2=../../titanium
12 changes: 10 additions & 2 deletions android/modules/appcompat/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,17 @@
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry exported="true" kind="lib" path="lib/android-support-annotations.jar"/>
<classpathentry exported="true" kind="lib" path="lib/android-support-v4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/android-support-v4-internal_impl.jar"/>
<classpathentry exported="true" kind="lib" path="lib/android-support-v7-appcompat.jar"/>
<classpathentry exported="true" kind="lib" path="lib/android-support-vector-drawable.jar"/>
<classpathentry exported="true" kind="lib" path="lib/android-support-animated-vector-drawable.jar"/>
<classpathentry exported="true" kind="lib" path="lib/android-support-annotations.jar"/>
<classpathentry exported="true" kind="lib" path="lib/android-support-compat.jar"/>
<classpathentry exported="true" kind="lib" path="lib/android-support-core-ui.jar"/>
<classpathentry exported="true" kind="lib" path="lib/android-support-core-utils.jar"/>
<classpathentry exported="true" kind="lib" path="lib/android-support-fragment.jar"/>
<classpathentry exported="true" kind="lib" path="lib/android-support-media-compat.jar"/>
<classpathentry exported="true" kind="lib" path="lib/android-support-transition.jar"/>
<classpathentry exported="true" kind="lib" path="lib/android-support-v7-recyclerview.jar"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
Binary file not shown.
Binary file modified android/modules/appcompat/lib/android-support-annotations.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified android/modules/appcompat/lib/android-support-v4.jar
Binary file not shown.
Binary file modified android/modules/appcompat/lib/android-support-v7-appcompat.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion android/modules/appcompat/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-23
target=android-25
android.library=true
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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.
-->

<!-- Used for the text of a borderless colored button. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="?android:attr/textColorSecondary" android:alpha="?android:attr/disabledAlpha"/>
<item android:color="?attr/colorAccent"/>
</selector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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.
-->

<!-- Used for the text of a bordered colored button. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:alpha="?android:attr/disabledAlpha"
android:color="?android:attr/textColorPrimary" />
<item android:color="?android:attr/textColorPrimaryInverse" />
</selector>
21 changes: 21 additions & 0 deletions android/modules/appcompat/res/color-v23/abc_tint_btn_checkable.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016§ 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="?attr/colorControlNormal" android:alpha="?android:disabledAlpha"/>
<item android:state_checked="true" android:color="?attr/colorControlActivated"/>
<item android:color="?attr/colorControlNormal"/>
</selector>
25 changes: 25 additions & 0 deletions android/modules/appcompat/res/color-v23/abc_tint_default.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="?attr/colorControlNormal" android:alpha="?android:disabledAlpha"/>
<item android:state_focused="true" android:color="?attr/colorControlActivated"/>
<item android:state_pressed="true" android:color="?attr/colorControlActivated"/>
<item android:state_activated="true" android:color="?attr/colorControlActivated"/>
<item android:state_selected="true" android:color="?attr/colorControlActivated"/>
<item android:state_checked="true" android:color="?attr/colorControlActivated"/>
<item android:color="?attr/colorControlNormal"/>
</selector>
21 changes: 21 additions & 0 deletions android/modules/appcompat/res/color-v23/abc_tint_edittext.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="?attr/colorControlNormal" android:alpha="?android:disabledAlpha"/>
<item android:state_pressed="false" android:state_focused="false" android:color="?attr/colorControlNormal"/>
<item android:color="?attr/colorControlActivated"/>
</selector>
20 changes: 20 additions & 0 deletions android/modules/appcompat/res/color-v23/abc_tint_seek_thumb.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="?attr/colorControlActivated" android:alpha="?android:attr/disabledAlpha"/>
<item android:color="?attr/colorControlActivated"/>
</selector>
21 changes: 21 additions & 0 deletions android/modules/appcompat/res/color-v23/abc_tint_spinner.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="?attr/colorControlNormal" android:alpha="?android:disabledAlpha"/>
<item android:state_pressed="false" android:state_focused="false" android:color="?attr/colorControlNormal"/>
<item android:color="?attr/colorControlActivated"/>
</selector>
21 changes: 21 additions & 0 deletions android/modules/appcompat/res/color-v23/abc_tint_switch_thumb.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="?attr/colorSwitchThumbNormal" android:alpha="?android:attr/disabledAlpha"/>
<item android:state_checked="true" android:color="?attr/colorControlActivated"/>
<item android:color="?attr/colorSwitchThumbNormal"/>
</selector>
21 changes: 21 additions & 0 deletions android/modules/appcompat/res/color-v23/abc_tint_switch_track.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="?android:attr/colorForeground" android:alpha="0.1"/>
<item android:state_checked="true" android:color="?attr/colorControlActivated" android:alpha="0.3"/>
<item android:color="?android:attr/colorForeground" android:alpha="0.3"/>
</selector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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.
-->

<!-- Used for the text of a borderless colored button. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:state_enabled="false"
app:alpha="?android:attr/disabledAlpha"
android:color="?android:attr/textColorSecondary"/>
<item android:color="?attr/colorAccent"/>
</selector>