OSDN Git Service
Jason Monk [Tue, 8 Aug 2017 16:49:25 +0000 (16:49 +0000)]
Merge "Move shutdown UI to sysui (when possible)" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 16:08:48 +0000 (16:08 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 15:52:39 +0000 (15:52 +0000)]
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev
Jason Monk [Fri, 4 Aug 2017 17:39:17 +0000 (13:39 -0400)]
Move shutdown UI to sysui (when possible)
Test: click restart or power off in global actions
Change-Id: I0dc30a9772bbfb3cd3c3568f157e854fef87bf87
Fixes:
63576195
Fixes:
64125291
Kenny Guy [Tue, 8 Aug 2017 12:49:32 +0000 (12:49 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 11:05:53 +0000 (11:05 +0000)]
Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 10:48:47 +0000 (10:48 +0000)]
Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 08:57:16 +0000 (08:57 +0000)]
Merge "app link handling under restricted mobile data" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 00:32:09 +0000 (00:32 +0000)]
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 00:32:09 +0000 (00:32 +0000)]
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev
Hugo Benichi [Mon, 7 Aug 2017 06:47:35 +0000 (15:47 +0900)]
NetworkStats: more robust subtraction for deltas
This patch ensures that subtract() between two NetworkStats object will
return a delta with no negative entries in all cases.
When the stats delta contains some negative values, there are clamped to
0. Some logging is added when this happens.
This is what's expected by NetworkStatsHistory#recordData().
Bug:
64365917
Test: runtest frameworks-net
Change-Id: I16e97e73f600225f80e0ce517e80c07c6f399196
Andrii Kulian [Mon, 7 Aug 2017 22:07:22 +0000 (22:07 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 18:27:57 +0000 (18:27 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev
Matthew Ng [Wed, 2 Aug 2017 21:00:59 +0000 (14:00 -0700)]
Reset wait for transition state to false when recents goes invisible
From ag/
2572257, this change will ensure the transition wait flag to be
false when recents runs "onStop" or when it becomes invisible. This
should fix edge cases when a user goes from Recents to somewhere that
is not a fullscreen app (like home). Resetting the state should allow
users to use the recents button without getting blocked.
There is only two locations where the flag is set to true, when user
starts recents and when an app is started from recents. When a user goes
from recents to home with the recents button (when the phone gets into a
wierd state), then the flag is true but home does not reset the flag
because the old change expects a non-home app to start. Now whenever
recents is dismissed, the flag will be reset.
Fixes:
37277853
Bug:
64098508
Test: start recents with apps in it, go to guest account, start apps in
recents, go back to main account, unlock keyguard, press recents button
to dismiss recents (do not press home or back), it will go to home,
press recents again
Change-Id: I07c292d701a621685c836a4f6040864377f0a3dd
TreeHugger Robot [Mon, 7 Aug 2017 17:34:44 +0000 (17:34 +0000)]
Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev
Adrian Roos [Mon, 7 Aug 2017 17:32:45 +0000 (19:32 +0200)]
AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f
Address reviewer's requests on I0fa53616db09be98d33ea7d06b38d8ff3037707f.
Bug:
64287908
Test: make SystemUI
Change-Id: I804c9408742cc5bd1d69fd5fd8ad42074953b0f6
Ecco Park [Fri, 4 Aug 2017 23:21:59 +0000 (16:21 -0700)]
Location: adding NULL check for the LPP_PROFILE property
Bug:
35485906
Change-Id: I5e40be8ce0d3832f0e913bfe8fd9a38d87d0d28c
Signed-off-by: Ecco Park <eccopark@google.com>
Jonathan Basseri [Mon, 7 Aug 2017 16:18:52 +0000 (16:18 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev
Adrian Roos [Mon, 7 Aug 2017 14:55:46 +0000 (16:55 +0200)]
ScrimController: Wait with clearing wakup animation until done
Fixes an issue where if another animation was started during
the wakeupFromDoze animation, the scrim would flash white
because the original animation got canceled. Instead now wait
until the animation is actually completed, not just altered.
Change-Id: I7738ec838d77f78dde2c5810369c50b4fafaeb67
Fixes:
64412754
Test: Trigger assistant from AOD; verify there is no white flash.
Adrian Roos [Mon, 7 Aug 2017 13:52:26 +0000 (15:52 +0200)]
AOD: Fix shelf animating when it should not
Fixes an issue where the shelf would animate downwards when going to AOD.
The issue is that setDark gets called in updateIsKeyguard even though nothing changed,
yet it still re-requests the dark transition. Consequently, when the keyguard goes dark
later, the requested transition executes and moves the shelf downwards.
Change-Id: I8c590aeb4f330d8c3c1b51285d899d5f6db36323
Fixes:
64412244
Test: Double tap on notification on AOD2; press power; verify shelf does not move downwards
TreeHugger Robot [Mon, 7 Aug 2017 13:41:22 +0000 (13:41 +0000)]
Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 12:53:50 +0000 (12:53 +0000)]
Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev
Jorim Jaggi [Mon, 7 Aug 2017 12:23:55 +0000 (12:23 +0000)]
Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev
Jorim Jaggi [Mon, 7 Aug 2017 12:17:35 +0000 (12:17 +0000)]
Merge "Fix light bar flickers" into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 10:54:02 +0000 (10:54 +0000)]
Merge "screencap: always exit with _exit()." into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 10:44:18 +0000 (10:44 +0000)]
Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev
Hugo Benichi [Mon, 7 Aug 2017 05:42:48 +0000 (05:42 +0000)]
Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:31:00 +0000 (13:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:29:59 +0000 (13:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:24:06 +0000 (13:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:18:41 +0000 (13:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:11:13 +0000 (13:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:10:07 +0000 (13:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:05:45 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 5 Aug 2017 09:17:44 +0000 (02:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6127e525c2824a2c947728ef94251082fd5bec14
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 5 Aug 2017 09:13:14 +0000 (02:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4e89d6ac0b96852fae1e1c8a030ffd8c5e003171
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 5 Aug 2017 07:56:19 +0000 (00:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib197bb63c3fbcef8ffc69275998deb040203f1cb
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 5 Aug 2017 07:35:11 +0000 (00:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: If4c521d07e05c2602b15d5d7752d84a57507ad92
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 5 Aug 2017 07:30:33 +0000 (00:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I53239157d82bf33503972713fe1657e2295aa526
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 5 Aug 2017 07:20:52 +0000 (00:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: If65ca28adeee2b1ae467f2e8d780e4f597a3e81e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sat, 5 Aug 2017 07:16:15 +0000 (00:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id0b1ae5fd74159dd5d84b61f1c5f6470de295053
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Hugo Benichi [Fri, 4 Aug 2017 04:18:40 +0000 (13:18 +0900)]
NetworkCapabilities: fix describeImmutableDifferences
This patch fixes the mask used in describeImmutableDifferences which did
not correctly turn NET_CAPABILITY_NOT_METERED into bit flag.
Bug:
63326103
Test: added unit tests, runtest frameworks-net
Merged-In: Ib6b390b1daef5912859302692af7dcd6cfd3e39a
Merged-In: If38efacdeec8476880835657938e435f9b598525
Merged-In: Ieccad46fcffcaf748f5644b04617e9a82527000e
Merged-In: I533ef8fe369cec19d283ff2950314fce6e28cffd
Merged-In: I12636c6699ff60487a28570208e819ea0b66fa2e
Merged-In: Ie5df14e0ea1c12e0cfabe87978ac6c9b744353b2
(cherry picked from commit
2ecb9408f4102687f20f9ca19c13071ac6098cc6)
Change-Id: I74ecf34a2c079c74152d00caea2c220e9c6d1fa5
TreeHugger Robot [Sat, 5 Aug 2017 02:35:46 +0000 (02:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
fionaxu [Tue, 23 May 2017 21:55:27 +0000 (14:55 -0700)]
app link handling under restricted mobile data
1. new actions to allow default carrier app dynamically enable/disable
app-link filtering
2. new intent to notify registered carrier apps of other default
networks
3. signal-to-actions config to sepcify carrier actions on default
network change
default network available -> disable intent filter for app-link
defaut network lost -> enable intent filter for app-link
4. new carrier actions to allow carrier apps to register/unregister
other network status dynmacially
Bug:
62487488
Test: Manual
Change-Id: Ie9fa9f3f4ca38f9f26a90a3dbf95f7f20a8ad773
Adam Lesinski [Mon, 12 Jun 2017 21:55:58 +0000 (14:55 -0700)]
AAPT2: Disable locale domination for deduping
Locale deduping isn't straightforward, as parenting rules
change between platform versions and the selection
preference of a specific locale variant over the default
configuration lead to incorrect results at runtime.
Bug:
62409213
Test: make aapt2_tests
Change-Id: Iec8f1cfba7ae43c847d163529891fdc15f3db826
Jonathan Basseri [Wed, 19 Jul 2017 20:44:31 +0000 (13:44 -0700)]
Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.
Bug:
63050313
Test: no compilation errors
Merged-In: I64f31d111213281edeaeda6a09b163b860261b2d
Change-Id: I541b445b410329798acdaaaccc50955cd1574ae2
Selim Cinek [Fri, 4 Aug 2017 23:41:07 +0000 (23:41 +0000)]
Merge "Fix activity start over Keyguard" into oc-dr1-dev
Bill Yi [Fri, 4 Aug 2017 23:14:49 +0000 (16:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I11e8908001cbf5e33e280ca2c8fb3b30c686f3f2
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Adrian Roos [Fri, 4 Aug 2017 22:41:23 +0000 (22:41 +0000)]
Merge "AOD: Fix navbar flicker when launching assistant" into oc-dr1-dev
Andrii Kulian [Thu, 3 Aug 2017 11:03:51 +0000 (04:03 -0700)]
Add black frame behind app window
Add black background behind letterboxed apps on displays with tall
aspect ratio. This is needed to make sure that other windows won't
bleed through status/navigation bar area, because letterboxed
windows are not considered fullscreen.
Bug:
63156733
Bug:
62893418
Test: go/wm-smoke
Test: Trigger animations to/from recents with different rotations.
Change-Id: If0eac9a3801518185d560a87d9f88ee0aafa3a9c
TreeHugger Robot [Fri, 4 Aug 2017 20:59:34 +0000 (20:59 +0000)]
Merge "Fix race condition / test flakiness." into oc-dr1-dev
Chavi Weingarten [Fri, 4 Aug 2017 20:30:57 +0000 (20:30 +0000)]
Merge "Only allow one turnScreenOn per app resume." into oc-dr1-dev
TreeHugger Robot [Fri, 4 Aug 2017 20:14:52 +0000 (20:14 +0000)]
Merge "New keyguard icons" into oc-dr1-dev
Selim Cinek [Fri, 4 Aug 2017 19:41:06 +0000 (19:41 +0000)]
Merge "Fixed that the screen could lock when launching camera" into oc-dr1-dev
Todd Kennedy [Wed, 19 Jul 2017 16:47:55 +0000 (09:47 -0700)]
Always populate the ApplicationInfo object
While scanning system apps, we abort package/application info setup
if an app on /system is not a higher version than an upgrade on /data.
Instead, we need to still fully populate these objects because they
can be retrievd using the MATCH_FACTORY_ONLY flag.
Change-Id: I0262b46f446eace60ce94f1428f3fb15d785a89c
Fixes:
62980149
Test: Manual
Test: Create a sample application that dumps the contents of an ApplicationInfo object for a given package
Test: Install the sample application on the /system partition and "upgrade" the sample application so it's also on the /data partition
Test: Create a secondary user and disable the sample application
Test: Reboot the device
Test: Run the sample application as the primary user and see that the ApplicationInfo object is correctly populated
(cherry picked from commit
c606627e6c931d4d1e60ce29f7802d7bd9f4403d)
chaviw [Wed, 2 Aug 2017 00:24:59 +0000 (17:24 -0700)]
Only allow one turnScreenOn per app resume.
The current behavior will turn the screen on if a relayout is
called. This is problematic because if the screen is off but the
client is still requesting relayouts, the relayout will trigger
a request to turn the screen on. This change ensures that the screen
will only get turned on at most once per resume. If the activity
is relaunched again, the screen can be turned on again.
Fixes:
64139966
Test: go/wm-smoke
Test: Added cts test ActivityManagerActivityVisibilityTests#testTurnScreenOnActivity_WithRelayout
Test: Set the phone to have always on ambient display. Launched the
dialer app and turned the screen off. The screen no longer turns back
on automatically.
Change-Id: I5f6ac5451683d4488e72e3a6377cb3a6fd6504b2
TreeHugger Robot [Fri, 4 Aug 2017 17:26:55 +0000 (17:26 +0000)]
Merge "Make NearestTouchFrameTest run on more device configurations" into oc-dr1-dev
Adrian Roos [Fri, 4 Aug 2017 16:14:41 +0000 (18:14 +0200)]
AOD: Fix launching notifications from occluded AOD
Fixes an issue where launching notifications from AOD when a SHOW_WHEN_LOCKED
activity was showing did not work because the bouncer got dismissed.
After that was fixed and the bouncer showed, the launch transition did not
work because the panel was not collapsible. Instead of waiting for the panel
to collapse, just start keyguardDone directly if not collapsible.
Change-Id: I8813f91c741da372c9cb559797f4dc0fe8578d8c
Fixes:
63686192
Test: Disable TrustAgent if enabled, launch maps navigation, get notification, double tap on notification and/or actions. Verify Bouncer shows and unlock works.
Jorim Jaggi [Fri, 4 Aug 2017 16:06:56 +0000 (18:06 +0200)]
Defer updating dim layers if layout is deferred
When a translucent activity is on top of launcher and the activity
is animated away, we update the layers too early in case the
activity window is dimming. After starting the launcher, launcher
is on top of activity already in the hierarchy, but we haven't
started the transtion yet which would prevent the launcher to be
visible on top of activity by the anim layer adjustment.
To fix this, we prevent updating the layers if layout is currently
deferred.
Ideally we would do the whole activityStart in one surface
transaction but that's way too risky at this point.
Test: Open translucent dimming activity over launcher, press home,
ensure no flickering.
Test: go/wm-smoke
Change-Id: I72b8f5f555b555646121355c19cf7813e4f8d7a3
Fixes:
64206558
Adrian Roos [Fri, 4 Aug 2017 15:05:45 +0000 (17:05 +0200)]
AOD: Never show bouncer when dozing
Fixes an issue where the bouncer was appearing on AOD under
certain circumstances. To prevent that, delay showing the
bouncer until we are no longer dozing or at least guaranteed
to wake up.
Change-Id: I0fa53616db09be98d33ea7d06b38d8ff3037707f
Fixes:
64287908
Test: Go to AOD; adb shell service call window 42; verify that bouncer only comes up after waking up from AOD.
Jason Monk [Fri, 4 Aug 2017 14:59:13 +0000 (10:59 -0400)]
Make NearestTouchFrameTest run on more device configurations
Test: runtest systemui
Change-Id: Ied095c1e884d1ca95531e2f4e182f1d1bcaaeb35
Fixes:
64339927
Jorim Jaggi [Fri, 4 Aug 2017 14:05:02 +0000 (16:05 +0200)]
Fix light bar flickers
There was a time in which no window was mTopFullscreenOpaqueWS
when switching between two apps because the previous one was
exiting already before the next one was shown. Fix this by only
considering a window to be exiting after the animation actually
has started. In that case the surface of the incoming window will
be visible already.
Test: go/wm-smoke
Test: Open Cast settings, go home with light wallpaper set
Change-Id: I89a85d5fbfe1618940b398cd26a8d5fe53be12fb
Fixes:
64291272
Adrian Roos [Fri, 4 Aug 2017 13:59:33 +0000 (13:59 +0000)]
Merge "AsyncSensorManager: Fix unregistration bug" into oc-dr1-dev
Adrian Roos [Fri, 4 Aug 2017 13:04:43 +0000 (15:04 +0200)]
AOD: Fix navbar flicker when launching assistant
When reset() gets called during unocclusion, we were hiding the
keyguard even though it is still needed while dozing; instead,
reset is now actually called after dozing finishes.
Test: Trigger assistant from AOD; verify navigation bar buttons do not show
Fixes:
64164106
Change-Id: Ic29cf40ade7d3cd492723a3f859f8a7734edad93
Evan Laird [Fri, 4 Aug 2017 13:40:08 +0000 (13:40 +0000)]
Merge "Revert opacity changes from (Id94a5684b2c55956b01aa6cfb240784e6bab2f6e)" into oc-dr1-dev
Adrian Roos [Fri, 4 Aug 2017 13:20:02 +0000 (13:20 +0000)]
Merge changes I901908d9,Iac9835ad into oc-dr1-dev
* changes:
AOD: Fix RemoteInput from dozing
AOD: Fix janky launch transition from AOD2
Jorim Jaggi [Fri, 4 Aug 2017 12:29:16 +0000 (14:29 +0200)]
Fix activity start over Keyguard
Starting an activity over Keyguard was stuck in initializing
state because activtiy isn't visible yet. Instead, use
visibleIgnoringKeyguard to determine which activities to start
Test: KeyguardTests, KeyguardLockedTests,
Test: go/wm-smoke
Change-Id: I7dce1f2f1a2830012d2372db7e8655803251188d
Fixes:
64351094
Jorim Jaggi [Fri, 4 Aug 2017 12:07:11 +0000 (12:07 +0000)]
Merge "Never consider windows visible if appToken is hidden" into oc-dr1-dev
Jorim Jaggi [Thu, 3 Aug 2017 16:33:43 +0000 (18:33 +0200)]
Revert "Don't remove starting window for visible app."
This reverts commit
2c596d57535a1d8c327457931dfc835608b677a4.
Reason: Causes starting window leaks
Test: Open 9gag, click home immediately again
Test: go/wm-smoke
Change-Id: I136cbcf66b680c782ab0e039c383e8d189a0b6e3
Fixes:
64154208
Bug:
62443388
Adrian Roos [Fri, 4 Aug 2017 10:35:24 +0000 (12:35 +0200)]
AsyncSensorManager: Fix unregistration bug
Fixes an issue where unregistering a listener without specifying a sensor did
not work correctly; when passing null as the sensor, SensorManager.unregisterListener
silently ignores the call; instead, we now call the proper variant if given a null
sensor.
Change-Id: Iac362d8d6ae966308578cb4f177bd37af10b81a2
Fixes:
64357270
Test: runtest -x $T/frameworks/base/packages/SystemUI/tests/src/com/android/systemui/util/AsyncSensorManagerTest.java
Sailesh Nepal [Fri, 4 Aug 2017 10:02:45 +0000 (10:02 +0000)]
Merge "DO NOT MERGE: Remove rate limiting for system dialer notifications" into oc-dr1-dev
Adrian Roos [Thu, 3 Aug 2017 14:24:32 +0000 (16:24 +0200)]
AOD: Fix RemoteInput from dozing
Launching remote input from doze was broken because:
- We reset the keyguard, calling showKeyguard and clearing the states when stopping to doze
- updateIsKeyguard cleared the state; instead clear it now when we actually show / hide the keyguard
Change-Id: I901908d96ba93a49e4104b622bdd5ca604a8e392
Fixes:
64335172
Test: Receive message on AOD2, click Reply, verify it opens reply box
Adrian Roos [Thu, 3 Aug 2017 13:10:22 +0000 (15:10 +0200)]
AOD: Fix janky launch transition from AOD2
Fixes the transition that happens when when a notification is launched
from AOD2 and the keyguard can be unlocked without going through the
bouncer.
Change-Id: Iac9835ade42be4ecf02ee7430cf76d05fc006361
Fixes:
64164248
Test: Disable lockscreen security, turn off phone, receive SMS, double tap; verify no jank
Adrian Roos [Fri, 4 Aug 2017 09:40:26 +0000 (09:40 +0000)]
Merge "AOD: Add support for dimming in software" into oc-dr1-dev
Martijn Coenen [Mon, 24 Jul 2017 07:19:26 +0000 (09:19 +0200)]
screencap: always exit with _exit().
Delay starting the threadpool until necessary,
and once started, always exit with _exit().
Bug:
36066697
Bug:
62956201
Test: mma, screencap -p
Merged-In: I0b9ab542f6434f57b498cd7dc41219ef57e36721
Change-Id: I0b9ab542f6434f57b498cd7dc41219ef57e36721
(cherry picked from commit
4d125c1df6b7e4dbc3a788ecce5434970e676b06)
Change-Id: Ie79ead94c62df0c4057d7fc6735abe9dcd1e940f
Selim Cinek [Wed, 2 Aug 2017 23:45:51 +0000 (16:45 -0700)]
Fixed that the screen could lock when launching camera
Because of a race between going to sleep and checking the
double tap gesture, the lockscreen could potentially still
lock after the camera was triggered.
Test: manual, double tap on camera many times, observe no locking
Change-Id: Ibaf6e17086eb162832aa65953e5378c75e08bcdb
Fixes:
63913035
Amith Yamasani [Thu, 3 Aug 2017 23:07:32 +0000 (23:07 +0000)]
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
Lucas Dupin [Thu, 3 Aug 2017 22:48:27 +0000 (22:48 +0000)]
Merge "Multi-user and WallpaperColors" into oc-dr1-dev
Andre Eisenbach [Wed, 2 Aug 2017 23:51:10 +0000 (16:51 -0700)]
Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL
ACTION_PAIRING_CANCEL is triggered as a result of an ACL connection
going down, causing a "Couldn't pair" prompt. This can happen on some
car kits, even if the pairing is successful and the car kit briefly
tearing down the ACL connection after pairing and resuming it
immediately afterwards.
If a connection gets disconnected during a normal bonding procedure, the
UNBOND_REASON_REMOTE_DEVICE_DOWN reason code for the
ACTION_BOND_STATE_CHANGED already indicates this issue and will inform
the user.
Bug:
63975046
Test: manual
Change-Id: I663d8b7700741927c72e38e30cd993c0b81511a9
Evan Laird [Thu, 3 Aug 2017 18:26:12 +0000 (14:26 -0400)]
Revert opacity changes from (Id94a5684b2c55956b01aa6cfb240784e6bab2f6e)
The change made to the status bar icon dual tone background color was
causing failures in CTS. Reverting that to fix the issue.
Test: runtest -x
cts/tests/tests/systemui/src/android/systemui/cts/LightBarTests.java
Fixes:
64256444
Change-Id: I66979bef3369d85f51aac0e6705d21d038b57727
Adrian Roos [Thu, 3 Aug 2017 16:25:42 +0000 (18:25 +0200)]
AOD: Add support for dimming in software
Some devices cannot dim low enough in hardware in low power states.
To work around that, keep the front scrim at higher opacity when needed
to simulate lower brightness.
Bug:
63995944
Test: Configure scrim in config.xml; use device in very dim light at night, observe AOD is sufficiently dim.
Change-Id: I92fffedeea89b9327d76dfb184c5c761364ead11
Sergey Vasilinets [Thu, 3 Aug 2017 18:14:24 +0000 (18:14 +0000)]
Merge "Update toast UI" into oc-dr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 14:57:54 +0000 (14:57 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 14:51:28 +0000 (14:51 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev
Kenny Guy [Wed, 2 Aug 2017 18:41:23 +0000 (19:41 +0100)]
Update colour to match toasts.
Toasts are now black on white so update
icon we use in the toast to be black.
Merged-In: Iae153b98e187f58e0a0ab5eb315860bc97437a7f
Test: Manual
Bug:
64120926
Change-Id: If09de0fa4c315dc59ae2311afe6c4da18cdff0c6
Jorim Jaggi [Thu, 3 Aug 2017 13:00:01 +0000 (15:00 +0200)]
Never consider windows visible if appToken is hidden
This fixes a bug with trampoline activities: T1 starts T2 in
onCreate. Now T2 finished itself and in activityResult in T1
T1 starts TNoDisplay that finishes and starts T1' which starts
T2'. Since T1' didn't get the request yet to be hidden
mViewVisibility for the main window is still VISIBLE. Thus, we
note that all windows for T1' are visible and report that to
AM. Note that since visibility of T1' never changed (it was always
hidden) we also don't have an animation set so we don't block
visibility on the fact that there is an animation set.
However, AM was waiting for things to be visible before
destroying T2, and thus destroy T2 before the animation is
actually done, leading to a black hole.
We fix this by only reporting AM things to be visible if our app
token is not hidden.
Test: Above flow, ensure no black hole
Test: go/wm-smoke
Change-Id: Ifde0e9fa1f1381a5b3a1ac9c88fd209d0903e513
Fixes:
62802161
TreeHugger Robot [Thu, 3 Aug 2017 12:45:07 +0000 (12:45 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 12:34:59 +0000 (12:34 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev
sergeyv [Thu, 3 Aug 2017 11:58:20 +0000 (04:58 -0700)]
Update toast UI
- lighter background
- no text shadow
bug:
64236136,
64232075
Test: n/a
Change-Id: I4c57cc1f4f30efd6edf7b3cb405f0f7741f7d838
Sungsoo Lim [Thu, 3 Aug 2017 00:52:27 +0000 (00:52 +0000)]
Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev
Sungsoo Lim [Mon, 24 Jul 2017 13:29:27 +0000 (22:29 +0900)]
Check CookieHandler in setDataSource with cookies
If the caller of MediaPlayer.setDataSource has installed its own
CookieHandler when cookies are provided, MediaPlayer.setDataSource
requires that the CookieHandler has to be of CookieManager type.
Bug:
63638018
Test: manual
Change-Id: I1539d1fa83440ddfb00cc958cd46b9917fe3a296
TreeHugger Robot [Thu, 3 Aug 2017 00:12:34 +0000 (00:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Lucas Dupin [Fri, 14 Jul 2017 18:55:05 +0000 (11:55 -0700)]
Multi-user and WallpaperColors
Test: set different wallpapers for different users and switch between them.
Test: re-ran cts tests at cts/tests/app/src/android/app/cts/WallpaperManagerTest.java
Change-Id: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Merged-In: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Fixes:
63513694
Sailesh Nepal [Fri, 21 Jul 2017 18:44:04 +0000 (11:44 -0700)]
DO NOT MERGE: Remove rate limiting for system dialer notifications
Currently, after the system dialer posts 50 notifications, no more
notifications are allowed. This breaks incoming calls.
Fix is to exempt the system dialer from rate limiting.
Bug:
62937258
Change-Id: I084941102912c180a468a0f4ab251bad17df1c3a
TreeHugger Robot [Wed, 2 Aug 2017 22:54:52 +0000 (22:54 +0000)]
Merge "Move VR preference for portrait orientation." into oc-dr1-dev
Lucas Dupin [Wed, 2 Aug 2017 22:26:14 +0000 (15:26 -0700)]
New keyguard icons
Added new round icons, for "backspace" and "done".
Change-Id: I938c221cec6e309263edc42b45fcab3c45c4bb1d
Fixes:
64305264
Test: test light and dark wallpaper, look at keyguard.
Matthew Ng [Wed, 2 Aug 2017 22:12:04 +0000 (22:12 +0000)]
Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""
This reverts commit
e234933fbf35080a6e82e66d4c30d33671bb06f2.
Reason for revert: Fixed the issue that needed to be reverted.
Change-Id: I6cd58338e76eb2790bd056945fc4f04b8366d441
TreeHugger Robot [Wed, 2 Aug 2017 22:09:15 +0000 (22:09 +0000)]
Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev
* changes:
Add traffic thresholds to prevent wifi network changes
WifiInfo: Add getters for success tx/rx rate
Christine Franks [Wed, 2 Aug 2017 21:54:28 +0000 (21:54 +0000)]
Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev
Bill Yi [Wed, 2 Aug 2017 21:51:56 +0000 (14:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7be023a0638a0f1bd3cabd9be1ef400a450e4935
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import