From d830e130319ad29b2500f433f1205455d5663ed1 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Sat, 28 Oct 2017 14:48:53 +0800
Subject: [PATCH] fix hyb1996-guest/AutoJsIssueReport#14544

---
 .../ui/floating/layoutinspector/LayoutHierarchyView.java    | 6 ++----
 autojs/build.gradle                                         | 5 +++--
 .../autojs/execution/LoopedBasedJavaScriptExecution.java    | 4 +---
 automator/build.gradle                                      | 3 ++-
 inrt/build.gradle                                           | 3 ++-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutHierarchyView.java b/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutHierarchyView.java
index 9d08ff41..88fc033c 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutHierarchyView.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/floating/layoutinspector/LayoutHierarchyView.java
@@ -162,9 +162,7 @@ public class LayoutHierarchyView extends MultiLevelListView {
         Stack<NodeInfo> parents = new Stack<>();
         searchNodeParents(selectedNode, mRootNode, parents);
         mClickedNodeInfo = parents.peek();
-        for (NodeInfo nodeInfo : parents) {
-            mInitiallyExpandedNodes.add(nodeInfo);
-        }
+        mInitiallyExpandedNodes.addAll(parents);
         mAdapter.reloadData();
     }
 
@@ -225,7 +223,7 @@ public class LayoutHierarchyView extends MultiLevelListView {
             NodeInfo nodeInfo = (NodeInfo) object;
             ViewHolder viewHolder;
             if (convertView == null) {
-                convertView = LayoutInflater.from(getContext()).inflate(R.layout.layout_hierarchy_view_item, LayoutHierarchyView.this, false);
+                convertView = LayoutInflater.from(getContext()).inflate(R.layout.layout_hierarchy_view_item, null);
                 viewHolder = new ViewHolder(convertView);
                 convertView.setTag(viewHolder);
             } else {
diff --git a/autojs/build.gradle b/autojs/build.gradle
index 95efa15c..605cebd5 100644
--- a/autojs/build.gradle
+++ b/autojs/build.gradle
@@ -27,6 +27,7 @@ repositories {
     flatDir {
         dirs 'libs'
     }
+    google()
 }
 
 dependencies {
@@ -41,8 +42,8 @@ dependencies {
     compile('com.afollestad.material-dialogs:core:0.9.2.3', {
         exclude group: 'com.android.support'
     })
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:design:25.4.0'
+    compile 'com.android.support:appcompat-v7:25.4.0'
     compile 'com.github.hyb1996:EnhancedFloaty:0.17'
     // Terminal emulator
     compile(name: 'libtermexec-release', ext: 'aar')
diff --git a/autojs/src/main/java/com/stardust/autojs/execution/LoopedBasedJavaScriptExecution.java b/autojs/src/main/java/com/stardust/autojs/execution/LoopedBasedJavaScriptExecution.java
index 411bcdef..85b0129b 100644
--- a/autojs/src/main/java/com/stardust/autojs/execution/LoopedBasedJavaScriptExecution.java
+++ b/autojs/src/main/java/com/stardust/autojs/execution/LoopedBasedJavaScriptExecution.java
@@ -44,9 +44,7 @@ public class LoopedBasedJavaScriptExecution extends RunnableScriptExecution {
                 return true;
             }
         });
-        javaScriptEngine.execute(
-
-                getSource());
+        javaScriptEngine.execute(getSource());
         return null;
     }
 
diff --git a/automator/build.gradle b/automator/build.gradle
index d2353a6b..d3261a33 100644
--- a/automator/build.gradle
+++ b/automator/build.gradle
@@ -25,6 +25,7 @@ repositories {
     flatDir {
         dirs 'libs'
     }
+    google()
 }
 
 dependencies {
@@ -32,6 +33,6 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:25.4.0'
     compile project(path: ':common')
 }
diff --git a/inrt/build.gradle b/inrt/build.gradle
index e257675c..c1e843a0 100644
--- a/inrt/build.gradle
+++ b/inrt/build.gradle
@@ -36,6 +36,7 @@ repositories {
     flatDir {
         dirs 'libs'
     }
+    google()
 }
 
 dependencies {
@@ -43,7 +44,7 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:25.4.0'
     testCompile 'junit:junit:4.12'
     compile project(':automator')
     compile project(':common')