OSDN Git Service
TreeHugger Robot [Wed, 7 Jun 2017 23:40:32 +0000 (23:40 +0000)]
Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev
Bryce Lee [Wed, 7 Jun 2017 23:31:48 +0000 (23:31 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
am:
f867733d4f
Change-Id: Icaff526ff266e449eefdc6f471c37d94290662b6
Sundeep Ghuman [Wed, 7 Jun 2017 23:25:50 +0000 (23:25 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
am:
09d06437ad
Change-Id: Ie5150009258a7bccfdf222bf21329722e1e20589
Bryce Lee [Wed, 7 Jun 2017 23:23:17 +0000 (23:23 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
Sundeep Ghuman [Wed, 7 Jun 2017 23:23:20 +0000 (23:23 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
am:
584406f8e1 -s ours
Change-Id: Ib9a20c7caf8a86a0611c9c91a4b0024686e3f5e9
TreeHugger Robot [Wed, 7 Jun 2017 23:19:04 +0000 (23:19 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 23:18:07 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
Bryce Lee [Wed, 7 Jun 2017 23:01:56 +0000 (23:01 +0000)]
Revert "Coordinate configuration changes and window frame size."
This reverts commit
afb45bba8379df530182dae882ec70329423dcfe.
Bug:
32839232
Fixes:
62424393
Change-Id: Ifaa0176e18100ec85b8c81268a26fb16ffe9b5f3
Selim Cinek [Wed, 7 Jun 2017 22:57:54 +0000 (22:57 +0000)]
Merge "Fixed an issue where the qs panel wasn't properly placed" into oc-dr1-dev
Sanket Padawe [Wed, 7 Jun 2017 21:50:30 +0000 (21:50 +0000)]
Merge "Update strings for modem restricted state." into oc-dev
am:
58977d1035
Change-Id: I44ee9421ee32c68dd880176f12a89c8ecb3ae03b
Jorim Jaggi [Wed, 7 Jun 2017 21:47:03 +0000 (21:47 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
am:
fc1753d495
Change-Id: I5cd92b3e08e812f6634f7a8c793b8ac9ef3bcc00
TreeHugger Robot [Wed, 7 Jun 2017 21:42:33 +0000 (21:42 +0000)]
Merge "Update strings for modem restricted state." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 21:40:00 +0000 (21:40 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
Selim Cinek [Wed, 7 Jun 2017 21:03:12 +0000 (21:03 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev
am:
beba1bf936
Change-Id: I22d44dde99093cbcf10ca8cddb3beccfdc9bdafb
Winson Chung [Wed, 7 Jun 2017 20:57:41 +0000 (20:57 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
am:
fd6b3c6da3
Change-Id: Ia156853dacf464f80ea46b35806c1f40d3107ecd
Selim Cinek [Wed, 7 Jun 2017 20:47:47 +0000 (20:47 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 20:46:15 +0000 (20:46 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
Jian Sun [Wed, 7 Jun 2017 20:37:45 +0000 (20:37 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
am:
8d5b58a660
Change-Id: Id381a515c44253dc2c3cfa7a74e855fda981580f
Jian Sun [Wed, 7 Jun 2017 20:31:00 +0000 (20:31 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
Julia Reynolds [Wed, 7 Jun 2017 20:21:26 +0000 (20:21 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
am:
6e96251d92
Change-Id: Ie1d25ecf377a023833f29c01f093831f049166fd
Adrian Roos [Fri, 2 Jun 2017 00:55:05 +0000 (17:55 -0700)]
AmbientIndication: Add tap again hint
Adds a hint for tapping the ambient indication again to open.
Also fixes an issue where the indication bottom padding was not correctly
updated if the indication was shown while the panel is collapsed.
Bug:
38387500
Test: tap indication, verify it shows the tap-again-to-open hint. Also verify that if the indication gets set while the phone is unlocked that sufficient space is reserved after transitioning to the lockscreen.
Change-Id: Ie9a152b0bd86807958376fd278ef9502c03af6b2
Julia Reynolds [Wed, 7 Jun 2017 20:12:21 +0000 (20:12 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
Sundeep Ghuman [Tue, 6 Jun 2017 19:27:25 +0000 (12:27 -0700)]
DO NOT MERGE: Kill Wifi Badging in OC.
Speed labeling is turned on in O-DR hence this CL should not be merged
into master. Using the merged in tag below which implements speed
labeling (ag/
2346102) to prevent this CL from being merged into upstream
branches which need scoring ui.
Merged-In: I0fd96da6a06dafd8c8ebb435a2725ab155bd26ed
Bug: b/
35628911
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I5740f68be25d5ec297f1f7dc3b3e59203cec2eb5
Doris Liu [Wed, 7 Jun 2017 19:40:53 +0000 (19:40 +0000)]
Merge "Better error message for AVD" into oc-dev
am:
cabf9cdc2e
Change-Id: I6e63b81fd2168780d23a88d7340812b55db98497
Jorim Jaggi [Wed, 7 Jun 2017 19:38:19 +0000 (12:38 -0700)]
Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND
To make sure we won't cause SystemUI to draw the black status bar
background while the starting window is visible.
Test: Warm open chrome
Test: go/wm-smoke
Bug:
38136531
Change-Id: I8dfc0926cafef9d41e78a637523316ac46ce05df
Doris Liu [Wed, 7 Jun 2017 19:31:09 +0000 (19:31 +0000)]
Merge "Better error message for AVD" into oc-dev
Jeff Sharkey [Wed, 7 Jun 2017 19:13:01 +0000 (19:13 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
am:
6746aa8c4d
Change-Id: I32f223228c45a4949ebf53c1ab73d20fa9950ed6
Selim Cinek [Fri, 2 Jun 2017 00:36:46 +0000 (17:36 -0700)]
Fixed an issue where the qs panel wasn't properly placed
The QS panel should only be placed below the notifications
if it has notifications above the shelf. This ensures that
all animations including icons are appearing in the right
place.
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/AboveShelfObserverTest.java
Fixes:
35305470
Change-Id: I97fb0c76ed69b7638ce83a7c06856d87bf6bf65f
Jeff Sharkey [Wed, 7 Jun 2017 19:03:54 +0000 (19:03 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
Todd Kennedy [Wed, 7 Jun 2017 18:50:33 +0000 (18:50 +0000)]
Merge "always adjust per-user application info" into oc-dev
am:
91a9d65e42
Change-Id: Ief1ab206a0eb71c9225c000148d0f0b3264a526b
Todd Kennedy [Wed, 7 Jun 2017 18:40:53 +0000 (18:40 +0000)]
Merge "always adjust per-user application info" into oc-dev
Makoto Onuki [Wed, 7 Jun 2017 18:40:46 +0000 (18:40 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
am:
28afa23a8f
Change-Id: I3d1079365f13400d1f23f6e61122e00c67432dd1
Makoto Onuki [Wed, 7 Jun 2017 18:33:19 +0000 (18:33 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
Selim Cinek [Wed, 7 Jun 2017 18:25:12 +0000 (18:25 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
am:
295dd7193e
Change-Id: I1f41744ec2cc5d820e7381858d5974b17db8d893
TreeHugger Robot [Wed, 7 Jun 2017 18:23:11 +0000 (18:23 +0000)]
Merge "Add a WM API to query the touch region for the input method window" into oc-dr1-dev
Selim Cinek [Wed, 7 Jun 2017 18:13:25 +0000 (18:13 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
Jason Monk [Wed, 7 Jun 2017 17:28:24 +0000 (17:28 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev
am:
463985178c
Change-Id: I4f1d959c130a008aad49c4aab0aa225bfb035ab3
Jason Monk [Wed, 7 Jun 2017 17:17:43 +0000 (17:17 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev
Sanket Padawe [Tue, 6 Jun 2017 22:12:04 +0000 (15:12 -0700)]
Update strings for modem restricted state.
Test: manual
Bug:
37377132
Change-Id: Iace44143623034c0255d7cceff839a4712972ee2
John Reck [Wed, 7 Jun 2017 16:49:12 +0000 (16:49 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev
am:
d3e78478aa
Change-Id: I7d96db34b1894e1064116b830a8fb159ad4c57b0
John Reck [Wed, 7 Jun 2017 16:42:43 +0000 (16:42 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev
Albert Chaulk [Mon, 5 Jun 2017 23:35:23 +0000 (19:35 -0400)]
Add a WM API to query the touch region for the input method window
This is needed by VR to handle keyboards that display a window larger
than the interactable region
Bug:
62194867
Test: Manually with prints
Change-Id: I7288956ed8da8d24e7c46ffa8f27461f7abbca5e
(cherry picked from commit
56162a0a51e2aa752a500d941869f1af652eabbf)
Daniel Sandler [Wed, 7 Jun 2017 15:02:00 +0000 (15:02 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev
am:
630e7841e5
Change-Id: Idde8d539f4f49bcf171e060d6c6483e375748346
Daniel Sandler [Wed, 7 Jun 2017 14:56:41 +0000 (14:56 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev
Julia Reynolds [Wed, 7 Jun 2017 14:12:09 +0000 (14:12 +0000)]
Revert "Change default for group alert behavior"
This reverts commit
8f7828ebe7fc6d87e0de112cfda2823fd5818cb2.
Mutes sound on legacy apps that use their summaries to make sound
Change-Id: I635b1428ee247c0b7753f58343637e64da1c981d
Fixes:
62387153
Wale Ogunwale [Wed, 7 Jun 2017 13:50:25 +0000 (13:50 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
am:
7925f817d0
Change-Id: I0b957a0a67a9e245d51dce610acef97d6b72fa04
Wale Ogunwale [Wed, 7 Jun 2017 13:45:02 +0000 (13:45 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
Jason Monk [Wed, 7 Jun 2017 13:15:54 +0000 (09:15 -0400)]
Make DND tile primary toggle remember favorite zen
Test: manual
Change-Id: I2b589dbabf4bd7704d4df968ecbd986604e3b757
Fixes:
37794901
Hyunyoung Song [Wed, 7 Jun 2017 09:04:17 +0000 (09:04 +0000)]
Merge "Change Android default icon b/
35314247 Test: manual" into oc-dev
am:
bb4aeb19be
Change-Id: I7a80c68f227d2596f3863b9f234d31a7143ca33c
Michael Wright [Wed, 7 Jun 2017 09:00:53 +0000 (09:00 +0000)]
Merge "Actually wait until the display is ready." into oc-dev
am:
496267f93b
Change-Id: I40d9fb13190db81472cde320cccd9a868ea21516
TreeHugger Robot [Wed, 7 Jun 2017 07:50:14 +0000 (07:50 +0000)]
Merge "Change Android default icon b/
35314247 Test: manual" into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 07:22:52 +0000 (07:22 +0000)]
Merge "Actually wait until the display is ready." into oc-dev
Tyler Freeman [Wed, 7 Jun 2017 06:48:58 +0000 (06:48 +0000)]
Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev am:
ac36c42a86
am:
8cb653925b
Change-Id: I7abd446e96368b50eeff92ea134aeea6999f7c7a
Tyler Freeman [Wed, 7 Jun 2017 06:38:38 +0000 (06:38 +0000)]
Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev
am:
ac36c42a86
Change-Id: Ib30211346cbce8dbb0853469c17994f23b7c456d
TreeHugger Robot [Wed, 7 Jun 2017 06:33:03 +0000 (06:33 +0000)]
Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev
Roozbeh Pournader [Wed, 7 Jun 2017 06:21:40 +0000 (06:21 +0000)]
Merge "Move tests with private APIs to coretests"
Qingxi Li [Wed, 7 Jun 2017 04:50:21 +0000 (04:50 +0000)]
Merge "Only show the "Disable eSIM" when eSIM profile is enabled"
Jorim Jaggi [Wed, 7 Jun 2017 04:27:53 +0000 (04:27 +0000)]
Merge "Fix crash in test" into oc-dev am:
d5ece513ec
am:
3a981207ce
Change-Id: I0f564ed2cee6ad4e45968704a4c64029644bbc4c
Jorim Jaggi [Wed, 7 Jun 2017 04:20:40 +0000 (04:20 +0000)]
Merge "Fix crash in test" into oc-dev
am:
d5ece513ec
Change-Id: I923f532600fe7b3fe372fd4cf2469c2ea2b03569
TreeHugger Robot [Wed, 7 Jun 2017 04:12:44 +0000 (04:12 +0000)]
Merge "Fix crash in test" into oc-dev
Doris Liu [Wed, 7 Jun 2017 03:58:45 +0000 (03:58 +0000)]
Merge "Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev am:
8d06d8cbf1" into oc-dev-plus-aosp
am:
721ecfd21a
Change-Id: Iec199dd0cfe7beace7549d3e16e888458fd0306c
Hugo Benichi [Wed, 7 Jun 2017 03:54:12 +0000 (03:54 +0000)]
Merge "Revert "Captive portal login shows specific network name"" am:
7f423d00dd am:
24912bb93d am:
41415facc8
am:
335a1d36ea
Change-Id: Ib6285780806a9bbffc9bb302085e78f72c27b1be
Android Build Merger (Role) [Wed, 7 Jun 2017 03:50:33 +0000 (03:50 +0000)]
Merge "Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev am:
8d06d8cbf1" into oc-dev-plus-aosp
Doris Liu [Wed, 7 Jun 2017 03:49:44 +0000 (03:49 +0000)]
Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev
am:
8d06d8cbf1
Change-Id: I3e8680067b360ed5792f9a9d1be953561fca7969
Hugo Benichi [Wed, 7 Jun 2017 03:47:17 +0000 (03:47 +0000)]
Merge "Revert "Captive portal login shows specific network name"" am:
7f423d00dd am:
24912bb93d
am:
41415facc8
Change-Id: Ic93c6170813b8c43176d57b534e405500c4639c1
Doris Liu [Wed, 7 Jun 2017 03:43:07 +0000 (03:43 +0000)]
Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev
Hugo Benichi [Wed, 7 Jun 2017 03:41:13 +0000 (03:41 +0000)]
Merge "Revert "Captive portal login shows specific network name"" am:
7f423d00dd
am:
24912bb93d
Change-Id: Ief5a666699e64cf5d5fc79de1b7964f473898f78
Hugo Benichi [Wed, 7 Jun 2017 03:32:09 +0000 (03:32 +0000)]
Merge "Revert "Captive portal login shows specific network name""
am:
7f423d00dd
Change-Id: I0d77f19cadbf5905215ae576e66057a259f2348e
Hugo Benichi [Wed, 7 Jun 2017 03:23:16 +0000 (03:23 +0000)]
Merge "Revert "Captive portal login shows specific network name""
Hugo Benichi [Wed, 7 Jun 2017 03:22:20 +0000 (03:22 +0000)]
Revert "Captive portal login shows specific network name"
This reverts commit
8032ff32ff9c2b6684bd365059f88a858272b633.
Several branches are broken because of this.
Change-Id: I2d9f8b1cc8f93ed8de7d1e01d49c7cd29417820d
Hugo Benichi [Wed, 7 Jun 2017 03:03:12 +0000 (03:03 +0000)]
Merge "Captive portal login shows specific network name" am:
ea7322d17e am:
d4cb33b83f am:
6f2d79464d
am:
8d60db5241
Change-Id: I9484e2d577ca547bbff4b516fcb445b4e8cdcdef
Hugo Benichi [Wed, 7 Jun 2017 02:56:15 +0000 (02:56 +0000)]
Merge "Captive portal login shows specific network name" am:
ea7322d17e am:
d4cb33b83f
am:
6f2d79464d
Change-Id: I88dc4240bc4a8eb84bc3edd7a9f5a873296075fd
Hugo Benichi [Wed, 7 Jun 2017 02:49:05 +0000 (02:49 +0000)]
Merge "Captive portal login shows specific network name" am:
ea7322d17e
am:
d4cb33b83f
Change-Id: Ie52f17dced7db6dfb6c58f935bf976ff72fa723d
Hugo Benichi [Wed, 7 Jun 2017 02:42:36 +0000 (02:42 +0000)]
Merge "Captive portal login shows specific network name"
am:
ea7322d17e
Change-Id: I48abfa9523854ea3f30883e92d6d3011d41c6a66
TreeHugger Robot [Wed, 7 Jun 2017 02:36:12 +0000 (02:36 +0000)]
Merge "Remove unnecessary code"
Hugo Benichi [Wed, 7 Jun 2017 02:33:02 +0000 (02:33 +0000)]
Merge "Captive portal login shows specific network name"
Andrew Sapperstein [Wed, 7 Jun 2017 02:21:53 +0000 (02:21 +0000)]
Merge "Add config_headlineFontFamily."
TreeHugger Robot [Wed, 7 Jun 2017 02:20:59 +0000 (02:20 +0000)]
Merge "Add strings for improving Wifi wrong password UX"
Andrew Sapperstein [Tue, 6 Jun 2017 01:30:06 +0000 (18:30 -0700)]
Add config_headlineFontFamily.
Creates a config string called config_headlineFontFamily that allows
vendors to override the default font family if they so desire.
Bug:
36855735
Test: ag/
2360364
Change-Id: I145e33650d0feec2a52132ac46322c51a23d8ccd
Doris Liu [Tue, 6 Jun 2017 21:56:02 +0000 (14:56 -0700)]
Better handle non-recommended use and warn against it in JavaDoc
BUG:
62386748
Test: Follow repro steps in b/
62358678. The issue is no
longer reproducible
Change-Id: Ic3cec7c4947296224edb5365d81988d4da7ee5e1
TreeHugger Robot [Wed, 7 Jun 2017 01:23:31 +0000 (01:23 +0000)]
Merge "Fix "OK" speed label string."
Evan Rosky [Wed, 7 Jun 2017 01:19:12 +0000 (01:19 +0000)]
Merge "Don't report focusableViewAvailable on add" into oc-dev am:
8d4b72c68a
am:
2b64c87366
Change-Id: I76ffe2869425314f43b0fc2044b8bb8d80619689
Tyler Freeman [Fri, 5 May 2017 00:23:35 +0000 (17:23 -0700)]
Vibrator: Allow priority vibrations in low-power mode for accessibility.
This is mainly for Wear devices that don't have speakers.
Bug:
37543478
Test: Manual:
1. Activate low power mode `adb shell dumpsys battery unplug && adb shell settings put global low_power 1`
2. Then see if Alarm/Timer will vibrate.
3. Send a Hangout Test notification, make sure it does NOT vibrate.
On phones there should be no change. Alarms will not vibrate.
Change-Id: Ia6dffa7e528886e7c84390dbb33b44f298c7afa4
Evan Rosky [Wed, 7 Jun 2017 01:09:17 +0000 (01:09 +0000)]
Merge "Don't report focusableViewAvailable on add" into oc-dev
am:
8d4b72c68a
Change-Id: I4169c2ecf3890946090e4c171a666292262118f6
Selim Cinek [Wed, 7 Jun 2017 01:07:47 +0000 (18:07 -0700)]
Fixed a flicker of group notifications
When replacing a supressed group with it's summary, the icon
would flicker. We're now suppressing icon animations of
replaced notifications.
Test: add notification and children 1 by 1 and observe no flickering
Change-Id: I79440e473296e766ab80832ce74f450aee1af8ea
Fixes:
38459207
Android Build Merger (Role) [Wed, 7 Jun 2017 01:07:26 +0000 (01:07 +0000)]
Merge "Merge "Fixed autofill filter comparison." into oc-dev am:
72f2d98c5a am:
4d47d7ad46"
Felipe Leme [Wed, 7 Jun 2017 01:05:39 +0000 (01:05 +0000)]
Merge "Fixed autofill filter comparison." into oc-dev am:
72f2d98c5a
am:
4d47d7ad46
Change-Id: Ic6d4af3752da2672ce172f09022e0dfaf1bd0810
TreeHugger Robot [Wed, 7 Jun 2017 01:05:16 +0000 (01:05 +0000)]
Merge changes from topic 'dungeon-master'
* changes:
Hide redundant foreground service notifications.
Updates to Dianne's Dungeon.
Felipe Leme [Wed, 7 Jun 2017 01:02:34 +0000 (01:02 +0000)]
Merge "Improved debug to diagnose Save issues." into oc-dev am:
be4420cf13
am:
34e7f3b6ba
Change-Id: I86366b96742aafd1c9f6f9f7a1dc278f0275e3ff
Evan Rosky [Wed, 7 Jun 2017 01:02:13 +0000 (01:02 +0000)]
Merge "Don't report focusableViewAvailable on add" into oc-dev
Felipe Leme [Wed, 7 Jun 2017 00:57:16 +0000 (00:57 +0000)]
Merge "Use initial value on save when value didn't change." into oc-dev am:
2e723982d5
am:
08365011a2
Change-Id: I38b2e8096b7fe43a294afe400af093b49616335d
Felipe Leme [Wed, 7 Jun 2017 00:55:27 +0000 (00:55 +0000)]
Merge "Fixed autofill filter comparison." into oc-dev
am:
72f2d98c5a
Change-Id: I1fef87940fe08d875d3d449a830bd652871e2505
Felipe Leme [Wed, 7 Jun 2017 00:51:31 +0000 (00:51 +0000)]
Merge "Improved debug to diagnose Save issues." into oc-dev
am:
be4420cf13
Change-Id: Id65b8d62403af8883503d5b31903d73751f33bf2
Felipe Leme [Wed, 7 Jun 2017 00:48:54 +0000 (00:48 +0000)]
Merge "Don't show AUTOFILL menu when text is selected." into oc-dev am:
49231f183f
am:
fc4604f719
Change-Id: I73c6181f7fdd4b2b4c38338c13d9bf439199617f
Felipe Leme [Wed, 7 Jun 2017 00:46:53 +0000 (00:46 +0000)]
Merge "Use initial value on save when value didn't change." into oc-dev
am:
2e723982d5
Change-Id: Ie8196727744de7b8a5d51fe671bca8c984ae321d
TreeHugger Robot [Wed, 7 Jun 2017 00:45:01 +0000 (00:45 +0000)]
Merge "Replace mockito with a mock class in DynamicLayoutTest"
Sundeep Ghuman [Tue, 6 Jun 2017 20:02:15 +0000 (13:02 -0700)]
Remove Wifi Badges from platform.
This change makes it impossible to return a badged wifi icon, even if
scoring ui is enabled. It also prevents IAE from net badgecurve enums.
Bug: b/
35628911
Test: make -j40
Change-Id: I014f27e5c4e42075e7e62da7fffb9ecf38f6eb4c
Marco Nelissen [Wed, 7 Jun 2017 00:39:56 +0000 (00:39 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3 am:
d7fe3ea6a8 am:
db9d2588b8 am:
9e4e6c4b7c am:
6596f721fd
am:
3f4a368a7c
Change-Id: I9675446964d2bd5672fe87674571dae517f5ba3d
Felipe Leme [Wed, 7 Jun 2017 00:38:40 +0000 (00:38 +0000)]
Merge "Don't show AUTOFILL menu when text is selected." into oc-dev
am:
49231f183f
Change-Id: I5d182201cc568caa894dddd6352cbf6abb83a03b
Marco Nelissen [Wed, 7 Jun 2017 00:31:38 +0000 (00:31 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887 am:
4d9e6150f3 am:
d7fe3ea6a8 am:
db9d2588b8 am:
9e4e6c4b7c
am:
6596f721fd
Change-Id: Iaf21b4182d659b4ffc5b2e514c7a4dfcb15cc143