OSDN Git Service
Bill Yi [Sat, 5 Aug 2017 13:21:34 +0000 (13:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
c1d8698655 -s ours
Change-Id: I3da41a256cfd003197e3e56454716e16b424afa7
Bill Yi [Sat, 5 Aug 2017 13:16:03 +0000 (13:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
6153572baa -s ours
Change-Id: I41025fc3f9186b33838ebe56c678ed6b229330ca
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 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: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 02:45:07 +0000 (02:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
bce71a114d -s ours
Change-Id: I0ebc240ea29f0f4d97ea1c39de035654bc46b0db
TreeHugger Robot [Sat, 5 Aug 2017 02:35:46 +0000 (02:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Selim Cinek [Fri, 4 Aug 2017 23:53:32 +0000 (23:53 +0000)]
Merge "Fix activity start over Keyguard" into oc-dr1-dev
am:
82e815616e
Change-Id: Ic7750a2f8d0183b350e3a9ec5541f38df613fe63
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:52:19 +0000 (22:52 +0000)]
Merge "AOD: Fix navbar flicker when launching assistant" into oc-dr1-dev
am:
bd27fd7368
Change-Id: Ieb33f859cb1c190a23f08bd68b77c049ca9719b2
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
Tomasz Wasilczyk [Fri, 4 Aug 2017 21:12:21 +0000 (21:12 +0000)]
Merge "Pass vendor-specific info as map." into oc-mr1-dev
Sundeep Ghuman [Fri, 4 Aug 2017 21:08:43 +0000 (21:08 +0000)]
Merge "Fix race condition / test flakiness." into oc-dr1-dev
am:
0c8e5b6dda
Change-Id: I0e7541f39696e226baf68418ea86ed94cea34827
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:40:13 +0000 (20:40 +0000)]
Merge "Only allow one turnScreenOn per app resume." into oc-dr1-dev
am:
c36b2f0490
Change-Id: Ica77a650a769c282f97056b0779def22ee0d00e1
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
Lucas Dupin [Fri, 4 Aug 2017 20:27:41 +0000 (20:27 +0000)]
Merge "New keyguard icons" into oc-dr1-dev
am:
6df24d2f42
Change-Id: Ia77834f46449f18f02aa9d6d17a3d2141087515f
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:59:54 +0000 (19:59 +0000)]
Merge "Fixed that the screen could lock when launching camera" into oc-dr1-dev
am:
fb52158e85
Change-Id: I3e4abb55f30663ce7953c324ce8ad5220ed9a1c3
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
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
Jason Monk [Fri, 4 Aug 2017 17:38:34 +0000 (17:38 +0000)]
Merge "Make NearestTouchFrameTest run on more device configurations" into oc-dr1-dev
am:
a083c8f83a
Change-Id: I472011ba027b2d6b363807cee098e6114c231d38
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
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
Adrian Roos [Fri, 4 Aug 2017 14:13:47 +0000 (14:13 +0000)]
Merge "AsyncSensorManager: Fix unregistration bug" into oc-dr1-dev
am:
6583c37a1b
Change-Id: I6c5fd9d65202fd9b7f2c784d84e5b2dbbff7b6d2
Adrian Roos [Fri, 4 Aug 2017 13:59:33 +0000 (13:59 +0000)]
Merge "AsyncSensorManager: Fix unregistration bug" into oc-dr1-dev
Evan Laird [Fri, 4 Aug 2017 13:49:10 +0000 (13:49 +0000)]
Merge "Revert opacity changes from (Id94a5684b2c55956b01aa6cfb240784e6bab2f6e)" into oc-dr1-dev
am:
d17d52567b
Change-Id: I327a0e9f91bd8eac756a65ba6e68304c3934abfc
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:31:17 +0000 (13:31 +0000)]
Merge changes I901908d9,Iac9835ad into oc-dr1-dev
am:
47aac56746
Change-Id: I6e90dd7720b41c22bd7f87114e3854d028be0346
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
Andrei Stingaceanu [Fri, 4 Aug 2017 13:08:40 +0000 (13:08 +0000)]
Merge "AutoSize TextView - fix transformation method" into oc-mr1-dev
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:16:15 +0000 (12:16 +0000)]
Merge "Never consider windows visible if appToken is hidden" into oc-dr1-dev
am:
8e9984ee83
Change-Id: I3e2e2e639564c9fc0db9982c24229c82a93eed82
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 [Fri, 4 Aug 2017 11:44:30 +0000 (11:44 +0000)]
Revert "Don't remove starting window for visible app."
am:
19be605910
Change-Id: I03ea07976bfff041bcc6d39a9589b2f0236a118d
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:14:53 +0000 (10:14 +0000)]
Merge "DO NOT MERGE: Remove rate limiting for system dialer notifications" into oc-dr1-dev
am:
b4cc14b56a
Change-Id: Ie23cfd2911cc08a2eb415c2293ed0820c07bc47d
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 [Fri, 4 Aug 2017 09:52:31 +0000 (09:52 +0000)]
Merge "AOD: Add support for dimming in software" into oc-dr1-dev
am:
b2107c9b56
Change-Id: Ic3cf031a067ae6221ae9e8fb3acdcd1625dfa7bc
TreeHugger Robot [Fri, 4 Aug 2017 09:49:44 +0000 (09:49 +0000)]
Merge "getConnectionInfo should take calling package name as argument" into oc-mr1-dev
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
Tadashi G. Takaoka [Wed, 26 Jul 2017 01:19:28 +0000 (10:19 +0900)]
Remove @hide ACTION_SHOW_INPUT_METHOD_PICKER
All references to
android.provider.Settings.ACTION_SHOW_INPUT_METHOD_PICKER have been
removed by the following CLs.
Id36c8c34159bea8b72557b40bcf024d401f580b6 frameworks/base
Id990c66516c9b3ed7ada6891746ec0e0eecbe545 packages/apps/Settings
I915231678b94f97c1b5105cb607d6631e3df6b6a vendor/google_clockworks
I3e26ed807445725262485ac1065fdfa299d1b624 cts
Test: make checkbuild
Fixes:
64008672
Bug:
6364455
Change-Id: I4210a5b5662be497d395a454f7f1cc395637683e
TreeHugger Robot [Fri, 4 Aug 2017 02:18:50 +0000 (02:18 +0000)]
Merge "There must not have newline character in wakelock name" into oc-mr1-dev
Tomasz Wasilczyk [Thu, 3 Aug 2017 18:03:49 +0000 (11:03 -0700)]
Pass vendor-specific info as map.
This solves a problem of identifying, if a given application is talking
to a hardware that can handle format of these strings.
Bug: b/
64229617
Test: VTS, instrumentation
Change-Id: I6f525be90105bfdc01a899feea2a3151719ec8d2
Jin Seok Park [Fri, 4 Aug 2017 00:43:02 +0000 (00:43 +0000)]
Merge "ExifInterface: Remove throwing exception" into oc-mr1-dev
Sungsoo Lim [Fri, 4 Aug 2017 00:22:00 +0000 (00:22 +0000)]
Merge "Catch IllegalArgumentException when disconnect" into oc-mr1-dev
Sungsoo Lim [Fri, 4 Aug 2017 00:21:27 +0000 (00:21 +0000)]
Merge "Do not call ItemCallback after disconnected" into oc-mr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 23:41:40 +0000 (23:41 +0000)]
Merge "Bit: Don't ignore errors and crashes" into oc-mr1-dev
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:18:29 +0000 (23:18 +0000)]
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
am:
5a800cf069
Change-Id: I99d131e00dc43982f41e8837f44a66c71312615a
TreeHugger Robot [Thu, 3 Aug 2017 23:07:53 +0000 (23:07 +0000)]
Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev
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:56:50 +0000 (22:56 +0000)]
Merge "Multi-user and WallpaperColors" into oc-dr1-dev
am:
e09e5ef21b -s ours
Change-Id: Ib197bc342f3829e683a8cba1b2f1cb1856514b1b
Yi Jin [Thu, 3 Aug 2017 00:39:15 +0000 (17:39 -0700)]
There must not have newline character in wakelock name
Bug:
64272195
Test: N/A
Change-Id: I07a7d9b9dfbf69acba0123bf4ec6e309c2a5a359
(cherry picked from commit
dd214c2d3692c850d271bc4ab2dc45dcc5ebc6a6)
Lucas Dupin [Thu, 3 Aug 2017 22:48:27 +0000 (22:48 +0000)]
Merge "Multi-user and WallpaperColors" into oc-dr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 20:58:35 +0000 (20:58 +0000)]
Merge "Backup all backupable settings" into oc-mr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 20:37:16 +0000 (20:37 +0000)]
Merge "NetworkRecommendationProviders require the location permission." into oc-mr1-dev
Andre Eisenbach [Thu, 3 Aug 2017 19:00:00 +0000 (19:00 +0000)]
Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL
am:
61ad5ae921
Change-Id: Iadbb0716f82a42366d8aba687208a1df81eafb70
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
Sergey Vasilinets [Thu, 3 Aug 2017 18:25:19 +0000 (18:25 +0000)]
Merge "Update toast UI" into oc-dr1-dev
am:
436b1e2f0e
Change-Id: Ia346c80194c8792e51be927cc19e4555d3c1527f
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
Christopher Tate [Tue, 1 Aug 2017 23:32:49 +0000 (16:32 -0700)]
Use normal API for legacy wallpaper restore
No longer do we play crazy rename-into-place tricks! Just take
the restored image and treat it as an ordinary new system wallpaper,
and let the system machinery do all its proper work. While we're at
it, we get rid of the now-spurious shenanigans about backing up the
wallpaper under the 'android' package, an overdue and welcome bit
of thinning.
In addition, we now fully migrate a legacy wallpaper image to have
both a source and a display crop in place. We were previously
not generating the equivalent source image, which made N+ backups
unable to store the image properly.
Fix
64269208
Fix
62809439
Test: manual (set wallpaper under M, backup, flash to ToT,
force restore)
Change-Id: If9b26b777f0fda95cf37c3c790a3fa4e82ff0340
TreeHugger Robot [Thu, 3 Aug 2017 17:54:29 +0000 (17:54 +0000)]
Merge "Remove LangId related code." into oc-mr1-dev
Calin Juravle [Thu, 3 Aug 2017 17:16:57 +0000 (17:16 +0000)]
Merge "Save PackageDexUsage on PMS shutdown" into oc-mr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 16:54:41 +0000 (16:54 +0000)]
Merge "Update colour to match toasts." into oc-mr1-dev
Tomasz Wasilczyk [Thu, 3 Aug 2017 16:52:31 +0000 (16:52 +0000)]
Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev
Lucas Dupin [Thu, 3 Aug 2017 16:23:41 +0000 (16:23 +0000)]
Merge "Multi-user and WallpaperColors" into oc-mr1-dev
Adrian Roos [Thu, 3 Aug 2017 15:05:16 +0000 (15:05 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev
am:
a957c56da0
Change-Id: Ie526be7c78cff21fe18eb42c7130a9aa68dc961e
Adrian Roos [Thu, 3 Aug 2017 15:01:04 +0000 (15:01 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev
am:
bc3c1d0170
Change-Id: I598d82fcd14702151a924dd481fa067613c76b0e
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.
Test: Manual
Bug:
64120926
Change-Id: Iae153b98e187f58e0a0ab5eb315860bc97437a7f
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:59:57 +0000 (12:59 +0000)]
Merge "Move key eviction past system services user cleanup." into oc-mr1-dev
Robert Carr [Thu, 3 Aug 2017 12:53:38 +0000 (12:53 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
am:
48ed8aa4d0
Change-Id: I3030c64c30f6c16dc9c8a01e21a5dc6b58cbd273
Adrian Roos [Thu, 3 Aug 2017 12:48:38 +0000 (12:48 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev
am:
e8107cf358
Change-Id: I2042c1d15844e34929286e91283ddb9942faea8f
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
Kenny Guy [Tue, 20 Jun 2017 15:42:07 +0000 (16:42 +0100)]
Update work briefcase asset.
Bug:
36497538
Test: Manual - visually checked icons.
Change-Id: I1d5dd1b80bd32667e47dfc4a1c355a5106271d72
(cherry picked from commit
d49d28a8aee5ee00f5e8368bb1448b991608cf4a)
Sungsoo Lim [Thu, 3 Aug 2017 05:01:57 +0000 (14:01 +0900)]
Catch IllegalArgumentException when disconnect
IllegalArgumentException can happen, if unbindService() is called
after the service is stopped.
Bug:
63439915
Test: Passed MediaBrowserTest
Change-Id: I70ecb9e907af66b9b65960dd4029e55e81639c03
Sungsoo Lim [Thu, 3 Aug 2017 04:36:22 +0000 (13:36 +0900)]
Do not call ItemCallback after disconnected
Bug:
64119114
Test: Passed MediaBrowserTest
Change-Id: Icf3283710abe7c03f4a73532b33ec2a306d2280b
TreeHugger Robot [Thu, 3 Aug 2017 04:28:24 +0000 (04:28 +0000)]
Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 04:04:13 +0000 (04:04 +0000)]
Merge "Version guard Application.onCreate strict mode fix" into oc-mr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 03:11:18 +0000 (03:11 +0000)]
Merge "Add check that layer size <= maxTextureSize" into oc-mr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 02:10:16 +0000 (02:10 +0000)]
Merge "Address API review comments" into oc-mr1-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
Fixes:
63513694
Sungsoo Lim [Thu, 3 Aug 2017 01:03:48 +0000 (01:03 +0000)]
Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev
am:
6a2ee3b180
Change-Id: Ia42104e2fb75d867279fe8d553c807d5dcfac06d
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
Bill Yi [Thu, 3 Aug 2017 00:31:04 +0000 (00:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
e1f66b297d -s ours
Change-Id: I533bd4785a565770f4b678b08aa64c27a9261833
TreeHugger Robot [Thu, 3 Aug 2017 00:29:25 +0000 (00:29 +0000)]
Merge "Add documentation for MIN notification interaction with fg services." into oc-mr1-dev