OSDN Git Service
Sundeep Ghuman [Tue, 25 Jul 2017 23:05:11 +0000 (23:05 +0000)]
Merge "Do not evict scan results in cold start." into oc-dr1-dev
am:
d68b6dc56b
Change-Id: If442689c6a05ad261a846a5252d9a0256520508e
Jason Monk [Tue, 25 Jul 2017 23:02:11 +0000 (23:02 +0000)]
Merge "Fix RTL for Nav icons" into oc-dr1-dev
am:
bad473d147
Change-Id: I211be901cd264c3ff4f505abf54dd1d9d8c7667d
Makoto Onuki [Tue, 25 Jul 2017 22:58:23 +0000 (22:58 +0000)]
Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev
am:
906d8f57bf
Change-Id: Ied5b515396764d398807c4f945aaf55af87de03a
Bill Yi [Tue, 25 Jul 2017 22:44:17 +0000 (22:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
edfb7279ee -s ours
Change-Id: I1464cf2e842dc2c9751a6e801a714cd9234fc563
Bill Yi [Tue, 25 Jul 2017 22:42:01 +0000 (22:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
f969869726 -s ours
Change-Id: I11b516cc23ae3714a6c75d937bdb6a24a772c255
TreeHugger Robot [Tue, 25 Jul 2017 22:41:39 +0000 (22:41 +0000)]
Merge "Do not evict scan results in cold start." into oc-dr1-dev
Winson Chung [Tue, 25 Jul 2017 22:39:12 +0000 (22:39 +0000)]
Merge "Prevent NPE, add logging for tracking down root issue." into oc-dr1-dev
am:
cb9f6de368
Change-Id: I37a8cf4df2a430ea1ecd2231d48bbfaa45a45d3d
Alison Cichowlas [Tue, 25 Jul 2017 22:36:50 +0000 (22:36 +0000)]
Merge "Make back button dismiss power dialog, by making dialog focusable." into oc-dr1-dev
am:
5110b31dda
Change-Id: I9a09aae1a3fe9957f8568af85c4f5ed1773b50f8
TreeHugger Robot [Tue, 25 Jul 2017 22:35:18 +0000 (22:35 +0000)]
Merge "Fix RTL for Nav icons" into oc-dr1-dev
Andrew Sapperstein [Tue, 25 Jul 2017 22:34:15 +0000 (22:34 +0000)]
Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev
am:
b63b011419
Change-Id: If69caeaacd480686f5737e2f96d6804ef13ce380
Lucas Dupin [Tue, 25 Jul 2017 22:29:41 +0000 (22:29 +0000)]
Merge "Ambient indicator text color" into oc-dr1-dev
am:
5c6c7586cd -s ours
Change-Id: I7e26ad486d3478c405d2547fb43accf01a7328e5
TreeHugger Robot [Tue, 25 Jul 2017 22:21:29 +0000 (22:21 +0000)]
Merge "resolve merge conflicts of
a1f64b0a9188 to oc-mr1-dev" into oc-mr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 20:49:39 +0000 (20:49 +0000)]
Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 20:45:00 +0000 (20:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Amit Pawar [Tue, 25 Jul 2017 20:18:52 +0000 (20:18 +0000)]
Merge "Fix NPE in MediaRouterService" into oc-mr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 20:11:16 +0000 (20:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 20:10:38 +0000 (20:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Jason Monk [Tue, 25 Jul 2017 19:46:33 +0000 (15:46 -0400)]
Fix RTL for Nav icons
Test: manual
Change-Id: I972641fc8d122ce9f6d4204398559b11a36a4a40
Fixes:
63644656
TreeHugger Robot [Tue, 25 Jul 2017 19:35:43 +0000 (19:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 19:35:03 +0000 (19:35 +0000)]
Merge "Support font resource in TextAppearanceSpan" into oc-mr1-dev
Winson Chung [Tue, 25 Jul 2017 19:22:05 +0000 (19:22 +0000)]
Merge "Prevent NPE, add logging for tracking down root issue." into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 19:03:35 +0000 (19:03 +0000)]
Merge "Make back button dismiss power dialog, by making dialog focusable." into oc-dr1-dev
Lucas Dupin [Tue, 25 Jul 2017 19:00:01 +0000 (12:00 -0700)]
resolve merge conflicts of
a1f64b0a9188 to oc-mr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic2395d055e1f27b186c3b87be5440dc410ee16a3
TreeHugger Robot [Tue, 25 Jul 2017 18:19:24 +0000 (18:19 +0000)]
Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 18:09:42 +0000 (18:09 +0000)]
Merge "Zygote: Increase wrap-pid timeout to thirty seconds" into oc-mr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 18:01:50 +0000 (18:01 +0000)]
Merge "dynamically install all missing splits" into oc-mr1-dev
Lucas Dupin [Tue, 25 Jul 2017 17:53:56 +0000 (17:53 +0000)]
Merge "Ambient indicator text color" into oc-dr1-dev
Adrian Roos [Tue, 25 Jul 2017 17:43:14 +0000 (17:43 +0000)]
Merge "AOD: Show keyguard indications in white" into oc-dr1-dev
am:
ec05633f5f
Change-Id: If3c93807c34241dd5d97502eaf225f14c3527e45
Julia Reynolds [Tue, 25 Jul 2017 17:40:47 +0000 (17:40 +0000)]
Merge "Zen introduction text updates" into oc-dr1-dev
am:
60bf540e20
Change-Id: I3d094ed410060fd2ccb223a16020493f8893d88f
TreeHugger Robot [Tue, 25 Jul 2017 17:40:02 +0000 (17:40 +0000)]
Merge "Fix jank when switching themes" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 17:33:29 +0000 (17:33 +0000)]
Merge "AOD: Show keyguard indications in white" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 17:31:18 +0000 (17:31 +0000)]
Merge "Zen introduction text updates" into oc-dr1-dev
Tomasz Wasilczyk [Tue, 25 Jul 2017 17:18:50 +0000 (17:18 +0000)]
Merge "Rename ACCESS_FM_RADIO to ACCESS_BROADCAST_RADIO permission." into oc-mr1-dev
Alison Cichowlas [Tue, 25 Jul 2017 14:56:16 +0000 (10:56 -0400)]
Make back button dismiss power dialog,
by making dialog focusable.
Test: Manual - verified back button behavior, verified outside touches still ok.
Fixes:
63855564
Change-Id: I684bd4b3f77d00d81fe56c5005ab86403670a851
Adrian Roos [Tue, 25 Jul 2017 17:09:16 +0000 (17:09 +0000)]
Merge "AOD: Fix rotation during screen off (again)" into oc-dr1-dev
am:
9ffa87552b
Change-Id: I921b33e74287d7d629ff07f5afbd1909d5a785b1
TreeHugger Robot [Tue, 25 Jul 2017 17:00:22 +0000 (17:00 +0000)]
Merge "AOD: Fix rotation during screen off (again)" into oc-dr1-dev
Calin Juravle [Tue, 25 Jul 2017 16:54:06 +0000 (16:54 +0000)]
Merge "Fix system server compilation in ZygoteInit" into oc-mr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 16:13:08 +0000 (16:13 +0000)]
Merge "Add API for virtual preloads" into oc-mr1-dev
Winson Chung [Tue, 25 Jul 2017 15:56:22 +0000 (15:56 +0000)]
Merge "Disregard closing activities when blocking previous activities." into oc-dr1-dev
am:
f1f25ad5f2
Change-Id: I3289be6435be80db8fa76a0e14b0bdef0ce317ee
Pankaj Kanwar [Tue, 25 Jul 2017 15:54:44 +0000 (15:54 +0000)]
Merge "Default-disable tethering offload" into oc-dr1-dev
am:
1244ff1956
Change-Id: I289fb5e7cc41d617065c3358cc4810d1825c3ff0
Winson Chung [Tue, 25 Jul 2017 15:45:39 +0000 (15:45 +0000)]
Merge "Disregard closing activities when blocking previous activities." into oc-dr1-dev
Pankaj Kanwar [Tue, 25 Jul 2017 15:43:52 +0000 (15:43 +0000)]
Merge "Default-disable tethering offload" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 15:33:37 +0000 (15:33 +0000)]
Merge "Ambient indicator text color" into oc-mr1-dev
Julia Reynolds [Fri, 21 Jul 2017 15:15:52 +0000 (11:15 -0400)]
Zen introduction text updates
- Update color of text/button for legibility
- prevent poorly timed zen update broadcasts from interrupting the
zen footer window animation
Change-Id: I04eaaae80fb0647b0a792023f5ed03ebd9142e04
Fixes:
63916428
Fixes:
63815440
Test: manual
Adrian Roos [Tue, 25 Jul 2017 14:46:23 +0000 (16:46 +0200)]
AOD: Show keyguard indications in white
Fixes an issue where colored keyguard indications were hard
to read on AOD.
Change-Id: I6bbb6267278a7397327f1fc4d88304d83f5f1ff1
Fixes:
63686192
Test: Set up fingerprint; go to AOD; tap wrong finger; verify message is shown in white
Bill Yi [Tue, 25 Jul 2017 14:18:00 +0000 (07:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8cbbc0e35bc9e917d877df5561d8e93ac43c3db3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Adrian Roos [Tue, 25 Jul 2017 14:11:10 +0000 (14:11 +0000)]
Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into oc-dr1-dev
am:
544e628e16
Change-Id: I2df5b364bbfde27299d5f5114224dd6bfaeaa782
Alex Sakhartchouk [Tue, 25 Jul 2017 14:09:10 +0000 (14:09 +0000)]
Merge "Follow up to "Add modified API to send more information to VrCore"" into oc-dr1-dev
am:
9b53851d58
Change-Id: I73f621eae44bc8cac298d9772b41c5d93eaa185e
Adrian Roos [Tue, 25 Jul 2017 14:01:07 +0000 (14:01 +0000)]
Merge "AOD: Skip prox check if cached prox value available" into oc-dr1-dev
am:
f96573f894
Change-Id: Ia89613aac856b104b32394d6040aa4694327cf55
TreeHugger Robot [Tue, 25 Jul 2017 13:55:35 +0000 (13:55 +0000)]
Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 13:54:25 +0000 (13:54 +0000)]
Merge "Follow up to "Add modified API to send more information to VrCore"" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 13:52:51 +0000 (13:52 +0000)]
Merge "AOD: Skip prox check if cached prox value available" into oc-dr1-dev
Todd Kennedy [Wed, 19 Jul 2017 19:49:30 +0000 (12:49 -0700)]
Add API for virtual preloads
Virtual preloads are applications that aren't actually on the
/system partition, but, act as if they were. One such distinction
is that these apps receive Intent.ACTION_BOOT_COMPLETED and start
out of the stopped state.
Change-Id: I812d3e7008b9d87e84aa33dbc4b3d8e8b334533c
Fix:
34855677
Test: Manual
Test: Install an app with "--preload"
Test: See that it receives Intent.ACTION_BOOT_COMPLETED
Bill Yi [Tue, 25 Jul 2017 13:48:32 +0000 (06:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9fea258b5d8d3a2dbbad4834d1f5b4bd867ebc2a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Adrian Roos [Tue, 25 Jul 2017 13:37:32 +0000 (15:37 +0200)]
AOD: Fix rotation during screen off (again)
Fixes another issue where the screen could rotate during the screen-off transition.
mAwake is still true during goingToSleep, but we should no longer play rotation
animations if we are going to sleep. Instead use the more appropriately named
okToAnimate.
Change-Id: I816d1552de3fea0a19ce42ca50d845eb46f80625
Fixes:
63760853
Test: Trigger show-when-locked navigation, rotate phone to landscape, trigger assistant, go to sleep. Verify no rotation plays; go/wm-smoke
Adrian Roos [Tue, 25 Jul 2017 11:54:28 +0000 (11:54 +0000)]
Merge "Keyguard: Remove fancy colon" into oc-dr1-dev
am:
55bc522d0d
Change-Id: I37e3b2ca2d54f9f84b3d309ba0b099bd032da65a
Adrian Roos [Tue, 25 Jul 2017 11:45:43 +0000 (11:45 +0000)]
Merge "Keyguard: Remove fancy colon" into oc-dr1-dev
Bill Yi [Tue, 25 Jul 2017 10:54:46 +0000 (03:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6b21356d1e9da32d7bd970fcdb6eafbeb994d89c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 25 Jul 2017 10:29:10 +0000 (03:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6a2dbc06a11de27a31d59b3730d4bbf57bb1c311
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Erik Kline [Tue, 25 Jul 2017 03:18:56 +0000 (12:18 +0900)]
Default-disable tethering offload
Test: runtest frameworks-net
Bug:
63250751
Change-Id: I63aa115e534123c46bd515bc099a601da45c5725
Andreas Gampe [Fri, 21 Jul 2017 18:41:00 +0000 (11:41 -0700)]
Zygote: Increase wrap-pid timeout to thirty seconds
Some lowend devices under heavy instrumentation may not be able to
send the pid in the current five seconds. Drop the safety and
ignore watchdog debug builds, and move the timeout to thirty seconds.
Make the ZygoteConnection constants sharable in their own @hide class.
Add an assert into the watchdog that the wait time is less than the
watchdog time on non-debug builds.
(cherry picked from commit
27497c6dfc03242abfe7c087fcaf37e684529678)
Bug:
63904739
Bug:
63638768
Test: m
Test: manual test
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: I80abdda54cd94e935de5a52b9f3c9192d0e31060
Ajay Panicker [Tue, 25 Jul 2017 02:19:31 +0000 (02:19 +0000)]
Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev
am:
aaf3860941
Change-Id: I627a6da4db6eb09b68e23882ccef2de4c80bf747
Alex Sakhartchouk [Tue, 25 Jul 2017 02:12:39 +0000 (22:12 -0400)]
Follow up to "Add modified API to send more information to VrCore"
Fixes corner case when the same component name first shows up as a
non VR activity, then again as VR.
Bug:
63709047
Test: Device launched to VR Home
Change-Id: I6f590185635cde06b0fba9f0e05ff6d6d586cfbb
Ajay Panicker [Tue, 25 Jul 2017 02:11:26 +0000 (02:11 +0000)]
Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev
Sungsoo Lim [Tue, 25 Jul 2017 00:09:03 +0000 (09:09 +0900)]
Fix NPE in MediaRouterService
Bug:
63970300
Test: manual and passed MediaRouterTest
Change-Id: I2e8d09d16ca8693b1bdf51397ad4f10c4aa6d87b
Christine Franks [Tue, 25 Jul 2017 01:43:53 +0000 (01:43 +0000)]
Merge "Don't display QS security footer in demo mode" into oc-dr1-dev
am:
ae6776a839
Change-Id: Iace19d7405aae6b47fb33342dc3419921ebf6a5e
Calin Juravle [Mon, 24 Jul 2017 22:29:56 +0000 (15:29 -0700)]
Fix system server compilation in ZygoteInit
The code which dexopt SystemServer in ZygoteInit used to pass the
sharedLibrary string in the old format.
This CL updates the classPath string to the new class loader context
encoding.
Bug:
63941300
Test: compile WITH_DEXPREOPT=false and WITH_DEXPREOPT_BOOT_IMG_ONLY=false
and check that when the device boots the correct context is passed to
dex2oat.
(cherry picked from commit
b0dede3ec2e57a734fe17bef4920020c2d66488c)
Change-Id: Ie27cd21b0b9c8b7e226bce74dfa297569ac12317
Christine Franks [Tue, 25 Jul 2017 01:35:55 +0000 (01:35 +0000)]
Merge "Remove old configuration values for demo mode" into oc-dr1-dev
am:
e1132b4a39
Change-Id: I649457dd844320fbeb3a33d61ce8813aa0967157
Christine Franks [Tue, 25 Jul 2017 01:25:14 +0000 (01:25 +0000)]
Merge "Don't display QS security footer in demo mode" into oc-dr1-dev
Christine Franks [Tue, 25 Jul 2017 01:23:24 +0000 (01:23 +0000)]
Merge "Remove old configuration values for demo mode" into oc-dr1-dev
Kevin Chyn [Tue, 25 Jul 2017 01:22:06 +0000 (01:22 +0000)]
Merge "Default-off FP Swipe" into oc-dr1-dev
am:
76303759c4
Change-Id: I71e8b7288fad93041e0acef5e662b626f8b4f678
Lucas Dupin [Tue, 11 Jul 2017 19:10:56 +0000 (12:10 -0700)]
Ambient indicator text color
Ambient indicator needs to be aware of overlay changes and
doze states.
Fixes:
62276116
Test: together with ag/
2525169
Change-Id: Ia563ded294b2ebf862326f5831ee04ee11149625
Chen Xu [Tue, 25 Jul 2017 01:14:12 +0000 (01:14 +0000)]
Merge "proper cleanup onDestroy" into oc-dr1-dev
am:
c8f40de2dd
Change-Id: Ibf067cbbb041d0f0e79afbe554438d571f9a8d3e
TreeHugger Robot [Tue, 25 Jul 2017 01:03:14 +0000 (01:03 +0000)]
Merge "Default-off FP Swipe" into oc-dr1-dev
Chen Xu [Tue, 25 Jul 2017 01:00:23 +0000 (01:00 +0000)]
Merge "proper cleanup onDestroy" into oc-dr1-dev
Andrew Sapperstein [Tue, 25 Jul 2017 00:55:32 +0000 (17:55 -0700)]
Use config_headlineFontFeatureSettings for lockscreen clock
Allows OEMs to customize the fontFeatureSettings used for the clock.
Bug:
63861032
Test: manual and ag/
2588146
Change-Id: I670c76a26875466d67c9bd1733932f5b8d82edae
Dianne Hackborn [Tue, 25 Jul 2017 00:26:36 +0000 (00:26 +0000)]
Merge "Add activity manager command to watch uid state changes." into oc-mr1-dev
Janis Danisevskis [Tue, 25 Jul 2017 00:11:05 +0000 (00:11 +0000)]
Merge "Refurbish granting mechanism" into oc-dr1-dev
am:
a4a68a1481 -s ours
Change-Id: I44c5504ba34c8b6f16901ac5d70073a3e69871a3
Salvador Martinez [Tue, 25 Jul 2017 00:05:50 +0000 (00:05 +0000)]
Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev
am:
f104b68a04
Change-Id: Id549831e1061088cefd261f460febcb7b3a3cb3f
TreeHugger Robot [Tue, 25 Jul 2017 00:05:30 +0000 (00:05 +0000)]
Merge "Refurbish granting mechanism" into oc-dr1-dev
TreeHugger Robot [Mon, 24 Jul 2017 23:52:28 +0000 (23:52 +0000)]
Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev
Fyodor Kupolov [Mon, 24 Jul 2017 23:23:12 +0000 (23:23 +0000)]
Merge "Handle onUnlockUser on fg thread" into oc-mr1-dev
fionaxu [Sat, 22 Jul 2017 01:02:30 +0000 (18:02 -0700)]
proper cleanup onDestroy
1. interrupt the sleeping testing thread onDestory to avoid
any thread keep running after onDestory.
2. add check of isFinishing() or isDestoryed() when the
testing thread wakeup.
3. detory the webview onDestory since there're chances that
some callbacks in WebChromeClient will try to open dialogs
while the container activity has been destroyed.
Bug:
63819703
Test: Manual test
Change-Id: Ida62d9d8e97e8c9f905ce2feab4ea265575baee8
Bryce Lee [Mon, 24 Jul 2017 22:13:35 +0000 (22:13 +0000)]
Merge "Determine power hint behavior based on target activity." into oc-dr1-dev
am:
b845700dee
Change-Id: Ic2430d0fd6f9a08d2f5aad612c79611adfa7d6b6
Bryce Lee [Mon, 24 Jul 2017 22:07:47 +0000 (22:07 +0000)]
Merge "Determine power hint behavior based on target activity." into oc-dr1-dev
TreeHugger Robot [Mon, 24 Jul 2017 21:23:38 +0000 (21:23 +0000)]
Merge "Update for less arguments in hidl toBinder." into oc-mr1-dev
Matthew Ng [Mon, 24 Jul 2017 21:17:23 +0000 (21:17 +0000)]
Merge "Android Recents implementation for low ram devices" into oc-mr1-dev
Kevin Chyn [Mon, 24 Jul 2017 21:00:22 +0000 (14:00 -0700)]
Default-off FP Swipe
Fixes:
63992836
Test: adb shell settings delete secure system_navigation_keys_enabled
&& make -j RunSettingsRoboTests
Change-Id: I6632c7244749b3b98227cb4392438ab861f3f815
Winson Chung [Mon, 24 Jul 2017 20:52:49 +0000 (13:52 -0700)]
Prevent NPE, add logging for tracking down root issue.
Bug:
63932749
Test: Unable to repro.
Change-Id: Ia210eff19ff46a46e4f53dd3cc04cf20a2e44683
Winson Chung [Mon, 24 Jul 2017 20:32:43 +0000 (20:32 +0000)]
Merge "Fixing occasional jump when launching certain apps from Recents." into oc-dr1-dev
am:
aa5937a366
Change-Id: I75c7bf10c58705dbe26ba60804fc18d1e8257906
Lucas Dupin [Mon, 17 Jul 2017 22:45:06 +0000 (15:45 -0700)]
Fix jank when switching themes
Turning overlays on and off takes time,
it also doesn't allow us to have fine control
over which view is using which theme.
Lock screen colors are now driven by themes.
Change-Id: Ie8860d00dbb0705ed76edf60a9d3030618dd21ca
Fixes:
63751714
Test: Visual. Set wallpapers, unlock.
Test: runtest -x packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerTest.java
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java
Test: systrace
Selim Cinek [Mon, 24 Jul 2017 20:26:19 +0000 (20:26 +0000)]
Merge "Fixed an issue where the lock icon could be invisible" into oc-dr1-dev
am:
106b5eefd2
Change-Id: Ic55a8e7a4a59dcad2b0472f9906fe4393313b5f9
Winson Chung [Mon, 24 Jul 2017 20:25:07 +0000 (20:25 +0000)]
Merge "Fixing occasional jump when launching certain apps from Recents." into oc-dr1-dev
TreeHugger Robot [Mon, 24 Jul 2017 20:21:15 +0000 (20:21 +0000)]
Merge "Don't create WindowNode on windows with dettached view." into oc-mr1-dev
Selim Cinek [Mon, 24 Jul 2017 20:19:30 +0000 (20:19 +0000)]
Merge "Fixed an issue where the lock icon could be invisible" into oc-dr1-dev
Felipe Leme [Mon, 24 Jul 2017 20:18:53 +0000 (20:18 +0000)]
Merge "DO NOT MERGE - Don't 'cmd vibrate' when on DND mode." into oc-dr1-dev
am:
9874ab69e5
Change-Id: I9dfeacca337dc93c39bc5c964b596655f2a7a0de
Sundeep Ghuman [Sat, 22 Jul 2017 01:42:10 +0000 (18:42 -0700)]
Do not evict scan results in cold start.
When starting WifiTracker, show whatever results are available from
platform until new scan results come in. This allows us to show the best
available results from the previous location scan. Once we have resumed
scanning and new scan results come in, the previous logic of evicting
scan results older than 15 seconds applies.
Also prevent unnecessary onConnectedChanged callbacks from being fired,
which may unnecessarily cause UI reloading bars to appear by performing
unnecessary work.
Bug: b/
38212080
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java &&
runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I3db9d98425b3d2fc66fa0757807a318d0c7456ee
Robert Carr [Mon, 24 Jul 2017 20:13:47 +0000 (20:13 +0000)]
Merge "Ignore "mLastHidden" state when deciding whether to turnScreenOn." into oc-dr1-dev
am:
cf3b6afe01
Change-Id: Ibadb8f4808060e3d25fc93da5593abfcf819191b
TreeHugger Robot [Mon, 24 Jul 2017 20:08:31 +0000 (20:08 +0000)]
Merge "DO NOT MERGE - Don't 'cmd vibrate' when on DND mode." into oc-dr1-dev
Salvador Martinez [Sat, 22 Jul 2017 18:03:22 +0000 (11:03 -0700)]
move icon so that inline actions in settings can use it
Test: tests still pass
Bug:
62022517
Change-Id: Ifc01797c6ada51130586b5b42570c3357923ef85