OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Enable WM.DEBUG_WALLPAPER_LIGHT logs" into pi-dev
Wale Ogunwale [Tue, 29 May 2018 21:42:35 +0000 (14:42 -0700)]
Merge "Enable WM.DEBUG_WALLPAPER_LIGHT logs" into pi-dev
am: c71ef2bc86

Change-Id: Ia4c4a6d146944040c28c16289392485d859d0507

6 years agoMerge "Enable WM.DEBUG_WALLPAPER_LIGHT logs" into pi-dev
TreeHugger Robot [Tue, 29 May 2018 21:33:03 +0000 (21:33 +0000)]
Merge "Enable WM.DEBUG_WALLPAPER_LIGHT logs" into pi-dev

6 years agoMerge "Add per-device defaults for VIBRATE_WHEN_RINGING" into pi-dev
Michael Wright [Tue, 29 May 2018 21:31:36 +0000 (14:31 -0700)]
Merge "Add per-device defaults for VIBRATE_WHEN_RINGING" into pi-dev
am: eb2fdbb3c9

Change-Id: Iaff15045e39534124f4a78fa34e0319df9f111f5

6 years agoMerge "Add per-device defaults for VIBRATE_WHEN_RINGING" into pi-dev
TreeHugger Robot [Tue, 29 May 2018 21:20:24 +0000 (21:20 +0000)]
Merge "Add per-device defaults for VIBRATE_WHEN_RINGING" into pi-dev

6 years agoMerge "[QS] Disallow TYPE_VIEW_SELECTED events" into pi-dev
Rohan Shah [Tue, 29 May 2018 21:07:56 +0000 (14:07 -0700)]
Merge "[QS] Disallow TYPE_VIEW_SELECTED events" into pi-dev
am: a8464603ed

Change-Id: I546936b695ae0355a92aa3dd6131e369f784b98e

6 years agoMerge "Update quick scrub tip according to the latest mock." into pi-dev
Tracy Zhou [Tue, 29 May 2018 21:00:41 +0000 (14:00 -0700)]
Merge "Update quick scrub tip according to the latest mock." into pi-dev
am: d7a053448b

Change-Id: Ifb83a3c334efe749c79a25f1e8c86a518b93df2c

6 years agoMerge "[QS] Disallow TYPE_VIEW_SELECTED events" into pi-dev
TreeHugger Robot [Tue, 29 May 2018 20:35:54 +0000 (20:35 +0000)]
Merge "[QS] Disallow TYPE_VIEW_SELECTED events" into pi-dev

6 years agoMerge "Add animation to running animation list before starting." into pi-dev
Chavi Weingarten [Tue, 29 May 2018 20:32:58 +0000 (13:32 -0700)]
Merge "Add animation to running animation list before starting." into pi-dev
am: 908610fd74

Change-Id: Ia3b5ec7242ac438bcbe71cdf53ea5d45e4b57b15

6 years agoMerge "Update quick scrub tip according to the latest mock." into pi-dev
TreeHugger Robot [Tue, 29 May 2018 20:26:23 +0000 (20:26 +0000)]
Merge "Update quick scrub tip according to the latest mock." into pi-dev

6 years agoMerge "Fix for missing location icon" into pi-dev
Amith Yamasani [Tue, 29 May 2018 20:22:35 +0000 (13:22 -0700)]
Merge "Fix for missing location icon" into pi-dev
am: 8c4c359b25

Change-Id: I1e108f56230915e0950712a0fa2cc363e3ffbc9e

6 years agoMerge "Add animation to running animation list before starting." into pi-dev
Chavi Weingarten [Tue, 29 May 2018 20:20:20 +0000 (20:20 +0000)]
Merge "Add animation to running animation list before starting." into pi-dev

6 years agoMerge "Fix for missing location icon" into pi-dev
TreeHugger Robot [Tue, 29 May 2018 20:09:21 +0000 (20:09 +0000)]
Merge "Fix for missing location icon" into pi-dev

6 years agoMerge "Fix regression in swiping over rotation button." into pi-dev
Winson Chung [Tue, 29 May 2018 19:59:00 +0000 (12:59 -0700)]
Merge "Fix regression in swiping over rotation button." into pi-dev
am: 287d4327cd

Change-Id: I576b5ab4c537d9fb3f221c8e2bae0339c63b7d57

6 years agoMerge "Fix regression in swiping over rotation button." into pi-dev
TreeHugger Robot [Tue, 29 May 2018 19:45:35 +0000 (19:45 +0000)]
Merge "Fix regression in swiping over rotation button." into pi-dev

6 years agoMerge "Resolve conflict between javadoc and CDD re: audio output" into pi-dev
Glenn Kasten [Tue, 29 May 2018 19:21:18 +0000 (12:21 -0700)]
Merge "Resolve conflict between javadoc and CDD re: audio output" into pi-dev
am: a5d8c3718d

Change-Id: I7cd068ce53874be19ed4a81e32b87731b0d13c35

6 years agoUpdate quick scrub tip according to the latest mock.
Tracy Zhou [Fri, 25 May 2018 07:04:57 +0000 (00:04 -0700)]
Update quick scrub tip according to the latest mock.

Mock: https://docs.google.com/presentation/d/1TCp1mREgsFAWq4hCnUaSRCpaqvDbzCVkN1mJuRMylIg/edit#slide=id.g3b3fe84fa7_15_0
Screenshot: https://screenshot.googleplex.com/HCVDEVHbdNU

Fixes: 79945911
Test: Manual test
Change-Id: I039e6d6be1b782281f7251a4bee1f3bf2bf03da3

6 years agoMerge "Resolve conflict between javadoc and CDD re: audio output" into pi-dev
Glenn Kasten [Tue, 29 May 2018 19:09:31 +0000 (19:09 +0000)]
Merge "Resolve conflict between javadoc and CDD re: audio output" into pi-dev

6 years agoMerge "Delete static versions of _book.yaml and _project.yaml." into pi-dev
Scott Main [Tue, 29 May 2018 19:00:38 +0000 (12:00 -0700)]
Merge "Delete static versions of _book.yaml and _project.yaml." into pi-dev
am: c09501807a

Change-Id: I303be2abf342ff01424715e4a5e7418a856985ef

6 years agoMerge "Enable systemui_theme feature flag" into pi-dev
Lucas Dupin [Tue, 29 May 2018 18:55:55 +0000 (11:55 -0700)]
Merge "Enable systemui_theme feature flag" into pi-dev
am: 14e605d7e9

Change-Id: I47b44fd9f95e729642b383325fbfad159fb21c26

6 years agoMerge "Catch IllegalArgumentException when calling LocationManager#requestLocationUpd...
Yu-Han Yang [Tue, 29 May 2018 18:34:02 +0000 (11:34 -0700)]
Merge "Catch IllegalArgumentException when calling LocationManager#requestLocationUpdate" into pi-dev
am: 3bc533d22f

Change-Id: I042836448e9e2fe0340de8f4044e3afc8dc3d2ff

6 years agoMerge "Delete static versions of _book.yaml and _project.yaml." into pi-dev
Scott Main [Tue, 29 May 2018 18:24:35 +0000 (18:24 +0000)]
Merge "Delete static versions of _book.yaml and _project.yaml." into pi-dev

6 years agoMerge "Enable systemui_theme feature flag" into pi-dev
TreeHugger Robot [Tue, 29 May 2018 18:22:16 +0000 (18:22 +0000)]
Merge "Enable systemui_theme feature flag" into pi-dev

6 years agoDelete static versions of _book.yaml and _project.yaml.
Scott Main [Thu, 3 May 2018 20:47:46 +0000 (13:47 -0700)]
Delete static versions of _book.yaml and _project.yaml.

These files are used by devsite only, so are maintained in piper.

bug: 79155333
test: make ds-docs (human review)

Change-Id: I5d5662a2a401872a669dba0916b20a79bcfca7ae
(cherry picked from commit 9e64abe7d79ef6abdd9c2d65e5f3bead9138cdb4)

6 years agoMerge "Catch IllegalArgumentException when calling LocationManager#requestLocationUpd...
Yu-Han Yang [Tue, 29 May 2018 18:02:31 +0000 (18:02 +0000)]
Merge "Catch IllegalArgumentException when calling LocationManager#requestLocationUpdate" into pi-dev

6 years agoMerge "Remove direct-share target row animations and limit to one row." into pi-dev
Daniel Sandler [Tue, 29 May 2018 17:01:02 +0000 (10:01 -0700)]
Merge "Remove direct-share target row animations and limit to one row." into pi-dev
am: d8f3889b28

Change-Id: I02947ea217d0ae98f792a63fd24542aed1567afb

6 years agoMerge "Remove direct-share target row animations and limit to one row." into pi-dev
Daniel Sandler [Tue, 29 May 2018 16:46:57 +0000 (16:46 +0000)]
Merge "Remove direct-share target row animations and limit to one row." into pi-dev

6 years agoMerge "WM: Make maxAspectRatio work with display cutouts" into pi-dev
Adrian Roos [Tue, 29 May 2018 15:39:59 +0000 (08:39 -0700)]
Merge "WM: Make maxAspectRatio work with display cutouts" into pi-dev
am: ab4670351d

Change-Id: Ie91d6613784988c1910e64ff8b7fe7476a0a1a70

6 years agoMerge "Fixes a NPE in search manager in slice CTS tests." into pi-dev
Steven Wu [Tue, 29 May 2018 15:28:13 +0000 (08:28 -0700)]
Merge "Fixes a NPE in search manager in slice CTS tests." into pi-dev
am: d0545395df

Change-Id: I5411ba9cacf0fa4f9308f83d00677a23a95155da

6 years agoMerge "WM: Make maxAspectRatio work with display cutouts" into pi-dev
TreeHugger Robot [Tue, 29 May 2018 15:25:45 +0000 (15:25 +0000)]
Merge "WM: Make maxAspectRatio work with display cutouts" into pi-dev

6 years agoWM: Make maxAspectRatio work with display cutouts
Adrian Roos [Mon, 28 May 2018 16:55:38 +0000 (18:55 +0200)]
WM: Make maxAspectRatio work with display cutouts

Fixes an issue where the max aspect ratio was not correctly calculated
if there was a display cutout.

The issue was that the max aspect ratio logic assumed that nothing ever
applies a top inset (n.b. the status bar is ignored for this inset).
This is no longer true with display cutouts, which
cut into the app bounds from the top.

To make things work, we now need to grow the bounds for the app window
by that inset. Later on, the top part will be trimmed again for the
bounds reported to the app. Note that we cannot outright discard the
top part, or colored bars would cease to work.

Change-Id: I53925196a6a41736fc4748b12bbc3b8a9b0d174b
Fixes: 80248462
Test: atest AspectRatioTests

6 years agoMerge "Fixes a NPE in search manager in slice CTS tests." into pi-dev
TreeHugger Robot [Tue, 29 May 2018 15:18:04 +0000 (15:18 +0000)]
Merge "Fixes a NPE in search manager in slice CTS tests." into pi-dev

6 years agoEnable WM.DEBUG_WALLPAPER_LIGHT logs
Wale Ogunwale [Tue, 29 May 2018 14:16:05 +0000 (07:16 -0700)]
Enable WM.DEBUG_WALLPAPER_LIGHT logs

To help debug b/79664644

Bug: 79664644
Test: builds
Change-Id: I9602205bb8a7ec0427f4102f4c5c52c95cc732d4

6 years agoRemove direct-share target row animations and limit to one row.
Dan Sandler [Wed, 23 May 2018 06:13:51 +0000 (02:13 -0400)]
Remove direct-share target row animations and limit to one row.

The animation---which was responsible for causing relayouts
that would in turn bind views, which involved package
manager roundtrips---would lock out interaction with the rest of
the share sheet for at least 400ms while the animation ran
(often much longer if services were slow to start or respond).

Now the main UI is never blocked, and direct share targets
can take as long as they like (up to 2sec) before appearing.

It's really fast now, basically.

Bug: 67622422
Bug: 63521992
Test: atest com.android.internal.app.ChooserActivityTest
Change-Id: I21826e282226f2b2ce6d3d1b5862dbfc449f5918

6 years agoMerge "Track: Revert some needless differences vs upstream in Matcher.java" am: adb85...
Tobias Thierer [Tue, 29 May 2018 13:47:56 +0000 (06:47 -0700)]
Merge "Track: Revert some needless differences vs upstream in Matcher.java" am: adb8532394
am: ca97e3a29b

Change-Id: Ibf3e7fab17af69b2d7225661d29e022a933650a2

6 years agoMerge "Track: Revert some needless differences vs upstream in Matcher.java"
Tobias Thierer [Tue, 29 May 2018 13:38:18 +0000 (06:38 -0700)]
Merge "Track: Revert some needless differences vs upstream in Matcher.java"
am: adb8532394

Change-Id: Iec1fc62d8e3fbc55f4a835bf664c908c9ec30b59

6 years agoMerge "Track: Revert some needless differences vs upstream in Matcher.java"
Tobias Thierer [Tue, 29 May 2018 12:11:58 +0000 (12:11 +0000)]
Merge "Track: Revert some needless differences vs upstream in Matcher.java"

6 years agoMerge "apf: Increase test coverage of LDDW / STDW" am: e03b8ee7e0
Bernie Innocenti [Tue, 29 May 2018 04:29:32 +0000 (21:29 -0700)]
Merge "apf: Increase test coverage of LDDW / STDW" am: e03b8ee7e0
am: 0bf54f4a2e

Change-Id: Ifa016ce8a4fcb3a43a03d0f1126c01638cbf21ef

6 years agoFix for missing location icon
Amith Yamasani [Tue, 29 May 2018 03:50:48 +0000 (20:50 -0700)]
Fix for missing location icon

OpEntry.duration was being used to indicate that the
operation was still running if -1 is returned. A recent
change caused a regression.

Adding a new mRunning field in OpEntry to explicitly
hold the running state, even when partial duration is
updated.

Change-Id: Ib29f4c903f990aaa202e84f964959aedfc24abdb
Fixes: 80242152
Test: atest FrameworksServicesTests:AppOpsActiveWatcherTest
Test: Launch maps and verify the location icon is visible
      in the status bar

6 years agoMerge "apf: Increase test coverage of LDDW / STDW"
Bernie Innocenti [Tue, 29 May 2018 03:35:33 +0000 (20:35 -0700)]
Merge "apf: Increase test coverage of LDDW / STDW"
am: e03b8ee7e0

Change-Id: Ibc1a443c1c3a34edde835361e538a8d9cb8addb9

6 years agoMerge "apf: Increase test coverage of LDDW / STDW"
Treehugger Robot [Tue, 29 May 2018 02:33:22 +0000 (02:33 +0000)]
Merge "apf: Increase test coverage of LDDW / STDW"

6 years agoMerge "Do not setForceUse when a2dp config without change" am: 8a984b9f08
zengjing [Mon, 28 May 2018 18:55:55 +0000 (11:55 -0700)]
Merge "Do not setForceUse when a2dp config without change" am: 8a984b9f08
am: a49ca727be

Change-Id: I9b66aabf3ab2dd8352a9fdb8500384ff6988ab74

6 years agoMerge "Do not setForceUse when a2dp config without change"
zengjing [Mon, 28 May 2018 18:00:16 +0000 (11:00 -0700)]
Merge "Do not setForceUse when a2dp config without change"
am: 8a984b9f08

Change-Id: I644087265717458cb2ffa6bb20d29d90690c0022

6 years agoMerge "Do not setForceUse when a2dp config without change"
Treehugger Robot [Mon, 28 May 2018 17:00:50 +0000 (17:00 +0000)]
Merge "Do not setForceUse when a2dp config without change"

6 years agoMerge "WindowInsets: Never dispatch negative insets" into pi-dev
Adrian Roos [Mon, 28 May 2018 14:51:31 +0000 (07:51 -0700)]
Merge "WindowInsets: Never dispatch negative insets" into pi-dev
am: 8997b7e4c9

Change-Id: Ibe1e0f84a649be077a4bea11ac31b9397b964c48

6 years agoMerge "WindowInsets: Never dispatch negative insets" into pi-dev
Adrian Roos [Mon, 28 May 2018 14:40:20 +0000 (14:40 +0000)]
Merge "WindowInsets: Never dispatch negative insets" into pi-dev

6 years agoMerge "Do not call finishKeyguardDrawn with PWM's mlock" am: 1c3681fe7c
Jorim Jaggi [Mon, 28 May 2018 12:53:37 +0000 (05:53 -0700)]
Merge "Do not call finishKeyguardDrawn with PWM's mlock" am: 1c3681fe7c
am: 34e4c974aa

Change-Id: I9dcc29873ecb7866343fb733ca700f2a5a757853

6 years agoMerge "Do not call finishKeyguardDrawn with PWM's mlock"
Jorim Jaggi [Mon, 28 May 2018 11:59:24 +0000 (04:59 -0700)]
Merge "Do not call finishKeyguardDrawn with PWM's mlock"
am: 1c3681fe7c

Change-Id: I25a21fb44cddbbee9bc251d13a476a5d9fdfbe90

6 years agoMerge "Do not call finishKeyguardDrawn with PWM's mlock"
Jorim Jaggi [Mon, 28 May 2018 10:53:30 +0000 (10:53 +0000)]
Merge "Do not call finishKeyguardDrawn with PWM's mlock"

6 years agoMerge "Dispatch volume key event when mHandleVolumeKeysInWM is set" into pi-dev
Hongwei Wang [Sun, 27 May 2018 00:06:39 +0000 (17:06 -0700)]
Merge "Dispatch volume key event when mHandleVolumeKeysInWM is set" into pi-dev
am: 6de8729657

Change-Id: Ia61b80bf582f14108417d640ea135ab51988989a

6 years agoMerge "Dispatch volume key event when mHandleVolumeKeysInWM is set" into pi-dev
Hongwei Wang [Sat, 26 May 2018 23:55:19 +0000 (23:55 +0000)]
Merge "Dispatch volume key event when mHandleVolumeKeysInWM is set" into pi-dev

6 years agoTrack: Revert some needless differences vs upstream in Matcher.java
Tobias Thierer [Sat, 26 May 2018 15:20:20 +0000 (16:20 +0100)]
Track: Revert some needless differences vs upstream in Matcher.java

Android Matcher.start(int) declared "throws IllegalStateException",
which is correct but redundant. Upstream OpenJDK8u121-b13 does not
have this declaration. Another CL in this topic drops the declaration,
without changing behavior.

Bug: 35910877
Test: Treehugger

Change-Id: I59778f13f0df8bd4112af4edc25ee5a93084ae35

6 years agoMerge "Dump proxy debug info when exceeding proxy limit." into pi-dev
Martijn Coenen [Sat, 26 May 2018 09:19:18 +0000 (02:19 -0700)]
Merge "Dump proxy debug info when exceeding proxy limit." into pi-dev
am: 879d09f946

Change-Id: I02d14f682c6476b703d160dab911a3afc14af627

6 years agoMerge "Dump proxy debug info when exceeding proxy limit." into pi-dev
TreeHugger Robot [Sat, 26 May 2018 09:05:14 +0000 (09:05 +0000)]
Merge "Dump proxy debug info when exceeding proxy limit." into pi-dev

6 years agoCatch IllegalArgumentException when calling
Yu-Han Yang [Thu, 24 May 2018 17:29:39 +0000 (10:29 -0700)]
Catch IllegalArgumentException when calling
LocationManager#requestLocationUpdate

- Cannot depend on LocationManager#isProviderEnabled, since it always returns
false for FLP.

Bug: 80199046
Change-Id: I9c85b8a9468bceca0620c5aff16655ed633ee36b
Fixes: 80199046
Test: Manually added a CTS test to trigger the flow in AOSP build on
device, and successfully caught the exception when requesting location
updates from NLP.

6 years agoMerge "Added TestApi to ActivityInfo.isTranslucentOrFloating" into pi-dev
Wale Ogunwale [Sat, 26 May 2018 02:43:48 +0000 (19:43 -0700)]
Merge "Added TestApi to ActivityInfo.isTranslucentOrFloating" into pi-dev
am: 9d19487b1c

Change-Id: Ie430137f84f8b6a8d702e4ea5070ded4711da4a8

6 years agoMerge "Added TestApi to ActivityInfo.isTranslucentOrFloating" into pi-dev
TreeHugger Robot [Sat, 26 May 2018 02:23:25 +0000 (02:23 +0000)]
Merge "Added TestApi to ActivityInfo.isTranslucentOrFloating" into pi-dev

6 years agoFix regression in swiping over rotation button.
Winson Chung [Sat, 26 May 2018 01:25:52 +0000 (18:25 -0700)]
Fix regression in swiping over rotation button.

- Only send the hit target for visible buttons, otherwise we will defer
  starting the recents animation when swiping over them even if they are
  invisible.

Bug: 80320221
Test: Swipe up over hidden rotation button, ensure we don't defer the
      animation start

Change-Id: Ie6126eb25ca6cdda1dce2dccec92d83b8aca0563

6 years agoMerge "Tweak quickscrub bar visuals" into pi-dev
Winson Chung [Sat, 26 May 2018 00:37:53 +0000 (17:37 -0700)]
Merge "Tweak quickscrub bar visuals" into pi-dev
am: e2b602018f

Change-Id: Ie1cc36c9aaa35641deac620d7e5df50c9fc4e033

6 years agoMerge "Tweak quickscrub bar visuals" into pi-dev
Winson Chung [Sat, 26 May 2018 00:26:59 +0000 (00:26 +0000)]
Merge "Tweak quickscrub bar visuals" into pi-dev

6 years agoAdd animation to running animation list before starting.
chaviw [Fri, 25 May 2018 23:18:42 +0000 (16:18 -0700)]
Add animation to running animation list before starting.

The animation needs to be added to the animation list before starting
to ensure it's in the list before onAnimationEnd is called. Specifically,
this can happen if the duration is 0 since the animation will complete
very quickly. If that occurs, the animation will be added to the list
after it's been "removed" which means there will continue to be a reference
to that animation even after it's completed.

Also fix a few other issues:
1. Don't create a dim layer if stopDim is called. This causes excess
layers to be created, just so they can be destroyed.
2. Add try/catch to dim layer create so the system doesn't crash if the
layer fails to create.

Test: Enter split screen and move divider so dim layers are show and
hidden. There are no longer excess dim layers being created and leashes
are being properly dereferenced.
Fixes: 80206408

Change-Id: I7198bd5e972fce32633869697a4d26f51e675d48

6 years agoAdd per-device defaults for VIBRATE_WHEN_RINGING
Michael Wright [Fri, 25 May 2018 23:31:20 +0000 (00:31 +0100)]
Add per-device defaults for VIBRATE_WHEN_RINGING

Some devices have hand-crafted, artisanal haptics to go along with the
dulcet tones of the ringer. When making such a device, we really want
our users to have the opportunity to appreciate the fine buzzes and
clicks we spent so long orchestrating, and so this makes it possible to
default VIBRATE_WHEN_RINGING on.

Bug: 79212179
Test: manual
Change-Id: I52bf133345bd3e8b09b591b9bac4711d0d485094

6 years agoMerge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev
Robert Shih [Fri, 25 May 2018 23:15:40 +0000 (16:15 -0700)]
Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev
am: 300ab58e9a

Change-Id: Ib8fd78e9d876ce986d443a8422330b7d69a44c10

6 years agoMerge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev
TreeHugger Robot [Fri, 25 May 2018 23:01:53 +0000 (23:01 +0000)]
Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev

6 years agoMerge "Final cleanups to permission slices" into pi-dev
Jason Monk [Fri, 25 May 2018 22:26:03 +0000 (15:26 -0700)]
Merge "Final cleanups to permission slices" into pi-dev
am: 64a33d695d

Change-Id: I3256c8ca665ede11bab55072cddb8598c1d3b51b

6 years agoMerge "Final cleanups to permission slices" into pi-dev
TreeHugger Robot [Fri, 25 May 2018 22:10:20 +0000 (22:10 +0000)]
Merge "Final cleanups to permission slices" into pi-dev

6 years agoMerge "Merge "Fix IME displayed behind the notification shade" into pi-dev am: c0797c...
Android Build Merger (Role) [Fri, 25 May 2018 21:53:50 +0000 (21:53 +0000)]
Merge "Merge "Fix IME displayed behind the notification shade" into pi-dev am: c0797c85e9" into pi-dev-plus-aosp

6 years agoMerge "Fix IME displayed behind the notification shade" into pi-dev
Selim Cinek [Fri, 25 May 2018 21:53:16 +0000 (14:53 -0700)]
Merge "Fix IME displayed behind the notification shade" into pi-dev
am: c0797c85e9

Change-Id: I4adfe6e0f61e934cfd2e422844338cf2984c757b

6 years ago[automerger skipped] Merge "Allow changing signing cert for system apps that use...
Bryan Henry [Fri, 25 May 2018 21:53:07 +0000 (14:53 -0700)]
[automerger skipped] Merge "Allow changing signing cert for system apps that use shared users" am: f98f8a4c6c
am: cb39c1a9ef  -s ours

Change-Id: I6075b3b4ab6d204cce51d55ed86ae9df97ddca9d

6 years agoMerge "Allow changing signing cert for system apps that use shared users"
Bryan Henry [Fri, 25 May 2018 21:42:16 +0000 (14:42 -0700)]
Merge "Allow changing signing cert for system apps that use shared users"
am: f98f8a4c6c

Change-Id: Iccd2ec46ab087d2dc31afa255ea8dc9f49897b79

6 years agoMerge "Fix IME displayed behind the notification shade" into pi-dev
Selim Cinek [Fri, 25 May 2018 21:33:42 +0000 (21:33 +0000)]
Merge "Fix IME displayed behind the notification shade" into pi-dev

6 years agoMerge "DO NOT MERGE Update volume dialog colors" into pi-dev
Julia Reynolds [Fri, 25 May 2018 21:19:55 +0000 (14:19 -0700)]
Merge "DO NOT MERGE Update volume dialog colors" into pi-dev
am: aa8391d544

Change-Id: Ib5c23f8f1ad2866ddd796e4a0e7b522734d9e5f5

6 years agoMerge "DO NOT MERGE Update volume dialog colors" into pi-dev
TreeHugger Robot [Fri, 25 May 2018 21:05:55 +0000 (21:05 +0000)]
Merge "DO NOT MERGE Update volume dialog colors" into pi-dev

6 years agoTweak quickscrub bar visuals
Winson Chung [Thu, 24 May 2018 21:21:57 +0000 (14:21 -0700)]
Tweak quickscrub bar visuals

- Thicker asset, scale track slightly on gesture start/end

Bug: 79945202
Test: Quickscrub and see changes
Change-Id: Ic7ae11981ae79cd909d919a326ecc5126cbb399f

6 years agoMerge "Apply tint to the Volume Dialog primary and supplement icon" into pi-dev
Lin Guo [Fri, 25 May 2018 20:30:49 +0000 (13:30 -0700)]
Merge "Apply tint to the Volume Dialog primary and supplement icon" into pi-dev
am: 4651a6cb72

Change-Id: I769a4f5b1d3db8848c82d57fd0931980544c22b3

6 years agoMerge "Fixed the behavior of group conversations when targeting P" into pi-dev
Selim Cinek [Fri, 25 May 2018 20:21:38 +0000 (13:21 -0700)]
Merge "Fixed the behavior of group conversations when targeting P" into pi-dev
am: c4e19963f4

Change-Id: I7e5feadc253816852528e06719e136a7cba51c49

6 years agoMerge "Allow changing signing cert for system apps that use shared users"
Bryan Henry [Fri, 25 May 2018 20:21:23 +0000 (20:21 +0000)]
Merge "Allow changing signing cert for system apps that use shared users"

6 years agoMerge "Apply tint to the Volume Dialog primary and supplement icon" into pi-dev
TreeHugger Robot [Fri, 25 May 2018 20:16:54 +0000 (20:16 +0000)]
Merge "Apply tint to the Volume Dialog primary and supplement icon" into pi-dev

6 years agoMerge "Fixed the behavior of group conversations when targeting P" into pi-dev
Selim Cinek [Fri, 25 May 2018 20:06:52 +0000 (20:06 +0000)]
Merge "Fixed the behavior of group conversations when targeting P" into pi-dev

6 years agoDO NOT MERGE Update volume dialog colors
Julia Reynolds [Wed, 23 May 2018 13:45:53 +0000 (09:45 -0400)]
DO NOT MERGE Update volume dialog colors

Test: manual
Fixes: 79699643

Change-Id: I73bde7f30a9aad5b7c084d37987f808df342cc75

6 years agoFinal cleanups to permission slices
Jason Monk [Fri, 25 May 2018 19:13:16 +0000 (15:13 -0400)]
Final cleanups to permission slices

 - Add icons to the right and shortcut modes
 - Add color
 - Make sure dialogs are secure

Test: manual
Bug: 79960669
Change-Id: I6d251b0ea5bd3c1b3eed32b184e4aae22c52ffb5

6 years agoMerge "Only user whitelist gets allow_while_idle_unrestricted" into pi-dev
Suprabh Shukla [Fri, 25 May 2018 19:30:07 +0000 (12:30 -0700)]
Merge "Only user whitelist gets allow_while_idle_unrestricted" into pi-dev
am: 3d70d20c88

Change-Id: I4f03288f78bb89a7940f5757373c97ea0ca407db

6 years agoFixes a NPE in search manager in slice CTS tests.
Steven Wu [Fri, 25 May 2018 19:20:10 +0000 (15:20 -0400)]
Fixes a NPE in search manager in slice CTS tests.

Test: atest CtsSliceTestCases
Change-Id: I8d25dd5c216a4e2fa99b2a32bce689bee767dcfa
Fixes: 76211625

6 years agoMerge "Only user whitelist gets allow_while_idle_unrestricted" into pi-dev
TreeHugger Robot [Fri, 25 May 2018 19:17:33 +0000 (19:17 +0000)]
Merge "Only user whitelist gets allow_while_idle_unrestricted" into pi-dev

6 years agoMerge "Do not truncate onboarding tip text." into pi-dev
Tracy Zhou [Fri, 25 May 2018 19:06:44 +0000 (12:06 -0700)]
Merge "Do not truncate onboarding tip text." into pi-dev
am: 8ac5fc68a9

Change-Id: I0d60205f76d774d670111981714718611e0dafcf

6 years agoAdd cleartextTrafficPermitted to MediaFrameworkTest
Robert Shih [Fri, 25 May 2018 18:42:22 +0000 (11:42 -0700)]
Add cleartextTrafficPermitted to MediaFrameworkTest

Bug: 75276616
Test: this
Change-Id: I520950a148658e9f1602e1b4657dd0273bdaf0e2

6 years agoMerge "Do not truncate onboarding tip text." into pi-dev
TreeHugger Robot [Fri, 25 May 2018 18:51:40 +0000 (18:51 +0000)]
Merge "Do not truncate onboarding tip text." into pi-dev

6 years agoMerge "Support rtl for quick scrub onboarding text." into pi-dev
Tracy Zhou [Fri, 25 May 2018 18:17:36 +0000 (11:17 -0700)]
Merge "Support rtl for quick scrub onboarding text." into pi-dev
am: 78766d2901

Change-Id: Ibdaf788a47791bd1b44d557f852f86d0253b393f

6 years agoDump proxy debug info when exceeding proxy limit.
Martijn Coenen [Fri, 25 May 2018 17:28:26 +0000 (19:28 +0200)]
Dump proxy debug info when exceeding proxy limit.

If a process gets killed because it sends too many proxies,
dump proxy debug info so we can see what types of interfaces
it sends.

Bug: 71353150
Test: builds, output generated
Change-Id: I3a7787cb3fa73b0b4ad223b18cd79f44e22b9ef5

6 years ago[automerger skipped] Merge "Fix: ConnectivityManager is initialized with a wrong...
Tetsutoki Shiozawa [Fri, 25 May 2018 18:12:35 +0000 (11:12 -0700)]
[automerger skipped] Merge "Fix: ConnectivityManager is initialized with a wrong context" am: 4517eacd5d
am: 356edc5fe4  -s ours

Change-Id: Ibdbd1d7b667506ac14b8cc487d17d11f82a993b0

6 years ago[QS] Disallow TYPE_VIEW_SELECTED events
Rohan Shah [Fri, 25 May 2018 17:51:22 +0000 (10:51 -0700)]
[QS] Disallow TYPE_VIEW_SELECTED events

QS is announcing all of its items due to setSelected being called on the
TilePage.

Fixed by disable a11y on the page until setSelected is done. This will
cover all fringe cases of setSelected being passed along down the
hierarchy and additional a11y events being sent on child views.

Test: Manually verified that labels aren't announced
Change-Id: I76757b1fb797ba646e8e57ef389f78593aad0f18
Fixes: 80003207

6 years agoMerge "Support rtl for quick scrub onboarding text." into pi-dev
TreeHugger Robot [Fri, 25 May 2018 18:06:07 +0000 (18:06 +0000)]
Merge "Support rtl for quick scrub onboarding text." into pi-dev

6 years agoMerge "Fix: ConnectivityManager is initialized with a wrong context"
Tetsutoki Shiozawa [Fri, 25 May 2018 18:01:09 +0000 (11:01 -0700)]
Merge "Fix: ConnectivityManager is initialized with a wrong context"
am: 4517eacd5d

Change-Id: I0629b33b8cc5e155b4500cc15901985dbf0a31f2

6 years agoFix IME displayed behind the notification shade
sanryhuang [Fri, 25 May 2018 04:34:31 +0000 (12:34 +0800)]
Fix IME displayed behind the notification shade

The Back key isn't dispatched to IME. Refine the logic of onKeyPreIme.

Test: manual test
Test: atest
Change-Id: I6cf5402e70e91d74e5843beb390b306146159e4d
Fixes:80250543

6 years agoAdded TestApi to ActivityInfo.isTranslucentOrFloating
Wale Ogunwale [Fri, 25 May 2018 01:25:25 +0000 (18:25 -0700)]
Added TestApi to ActivityInfo.isTranslucentOrFloating

This would be use to determine the right activity state during CTS
test for products that have windowSwipeToDismiss set.

Also, dump ActivityRecord.fullscreen to proto for the same reason.

Bug: 76207986
Bug: 79167358
Test: atest CtsActivityManagerDeviceTestCases:ActivityLifecycleTests
Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerAssistantStackTests
Change-Id: Iadc088e9129be088b8a083ebbafd8d20fe26b673

6 years agoMerge "Fix: ConnectivityManager is initialized with a wrong context"
Treehugger Robot [Fri, 25 May 2018 16:42:59 +0000 (16:42 +0000)]
Merge "Fix: ConnectivityManager is initialized with a wrong context"

6 years agoFixed the behavior of group conversations when targeting P
Selim Cinek [Wed, 23 May 2018 23:46:05 +0000 (16:46 -0700)]
Fixed the behavior of group conversations when targeting P

Fixes an issue where the group conversation heuristic was still
applied even when the app is targeting P. We're now following
the isGroupConversation completely and only do the migration
for apps targeting < P.

Change-Id: I471d58e8a8f5e6270f0dcce8691d08a2bdd1c582
Fixes: 78450835
Test: add messaging notification, observe correct display

6 years agoMerge "Fix monkey crash in smart selection animation" into pi-dev
Mihai Popa [Fri, 25 May 2018 16:12:52 +0000 (09:12 -0700)]
Merge "Fix monkey crash in smart selection animation" into pi-dev
am: 1ffdec20b4

Change-Id: Idbc82d56568d65542d189c84954c3c3f7cd7aea9

6 years agoMerge "Fix monkey crash in smart selection animation" into pi-dev
TreeHugger Robot [Fri, 25 May 2018 15:59:07 +0000 (15:59 +0000)]
Merge "Fix monkey crash in smart selection animation" into pi-dev

6 years agoMerge "Camera: Clarify multi-camera id selection logic" into pi-dev
Shuzhen Wang [Fri, 25 May 2018 15:40:55 +0000 (08:40 -0700)]
Merge "Camera: Clarify multi-camera id selection logic" into pi-dev
am: 568ccfe0b6

Change-Id: I1e118301f74e407fa2e23557c2a5f1a77882ef18

6 years agoMerge "Camera: Clarify multi-camera id selection logic" into pi-dev
TreeHugger Robot [Fri, 25 May 2018 15:27:43 +0000 (15:27 +0000)]
Merge "Camera: Clarify multi-camera id selection logic" into pi-dev