commit 44e55e56bd1c575f9b50ff2d86c0fb31e3c774dc
author Amit Mahajan <amitmahajan@google.com> Wed Nov 20 15:13:42 2019 -0800
committer Amit Mahajan <amitmahajan@google.com> Fri Nov 22 14:27:36 2019 -0800
tree 95953cac7132ab73dc97019a66d6197c19fc8606
parent 4d4554fe25550d189a124518de84b0874e4937aa

Clean up some resources and change switch-case to if-else block.

Preparatory CL for upcoming shared lib change.

Test: basic sanity
Bug: 144806641
Merged-in: I8f81195b72c6329844a450ce28d76f949f41e2d8
Change-Id: I8f81195b72c6329844a450ce28d76f949f41e2d8
(cherry picked from commit 28a499cd7154e1aba7eaa8bd592c143e56e118c1)

src/com/android/phone/EmergencyActionGroup.java

diff --git a/src/com/android/phone/EmergencyActionGroup.java b/src/com/android/phone/EmergencyActionGroup.java
index c090af7..53ec1eb 100644
--- a/src/com/android/phone/EmergencyActionGroup.java
+++ b/src/com/android/phone/EmergencyActionGroup.java
@@ -157,24 +157,19 @@
     public void onClick(View v) {
         Intent intent = (Intent) v.getTag(R.id.tag_intent);
 
-        switch (v.getId()) {
-            case R.id.action1:
-            case R.id.action2:
-            case R.id.action3:
-                AccessibilityManager accessibilityMgr =
-                        (AccessibilityManager) mContext.getSystemService(
-                                Context.ACCESSIBILITY_SERVICE);
-                if (accessibilityMgr.isTouchExplorationEnabled()) {
-                    getContext().startActivity(intent);
-                } else {
-                    revealTheButton(v);
-                }
-                break;
-            case R.id.selected_container:
-                if (!mHiding) {
-                    getContext().startActivity(intent);
-                }
-                break;
+        if (v.getId() == R.id.action1 || v.getId() == R.id.action2 || v.getId() == R.id.action3) {
+            AccessibilityManager accessibilityMgr =
+                    (AccessibilityManager) mContext.getSystemService(
+                            Context.ACCESSIBILITY_SERVICE);
+            if (accessibilityMgr.isTouchExplorationEnabled()) {
+                getContext().startActivity(intent);
+            } else {
+                revealTheButton(v);
+            }
+        } else if (v.getId() == R.id.selected_container) {
+            if (!mHiding) {
+                getContext().startActivity(intent);
+            }
         }
     }