From ccca31529c07970e89419fb85a9e8153a5396838 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Wed, 22 Feb 2017 16:32:36 -0800 Subject: Update dialer sources. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test: Built package and system image. This change clobbers the old source, and is an export from an internal Google repository. The internal repository was forked form Android in March, and this change includes modifications since then, to near the v8 release. Since the fork, we've moved code from monolithic to independent modules. In addition, we've switched to Blaze/Bazel as the build sysetm. This export, however, still uses make. New dependencies have been added: - Dagger - Auto-Value - Glide - Libshortcutbadger Going forward, development will still be in Google3, and the Gerrit release will become an automated export, with the next drop happening in ~ two weeks. Android.mk includes local modifications from ToT. Abridged changelog: Bug fixes ● Not able to mute, add a call when using Phone app in multiwindow mode ● Double tap on keypad triggering multiple key and tones ● Reported spam numbers not showing as spam in the call log ● Crash when user tries to block number while Phone app is not set as default ● Crash when user picks a number from search auto-complete list Visual Voicemail (VVM) improvements ● Share Voicemail audio via standard exporting mechanisms that support file attachment (email, MMS, etc.) ● Make phone number, email and web sites in VVM transcript clickable ● Set PIN before declining VVM Terms of Service {Carrier} ● Set client type for outbound visual voicemail SMS {Carrier} New incoming call and incall UI on older devices (Android M) ● Updated Phone app icon ● New incall UI (large buttons, button labels) ● New and animated Answer/Reject gestures Accessibility ● Add custom answer/decline call buttons on answer screen for touch exploration accessibility services ● Increase size of touch target ● Add verbal feedback when a Voicemail fails to load ● Fix pressing of Phone buttons while in a phone call using Switch Access ● Fix selecting and opening contacts in talkback mode ● Split focus for ‘Learn More’ link in caller id & spam to help distinguish similar text Other ● Backup & Restore for App Preferences ● Prompt user to enable Wi-Fi calling if the call ends due to out of service and Wi-Fi is connected ● Rename “Dialpad” to “Keypad” ● Show "Private number" for restricted calls ● Delete unused items (vcard, add contact, call history) from Phone menu Change-Id: I2a7e53532a24c21bf308bf0a6d178d7ddbca4958 --- .../callcomposer/cameraui/AndroidManifest.xml | 16 +++ .../cameraui/CameraMediaChooserView.java | 107 ++++++++++++++++++ .../cameraui/res/drawable-hdpi/ic_capture.png | Bin 0 -> 2690 bytes .../cameraui/res/drawable-mdpi/ic_capture.png | Bin 0 -> 1851 bytes .../cameraui/res/drawable-xhdpi/ic_capture.png | Bin 0 -> 3636 bytes .../cameraui/res/drawable-xxhdpi/ic_capture.png | Bin 0 -> 5449 bytes .../cameraui/res/drawable-xxxhdpi/ic_capture.png | Bin 0 -> 7354 bytes .../res/drawable/transparent_button_background.xml | 26 +++++ .../cameraui/res/layout/camera_view.xml | 121 +++++++++++++++++++++ .../callcomposer/cameraui/res/values/colors.xml | 4 + .../callcomposer/cameraui/res/values/dimens.xml | 22 ++++ .../callcomposer/cameraui/res/values/strings.xml | 17 +++ 12 files changed, 313 insertions(+) create mode 100644 java/com/android/dialer/callcomposer/cameraui/AndroidManifest.xml create mode 100644 java/com/android/dialer/callcomposer/cameraui/CameraMediaChooserView.java create mode 100644 java/com/android/dialer/callcomposer/cameraui/res/drawable-hdpi/ic_capture.png create mode 100644 java/com/android/dialer/callcomposer/cameraui/res/drawable-mdpi/ic_capture.png create mode 100644 java/com/android/dialer/callcomposer/cameraui/res/drawable-xhdpi/ic_capture.png create mode 100644 java/com/android/dialer/callcomposer/cameraui/res/drawable-xxhdpi/ic_capture.png create mode 100644 java/com/android/dialer/callcomposer/cameraui/res/drawable-xxxhdpi/ic_capture.png create mode 100644 java/com/android/dialer/callcomposer/cameraui/res/drawable/transparent_button_background.xml create mode 100644 java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml create mode 100644 java/com/android/dialer/callcomposer/cameraui/res/values/colors.xml create mode 100644 java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml create mode 100644 java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml (limited to 'java/com/android/dialer/callcomposer/cameraui') diff --git a/java/com/android/dialer/callcomposer/cameraui/AndroidManifest.xml b/java/com/android/dialer/callcomposer/cameraui/AndroidManifest.xml new file mode 100644 index 000000000..12694ee5f --- /dev/null +++ b/java/com/android/dialer/callcomposer/cameraui/AndroidManifest.xml @@ -0,0 +1,16 @@ + + \ No newline at end of file diff --git a/java/com/android/dialer/callcomposer/cameraui/CameraMediaChooserView.java b/java/com/android/dialer/callcomposer/cameraui/CameraMediaChooserView.java new file mode 100644 index 000000000..85c64e477 --- /dev/null +++ b/java/com/android/dialer/callcomposer/cameraui/CameraMediaChooserView.java @@ -0,0 +1,107 @@ +/* + * 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. + */ + +package com.android.dialer.callcomposer.cameraui; + +import android.content.Context; +import android.graphics.Canvas; +import android.hardware.Camera; +import android.os.Bundle; +import android.os.Parcelable; +import android.util.AttributeSet; +import android.view.ViewGroup; +import android.widget.FrameLayout; +import com.android.dialer.callcomposer.camera.CameraManager; +import com.android.dialer.callcomposer.camera.HardwareCameraPreview; +import com.android.dialer.callcomposer.camera.SoftwareCameraPreview; +import com.android.dialer.common.LogUtil; + +/** Used to display the view of the camera. */ +public class CameraMediaChooserView extends FrameLayout { + private static final String STATE_CAMERA_INDEX = "camera_index"; + private static final String STATE_SUPER = "super"; + + // True if we have at least queued an update to the view tree to support software rendering + // fallback + private boolean mIsSoftwareFallbackActive; + + public CameraMediaChooserView(final Context context, final AttributeSet attrs) { + super(context, attrs); + } + + @Override + protected Parcelable onSaveInstanceState() { + final Bundle bundle = new Bundle(); + bundle.putParcelable(STATE_SUPER, super.onSaveInstanceState()); + final int cameraIndex = CameraManager.get().getCameraIndex(); + LogUtil.i("CameraMediaChooserView.onSaveInstanceState", "saving camera index:" + cameraIndex); + bundle.putInt(STATE_CAMERA_INDEX, cameraIndex); + return bundle; + } + + @Override + protected void onRestoreInstanceState(final Parcelable state) { + if (!(state instanceof Bundle)) { + return; + } + + final Bundle bundle = (Bundle) state; + final int cameraIndex = bundle.getInt(STATE_CAMERA_INDEX); + super.onRestoreInstanceState(bundle.getParcelable(STATE_SUPER)); + + LogUtil.i( + "CameraMediaChooserView.onRestoreInstanceState", "restoring camera index:" + cameraIndex); + if (cameraIndex != -1) { + CameraManager.get().selectCameraByIndex(cameraIndex); + } else { + resetState(); + } + } + + public void resetState() { + CameraManager.get().selectCamera(Camera.CameraInfo.CAMERA_FACING_BACK); + } + + @Override + protected void onDraw(final Canvas canvas) { + super.onDraw(canvas); + // If the canvas isn't hardware accelerated, we have to replace the HardwareCameraPreview + // with a SoftwareCameraPreview which supports software rendering + if (!canvas.isHardwareAccelerated() && !mIsSoftwareFallbackActive) { + mIsSoftwareFallbackActive = true; + // Post modifying the tree since we can't modify the view tree during a draw pass + post( + new Runnable() { + @Override + public void run() { + final HardwareCameraPreview cameraPreview = + (HardwareCameraPreview) findViewById(R.id.camera_preview); + if (cameraPreview == null) { + return; + } + final ViewGroup parent = ((ViewGroup) cameraPreview.getParent()); + final int index = parent.indexOfChild(cameraPreview); + final SoftwareCameraPreview softwareCameraPreview = + new SoftwareCameraPreview(getContext()); + // Be sure to remove the hardware view before adding the software view to + // prevent having 2 camera previews active at the same time + parent.removeView(cameraPreview); + parent.addView(softwareCameraPreview, index); + } + }); + } + } +} diff --git a/java/com/android/dialer/callcomposer/cameraui/res/drawable-hdpi/ic_capture.png b/java/com/android/dialer/callcomposer/cameraui/res/drawable-hdpi/ic_capture.png new file mode 100644 index 000000000..b974c9f70 Binary files /dev/null and b/java/com/android/dialer/callcomposer/cameraui/res/drawable-hdpi/ic_capture.png differ diff --git a/java/com/android/dialer/callcomposer/cameraui/res/drawable-mdpi/ic_capture.png b/java/com/android/dialer/callcomposer/cameraui/res/drawable-mdpi/ic_capture.png new file mode 100644 index 000000000..98427587b Binary files /dev/null and b/java/com/android/dialer/callcomposer/cameraui/res/drawable-mdpi/ic_capture.png differ diff --git a/java/com/android/dialer/callcomposer/cameraui/res/drawable-xhdpi/ic_capture.png b/java/com/android/dialer/callcomposer/cameraui/res/drawable-xhdpi/ic_capture.png new file mode 100644 index 000000000..4ec9f75e8 Binary files /dev/null and b/java/com/android/dialer/callcomposer/cameraui/res/drawable-xhdpi/ic_capture.png differ diff --git a/java/com/android/dialer/callcomposer/cameraui/res/drawable-xxhdpi/ic_capture.png b/java/com/android/dialer/callcomposer/cameraui/res/drawable-xxhdpi/ic_capture.png new file mode 100644 index 000000000..e2345dc86 Binary files /dev/null and b/java/com/android/dialer/callcomposer/cameraui/res/drawable-xxhdpi/ic_capture.png differ diff --git a/java/com/android/dialer/callcomposer/cameraui/res/drawable-xxxhdpi/ic_capture.png b/java/com/android/dialer/callcomposer/cameraui/res/drawable-xxxhdpi/ic_capture.png new file mode 100644 index 000000000..3bab00984 Binary files /dev/null and b/java/com/android/dialer/callcomposer/cameraui/res/drawable-xxxhdpi/ic_capture.png differ diff --git a/java/com/android/dialer/callcomposer/cameraui/res/drawable/transparent_button_background.xml b/java/com/android/dialer/callcomposer/cameraui/res/drawable/transparent_button_background.xml new file mode 100644 index 000000000..fda52c99c --- /dev/null +++ b/java/com/android/dialer/callcomposer/cameraui/res/drawable/transparent_button_background.xml @@ -0,0 +1,26 @@ + + + + + + + \ No newline at end of file diff --git a/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml b/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml new file mode 100644 index 000000000..75401b14b --- /dev/null +++ b/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values/colors.xml b/java/com/android/dialer/callcomposer/cameraui/res/values/colors.xml new file mode 100644 index 000000000..d5a839aca --- /dev/null +++ b/java/com/android/dialer/callcomposer/cameraui/res/values/colors.xml @@ -0,0 +1,4 @@ + + + #E0E0E0 + \ No newline at end of file diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml b/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml new file mode 100644 index 000000000..09d4a58fd --- /dev/null +++ b/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml @@ -0,0 +1,22 @@ + + + + 22dp + 46dp + 84dp + 4dp + \ No newline at end of file diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml new file mode 100644 index 000000000..999fe8f96 --- /dev/null +++ b/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml @@ -0,0 +1,17 @@ + + + + Switch to full screen camera + + Button is now front camera + + Button is now back camera + + Stop recording video + + Using front camera + + Using back camera + + Take photo + \ No newline at end of file -- cgit v1.2.3