From c857f90590e7d7fcffa89511982eb33afd34805f Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Mon, 15 May 2017 14:05:33 -0700
Subject: Update Dialer to v10 RC32

This release was created following the instructions at:
go/dialer-aosp-release

Subsequent dialer releases will follow as O bugs are
fixed, until we reach our final RC.

Version: 10
Candidate: RC32
Branch: dialer-android_release_branch/153304843.1
dialer-android_20170416.00/dialer-android_20170416.00_RC32

This release contains the following bug fixes since RC17:
Bug: 33176679 33272455 3646510 36773894 37297649 37413780
37513689 37640315 37680595 37698062 37873639 37901752
37919295 37953423 38062852 38069600 38137349 38173549
38180252 38191514

Test: make, on device
Change-Id: I4e4bb630082758e418ff24892b7db3142c6eb09a
---
 java/com/android/dialer/about/LicenseActivity.java | 87 ++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 java/com/android/dialer/about/LicenseActivity.java

(limited to 'java/com/android/dialer/about/LicenseActivity.java')

diff --git a/java/com/android/dialer/about/LicenseActivity.java b/java/com/android/dialer/about/LicenseActivity.java
new file mode 100644
index 000000000..24822235f
--- /dev/null
+++ b/java/com/android/dialer/about/LicenseActivity.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2017 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
+ */
+
+package com.android.dialer.about;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.view.MenuItem;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+/** Simple Activity that renders locally stored open source legal info in a text view. */
+public final class LicenseActivity extends ActionBarActivity {
+  private static final String TAG = "LicenseActivity";
+  private static final String STATE_SCROLL_POS = "scroll_pos";
+
+  @Override
+  public void onCreate(Bundle bundle) {
+    super.onCreate(bundle);
+    setContentView(R.layout.license_scrollview);
+
+    License license = getIntent().getParcelableExtra(LicenseMenuActivity.ARGS_LICENSE);
+    getSupportActionBar().setTitle(license.getLibraryName());
+
+    // Show 'up' button with no logo.
+    getSupportActionBar().setDisplayShowHomeEnabled(true);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setLogo(null);
+
+    TextView textView = (TextView) findViewById(R.id.license_activity_textview);
+    String licenseText = Licenses.getLicenseText(this, license);
+    if (licenseText == null) {
+      finish();
+      return;
+    }
+    textView.setText(licenseText);
+  }
+
+  @Override
+  public void onSaveInstanceState(Bundle outState) {
+    super.onSaveInstanceState(outState);
+    ScrollView scrollView = (ScrollView) findViewById(R.id.license_activity_scrollview);
+    TextView textView = (TextView) findViewById(R.id.license_activity_textview);
+    int firstVisibleLine = textView.getLayout().getLineForVertical(scrollView.getScrollY());
+    int firstVisibleChar = textView.getLayout().getLineStart(firstVisibleLine);
+    outState.putInt(STATE_SCROLL_POS, firstVisibleChar);
+  }
+
+  @Override
+  public void onRestoreInstanceState(Bundle savedInstanceState) {
+    super.onRestoreInstanceState(savedInstanceState);
+    final ScrollView scrollView = (ScrollView) findViewById(R.id.license_activity_scrollview);
+    final int firstVisibleChar = savedInstanceState.getInt(STATE_SCROLL_POS);
+    scrollView.post(
+        new Runnable() {
+          @Override
+          public void run() {
+            TextView textView = (TextView) findViewById(R.id.license_activity_textview);
+            int firstVisibleLine = textView.getLayout().getLineForOffset(firstVisibleChar);
+            int offset = textView.getLayout().getLineTop(firstVisibleLine);
+            scrollView.scrollTo(0, offset);
+          }
+        });
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(final MenuItem item) {
+    if (item.getItemId() == android.R.id.home) {
+      finish();
+      return true;
+    }
+    return super.onOptionsItemSelected(item);
+  }
+}
-- 
cgit v1.2.3