OSDN Git Service
Makoto Onuki [Sat, 22 Jul 2017 00:57:59 +0000 (00:57 +0000)]
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
am:
5bbf44e715
Change-Id: Icb54710f8a76f674c75c79e9992eb03264ff3142
TreeHugger Robot [Sat, 22 Jul 2017 00:45:24 +0000 (00:45 +0000)]
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
Bookatz [Sat, 22 Jul 2017 00:41:57 +0000 (00:41 +0000)]
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
am:
2337b3ba84
Change-Id: Ie29e6ddb7ab37977130adbf566fac18c4dc5c26b
TreeHugger Robot [Sat, 22 Jul 2017 00:35:10 +0000 (00:35 +0000)]
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
Wyatt Riley [Sat, 22 Jul 2017 00:18:53 +0000 (00:18 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev
am:
ec996b381d
Change-Id: I345871c43857d1d0e01377a50e9745ce3c598955
TreeHugger Robot [Sat, 22 Jul 2017 00:12:10 +0000 (00:12 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev
David Friedman [Fri, 21 Jul 2017 23:57:01 +0000 (23:57 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334
am:
f20c492190
Change-Id: I57da50e47d3fdfefa245baffdeaf16322b28fa30
Fan Zhang [Fri, 21 Jul 2017 23:55:17 +0000 (23:55 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev
am:
689359914d -s ours
Change-Id: I0193cc14eecb868b4bc4f47fe10d07aa4e787a5c
Andrii Kulian [Fri, 21 Jul 2017 23:16:24 +0000 (23:16 +0000)]
Merge changes from topic 'activity_view_v2-oc-mr1-dev' into oc-mr1-dev
* changes:
DO NOT MERGE VirtualDisplay wrapper with input forwarding
DO NOT MERGE ActivityView be gone!
David Friedman [Fri, 21 Jul 2017 23:11:16 +0000 (23:11 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev
am:
e4d0557334
Change-Id: I931088e43f29707e1ab5d9764a06adbbe5af1d7e
David Friedman [Fri, 21 Jul 2017 23:01:56 +0000 (23:01 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev
TreeHugger Robot [Fri, 21 Jul 2017 22:59:13 +0000 (22:59 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev
Makoto Onuki [Fri, 21 Jul 2017 22:30:35 +0000 (15:30 -0700)]
Persist/pacel # of periodic syncs properly.
(Note it shouldn't be persisting parceled data in the first place. There's
already a bug filed for that.)
Bug
63935632
Test: manaul test
Change-Id: I5385caa6cd0663c7e13db0256b2c1027abe6c3a1
Bookatz [Fri, 21 Jul 2017 16:03:23 +0000 (09:03 -0700)]
Batterystats: fix inappropriate bg timebase reset
Previously, the background timebases (of a Uid) were reset when the Uid
resets in the wrong place. This caused StopwatchTimer.reset() to have the timesbase's old value to keep
track of its mUpdateTime. The solution is to call TimeBase.init at the
start of Uid.reset(), instead of calling TimeBase.reset() at the end of
Uid.reset().
Bug:
62352334
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: I23c886544e18f154fc226cc81c22c3ea70fb4c7e
TreeHugger Robot [Fri, 21 Jul 2017 21:53:26 +0000 (21:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 21:51:23 +0000 (21:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Wyatt Riley [Mon, 3 Jul 2017 22:14:42 +0000 (15:14 -0700)]
Fix RemoteListenerHelper vs. HAL deadlock
Releasing lock before calling into HAL.
Fixes:
62776535
Bug:
63264577
Test: Build, GNSS location & GnssMeasurement toggling
Reproed issue with test sleep code without fix and passed with.
Change-Id: I44e183e98edd972619a068bbcc95468e9a9cdee1
Dake Gu [Fri, 21 Jul 2017 20:55:26 +0000 (20:55 +0000)]
Merge "Initial commit of leanback uibench test" into oc-mr1-dev
Evan Laird [Fri, 21 Jul 2017 20:33:04 +0000 (20:33 +0000)]
Merge "Update icons in the volume rocker" into oc-dr1-dev
am:
cdcbbeccb7
Change-Id: Ibd7685290847f651406d5961faa9a9182b859af5
TreeHugger Robot [Fri, 21 Jul 2017 20:25:09 +0000 (20:25 +0000)]
Merge "Update icons in the volume rocker" into oc-dr1-dev
Andrii Kulian [Mon, 26 Jun 2017 21:57:02 +0000 (14:57 -0700)]
DO NOT MERGE VirtualDisplay wrapper with input forwarding
New version of ActivityView that doesn't use expensive
ActivityContainer, but utilizes VirtualDisplays instead.
Creation of this view is only allowed for callers who have
android.Manifest.permission.INJECT_EVENTS permission.
Launching activities into this container is restricted by
the same rules that apply to launching on VirtualDisplays:
- Owner is allowed to launch its own activities.
- If activity that's being launched is not from the same
app, then it must be embeddable and launcher must have
permission to embed.
Bug:
63338670
Test: go/wm-smoke
Change-Id: Id9a25752367ebe8e59d2fc21c5d9de5cf597ea01
Andrii Kulian [Thu, 13 Jul 2017 22:33:06 +0000 (15:33 -0700)]
DO NOT MERGE ActivityView be gone!
This hidden functionality is no longer support/needed since
we now have multi-window/display. A new view group class
will be added later that uses multi-window to support remaining
functionality of this class.
Test: go/wm-smoke
Change-Id: Ie2fa2de92841d33199da9988741905060dd1ddf4
Fan Zhang [Fri, 21 Jul 2017 17:21:36 +0000 (10:21 -0700)]
Fix suggestion crash if parser fails to parse dismiss rule
We store a index value in shared pref to figure out when a suggestion
should be displayed next time. However the rule can change due to
various reasons. When the index and the rule itself go out of sync, we
should not crash.
Merged-In: Id3ea88b6d321434e20ac0cd3e2670524c237e24e
Change-Id: Ied4a0359f9bc22ee94ec79c0591d2671a9c31b86
Fix:
63908636
Test: robotests
Julia Reynolds [Fri, 21 Jul 2017 19:55:07 +0000 (19:55 +0000)]
Merge "Fix notification ordering for groups" into oc-mr1-dev
Julia Reynolds [Fri, 21 Jul 2017 19:52:50 +0000 (19:52 +0000)]
Merge "Fix xml loading for managed services" into oc-mr1-dev
Bill Yi [Fri, 21 Jul 2017 19:05:22 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9905307a26573e5e19db63f85ba4a89bab47b166
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Christine Franks [Fri, 21 Jul 2017 19:00:32 +0000 (19:00 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev
am:
484115b77d -s ours
Change-Id: Idd21ecfee03c4fa3a22492528746e222818da86e
Rajeev Kumar [Fri, 21 Jul 2017 18:55:19 +0000 (18:55 +0000)]
Merge "Add metrics constant for data plan usage screen." into oc-mr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 18:53:57 +0000 (18:53 +0000)]
Merge "Data plan setting in SystemUI quick settings." into oc-mr1-dev
Christine Franks [Fri, 21 Jul 2017 18:53:19 +0000 (18:53 +0000)]
Merge "Remove RetailDemoModeService" into oc-mr1-dev
Christine Franks [Fri, 21 Jul 2017 18:53:16 +0000 (18:53 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev
Bill Yi [Fri, 21 Jul 2017 18:34:26 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icbabbb028c08625372cf1ee1606e3cba1d36a27a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Albert Chaulk [Fri, 21 Jul 2017 18:33:53 +0000 (18:33 +0000)]
Merge "Add modified API to send more information to VrCore" into oc-dr1-dev
am:
c48e304bbf
Change-Id: I1c93664e2300cb9e234cfbc1c453da30a60e61af
Christopher Tate [Fri, 21 Jul 2017 18:27:43 +0000 (18:27 +0000)]
Merge "Ensure backup doesn't reuse ack tokens nearby in time" into oc-dr1-dev
am:
672f578fd1
Change-Id: I110ab6b96ac3fd866ace40fbe47614e2ad73a787
Albert Chaulk [Fri, 21 Jul 2017 18:22:38 +0000 (18:22 +0000)]
Merge "Add modified API to send more information to VrCore" into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 18:18:07 +0000 (18:18 +0000)]
Merge "Ensure backup doesn't reuse ack tokens nearby in time" into oc-dr1-dev
Calin Juravle [Fri, 21 Jul 2017 17:58:49 +0000 (17:58 +0000)]
Merge "Unhide DelegateLastClassLoader." into oc-mr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 17:51:27 +0000 (17:51 +0000)]
Merge "Unhide invalidateColors API" into oc-mr1-dev
Jeff Sharkey [Fri, 21 Jul 2017 17:14:30 +0000 (17:14 +0000)]
Merge "Expose SubscriptionPlan API." into oc-mr1-dev
Julia Reynolds [Tue, 11 Jul 2017 14:39:58 +0000 (10:39 -0400)]
Fix xml loading for managed services
Noticed while adding a shell cmd to toggle notification assistants,
which is also included
Bug:
62263757
Test: runtest systemui-notification
Change-Id: I9bc0ee857abb8b9f60ab18ad740ca0a3b7d754ff
(cherry picked from commit
88facd4d9ac18630e4cc44db22b88b4ba26e775a)
Lucas Dupin [Fri, 21 Jul 2017 16:44:30 +0000 (16:44 +0000)]
Merge "Shutdown scrim opacity at 95%" into oc-dr1-dev
am:
53ddffdf3a
Change-Id: Ibb7783661bdb4e37d6542071c158e7a486493b95
Lucas Dupin [Fri, 21 Jul 2017 16:34:33 +0000 (16:34 +0000)]
Merge "Shutdown scrim opacity at 95%" into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 16:33:13 +0000 (16:33 +0000)]
Merge "Logging improvements for time zone updates" into oc-mr1-dev
Jorim Jaggi [Fri, 21 Jul 2017 16:17:39 +0000 (16:17 +0000)]
Merge "Fix snapshots for dialogs" into oc-dr1-dev
am:
089d45de8f
Change-Id: I6429fcdc5c012f653143cb8b8161b8f1626293f9
Jorim Jaggi [Fri, 21 Jul 2017 16:10:52 +0000 (16:10 +0000)]
Merge "Fix snapshots for dialogs" into oc-dr1-dev
Christine Franks [Sat, 24 Jun 2017 01:12:46 +0000 (18:12 -0700)]
DO NOT MERGE - Remove RetailDemoModeService
Bug:
62712426
Test: make -j100
Change-Id: I483f2e3518a48fbc833562e71c3acd17ad565881
Merged-In: I483f2e3518a48fbc833562e71c3acd17ad565881
Michael Wright [Fri, 21 Jul 2017 15:38:47 +0000 (15:38 +0000)]
Merge "Add new bucket above high brightness for "sunlight"." into oc-dr1-dev
am:
5898d52184
Change-Id: I5bc6a34975e5b044122998a05ab573a9ed431ecd
TreeHugger Robot [Fri, 21 Jul 2017 15:30:42 +0000 (15:30 +0000)]
Merge "Add new bucket above high brightness for "sunlight"." into oc-dr1-dev
Narayan Kamath [Thu, 20 Jul 2017 13:09:19 +0000 (14:09 +0100)]
Unhide DelegateLastClassLoader.
Tracks libcore change
0209ec7e3c608acc3f1b63413686a3391551dcd5.
Test: make update-api; make checkapi
Bug:
37966546
Change-Id: Idfc22eff5d8bb82690f99a73765dc58dc6fd99fe
(cherry picked from commit
be0fc6e48ee0ef44472edcca09b472fb0c497eed)
Christine Franks [Sat, 24 Jun 2017 01:12:46 +0000 (18:12 -0700)]
Remove RetailDemoModeService
Bug:
62712426
Test: make -j100
Change-Id: I483f2e3518a48fbc833562e71c3acd17ad565881
Michael Wright [Fri, 21 Jul 2017 15:00:18 +0000 (15:00 +0000)]
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev
am:
cb423e42b3
Change-Id: Ie643ec6a1c917aa2d9364dbc431121f19a8a7e31
Adrian Roos [Fri, 21 Jul 2017 14:59:11 +0000 (14:59 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev
am:
5f62026b4e
Change-Id: I70c0f6e119344358ef460c994adc6189d396400b
TreeHugger Robot [Fri, 21 Jul 2017 14:53:44 +0000 (14:53 +0000)]
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 14:53:44 +0000 (14:53 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 14:02:59 +0000 (14:02 +0000)]
Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-mr1-dev
Neil Fuller [Thu, 20 Jul 2017 10:00:35 +0000 (11:00 +0100)]
Logging improvements for time zone updates
Logging improvements for time zone updates:
1) Add EventLog entries time zone update service interactions.
2) Add more information to dumpsys logs to improve debugging.
Unit tests run with:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Bug:
31008728
Test: See above for unit testing.
Test: Internal xTS tests
Test: adb shell dumpsys timezone
Test: adb logcat -b events -v threadtime -v printable -v uid -d *:v
Change-Id: I9356f4694e60b49e4b06aadd632d1bad517b8a29
(cherry picked from commit
d857f676744af55c79c4871c881bf9598f6b21e9)
Jorim Jaggi [Thu, 20 Jul 2017 16:09:20 +0000 (18:09 +0200)]
Fix snapshots for dialogs
When taking a snapshot, always include the full stack bounds.
When showing a snapshot starting window, use the SystemUI flags
from the top fullscreen window in the task - this is the same way
as we do it when the real windows are going to be visible.
Test: Revoke contacts permissions, launch contacts, go to recents,
go back.
Test: go/wm-smoke
Fixes:
63268663
Change-Id: If8d9701f6d34abd56116ed04fe27fe82688e506a
Suprabh Shukla [Fri, 21 Jul 2017 09:34:47 +0000 (09:34 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev
am:
928aad3e4d
Change-Id: Id1796f42598f56a59beda381388448eefd6353cc
TreeHugger Robot [Fri, 21 Jul 2017 09:28:52 +0000 (09:28 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev
Adrian Roos [Wed, 19 Jul 2017 16:08:07 +0000 (18:08 +0200)]
Flicker free screen-on from AOD
When pulsing from AOD, we force the display OFF first. This allows
us to transition smoothly from AOD.
Also, we add a scrim transition for whenever we are waking up from
dozing. This relies on I4f3a863709a970f0fc8682c0a0c3547886e1fd0f
which forces the DOZE -> ON transition through OFF first.
Also fixes the WAKE_AND_UNLOCK transition that happens when waking
up with the fingerprint sensor.
Also fix an issue where KeyguardViewMediator's mWakeAndUnlocking
was cleared in onScreenTurnedOff; this should have been added to
the wakefulness lifecycle instead and now that the AOD -> ON transtion
dispatches the screen off callback it broke the fingerprint unlock
transition.
Fixes:
35849781
Fixes:
63887857
Fixes:
63783651
Fixes:
63727166
Test: AOD, receive notification; AOD, unlock with fingerprint; AOD, wake to lockscreen. Verify that everything is flicker-free.
Change-Id: I7d539db80a1c7e9216cf4c5c1e6d314c1893f12d
Android Build Merger (Role) [Fri, 21 Jul 2017 05:16:27 +0000 (05:16 +0000)]
Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am:
6b4f0bb6fe" into oc-mr1-dev
Amith Yamasani [Fri, 21 Jul 2017 05:14:33 +0000 (05:14 +0000)]
Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev
am:
6b4f0bb6fe
Change-Id: I9c71705f57c65fc99da831f9ee382168f131937e
TreeHugger Robot [Fri, 21 Jul 2017 05:14:15 +0000 (05:14 +0000)]
Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev
Love Khanna [Fri, 21 Jul 2017 05:08:25 +0000 (05:08 +0000)]
Merge "NFC DTA Integration" into oc-dr1-dev
am:
f8469ccf17
Change-Id: I8acca990e6191360fc3f4f9c668f74d7a06d6a52
TreeHugger Robot [Fri, 21 Jul 2017 05:03:15 +0000 (05:03 +0000)]
Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 05:01:38 +0000 (05:01 +0000)]
Merge "NFC DTA Integration" into oc-dr1-dev
Glen Kuhne [Fri, 21 Jul 2017 02:37:58 +0000 (02:37 +0000)]
Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev
am:
860f185c66
Change-Id: I9069d51fa6214d9b78c04eea6ab6adebff13ca2e
TreeHugger Robot [Fri, 21 Jul 2017 02:30:17 +0000 (02:30 +0000)]
Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev
Sundeep Ghuman [Fri, 21 Jul 2017 01:02:07 +0000 (01:02 +0000)]
Merge "Do not clear scores during stopTracking." into oc-dr1-dev
am:
3b63aa79eb
Change-Id: I9c24f764d2f94baa183b62c253799a605f22390c
TreeHugger Robot [Fri, 21 Jul 2017 00:56:42 +0000 (00:56 +0000)]
Merge "Do not clear scores during stopTracking." into oc-dr1-dev
Winson Chung [Fri, 21 Jul 2017 00:09:53 +0000 (00:09 +0000)]
Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev
am:
a363ab9d6f
Change-Id: I77df82fb8fab936b4affaf57661a227eefcb06b3
Winson Chung [Fri, 21 Jul 2017 00:03:27 +0000 (00:03 +0000)]
Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev
Lucas Dupin [Thu, 20 Jul 2017 00:15:41 +0000 (17:15 -0700)]
Shutdown scrim opacity at 95%
Test: visual
Change-Id: I55b61f2bdc5189da290f7b81783925cc87424ab4
Fixes:
63534082
Rajeev Kumar [Wed, 19 Jul 2017 23:51:55 +0000 (16:51 -0700)]
Add metrics constant for data plan usage screen.
Change-Id: Ia5d13e4c3a8783e5c920791e7c2d6ef9b511b0bb
Note: This change is required for Data balance UI.
Bug:
62349208
Test: mmma frameworks/base/proto/
(cherry picked from commit
998f97f41d1d2c779202155e9c55361919eff365)
Rajeev Kumar [Thu, 20 Jul 2017 01:12:47 +0000 (18:12 -0700)]
Data plan setting in SystemUI quick settings.
Change-Id: I26e0e7cccc85236503cffd60d5323d444ba7613c
Note: These changes are required for Data balance UI.
Bug:
62349208
Test: manual test
(cherry picked from commit
2d20d90cbd968ebdf9631aef67cf04cfb0b24477)
Dake Gu [Tue, 18 Jul 2017 23:12:43 +0000 (16:12 -0700)]
Initial commit of leanback uibench test
Include the main leanback BrowseFragment for testing.
Test: UiBenchLeanbackJankTests
Change-Id: I995bc726e267c74150a82575f4ffcf4a4d44b9c3
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Bug:
63903843
Test: compiles.
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Lucas Dupin [Thu, 20 Jul 2017 00:32:26 +0000 (17:32 -0700)]
Unhide invalidateColors API
Live wallpapers should be able to report their colors
to have better integration with O-DR visual framework.
Test: make
Bug:
62490115
Change-Id: Id4a61245087a0c6530f56e474ce258ca9528becc
Fixes:
63585249
Amit Mahajan [Thu, 20 Jul 2017 20:59:52 +0000 (20:59 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am:
37a9991be9
Change-Id: I5b5499ed9528aab6718ffe325afe8f51265fd548
Jeff Sharkey [Thu, 20 Jul 2017 03:00:38 +0000 (21:00 -0600)]
Expose SubscriptionPlan API.
Clean up SubscriptionPlan, add docs, and expose as public API.
Deprecate older constants in CarrierConfigManager, and point users
towards new API. (The goal of CarrierConfigManager is to express
key/value pairs that are identical for all users on a particular
carrier, not to configure details that vary between users.)
Since a CarrierService may itself not have access to the plan
details, allow them to "delegate" the capability to configure plans
to another package name.
Factor out new RecurrenceRule class which is used by both
NetworkPolicy and SubscriptionPlan internally. Polish it to support
arbitrary periods, and continue to test it through NPMST.
Bug:
63391323
Test: bit FrameworksCoreTests:android.util.RecurrenceRuleTest
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Exempt-From-Owner-Approval: Bug
63673347
Change-Id: I93fae4a43e58e9e4c32f8bf345a257dcd607f088
Amith Yamasani [Wed, 19 Jul 2017 23:49:52 +0000 (16:49 -0700)]
Handle an edge case that can reset settings provider data
If the AtomicFile does the rename and fails when writing the
original, make sure we can at least use the backup on reboot.
Bug:
63753300
Test: Stop shell, move settings_global.xml to backup, start shell.
Change-Id: I2049b48af05161bb2c68717a71c1700a95150a6c
Julia Reynolds [Wed, 19 Jul 2017 17:48:07 +0000 (13:48 -0400)]
Fix notification ordering for groups
- Only request a re-sort on behalf of notifications whose autogroup is
actually changing
- Don't allow notifications that were posted more than HANG_TIME_MS
ago be reconsidered to be intrusive
- Sort notification groups at the position of the group member
with the best authoritative rank, regardless of importance
Bug:
62895856
Bug:
63291402
Test: set AUTOGROUP_AT_COUNT to 2 in GroupHelper, and
run the AttentionManagement cts verifier test;
runtest systemui-notification
Change-Id: Ic433ca827cd01cf166b3cc11d43be639fd7a13b7
(cherry picked from commit
bbc469cecac9c50c342902d724bfa68acd140770)
Amit Mahajan [Thu, 20 Jul 2017 20:47:17 +0000 (20:47 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
Albert Chaulk [Fri, 14 Jul 2017 16:32:57 +0000 (12:32 -0400)]
Add modified API to send more information to VrCore
Currently, null is sent when a 2D intent is running.
Sending the component name and a flag instead allows
VrCore to determine which intent is currently running
and which layers on the display correspond to this
application.
The process ID of the current intent is also sent,
to allow association of buffers to the VR app.
Bug:
63709047,
63115025
Test: manual with prints
Change-Id: I164b577f2c578867fb953d92074ef3d2d31221a1
Selim Cinek [Thu, 20 Jul 2017 20:39:50 +0000 (20:39 +0000)]
Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev
am:
2ed613ca80
Change-Id: I68feaf8262bb23db08199bff874fc871cff1acfb
Mady Mellor [Thu, 20 Jul 2017 20:28:01 +0000 (20:28 +0000)]
Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev
am:
0b8a985cd6
Change-Id: Ib8d76ea165032175be98e8c1023af6c973be1ee4
TreeHugger Robot [Thu, 20 Jul 2017 20:27:35 +0000 (20:27 +0000)]
Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev
Adrian Roos [Thu, 20 Jul 2017 20:18:08 +0000 (20:18 +0000)]
Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev
am:
99cc683647
Change-Id: I37e31c0a9c252439488c2fe64becd5f70ee16c04
TreeHugger Robot [Thu, 20 Jul 2017 20:13:30 +0000 (20:13 +0000)]
Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 20:05:44 +0000 (20:05 +0000)]
Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev
Selim Cinek [Thu, 20 Jul 2017 19:16:50 +0000 (19:16 +0000)]
Merge "Fixed a bug where shelf notifications were interactable" into oc-dr1-dev
am:
91a6a10195
Change-Id: I7d7434afd13d4f6d6247c801dfa0551ef1b6b792
Glen Kuhne [Wed, 19 Jul 2017 21:53:34 +0000 (14:53 -0700)]
Don't set AccessPoint with WifiInfo.INVALID_RSSI
This stops the RSSI of an AccessPoint object being updated from WifiInfo
for the current network, when that WifiInfo does not have a valid RSSI.
This occurs when attempting to connect to a network, and the connection
has not yet been established.
Fixes a UI bug where the signal strength would appear to be zero when
attempting to connect to something, or after failing to.
Bug:
63487286
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Test: Manual. Attempt to connect to network with bad PSK. Observe Signal
strength does not get set to zero.
Change-Id: Ia5343fb6f0935134e6a4f82034de164342fe55d4
TreeHugger Robot [Thu, 20 Jul 2017 19:09:42 +0000 (19:09 +0000)]
Merge "Fixed a bug where shelf notifications were interactable" into oc-dr1-dev
Lucas Dupin [Thu, 20 Jul 2017 18:55:22 +0000 (18:55 +0000)]
Merge "Choose correct icon shade of grey" into oc-dr1-dev
am:
1f358f1885
Change-Id: I5e05e4a5b3fa4bc5a651b7a7a010dbee36300239
Rob Carr [Thu, 20 Jul 2017 18:47:17 +0000 (18:47 +0000)]
Merge "Fix incorrect SV calculation in non-RT codepath." into oc-dr1-dev
am:
f62e79791b
Change-Id: I59fd7563e1bb82def0e9321b6340c97e249bdcfc
Rob Carr [Thu, 20 Jul 2017 18:40:14 +0000 (18:40 +0000)]
Merge "Fix flicker when transiting activities without animation." into oc-dr1-dev
am:
afe3eb81da
Change-Id: Ia90d8c148df3055794f83cde5ef0a1f7501bdfe9
Lucas Dupin [Thu, 20 Jul 2017 18:36:50 +0000 (18:36 +0000)]
Merge "Choose correct icon shade of grey" into oc-dr1-dev
Mady Mellor [Thu, 20 Jul 2017 18:34:40 +0000 (18:34 +0000)]
Merge "Fixes issue where notification jumps when user is dragging and its updated" into oc-dr1-dev
am:
58b0e698fc
Change-Id: I8fad3cd142cf0e064eacaebaba78f4e091bd9263
Rob Carr [Thu, 20 Jul 2017 18:32:31 +0000 (18:32 +0000)]
Merge "Fix incorrect SV calculation in non-RT codepath." into oc-dr1-dev
Lucas Dupin [Tue, 18 Jul 2017 19:15:41 +0000 (12:15 -0700)]
Choose correct icon shade of grey
Status bar icons should pick colors from icon themes instead
of lock screen text colors.
Test: Visual
Change-Id: I0460ec38c8193f6311a47b4774357d8d3347a8d2
Fixes:
63618424