Jason Monk 4f458421b1 resolve merge conflicts of 1723bc14ebfd to stage-aosp-master ...

Change-Id: I11054806dbd263b2adaedb21458c33b7407bb7d6

2017-02-24 09:34:42 -05:00

..

analytics

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:33:22 +00:00

assist

Assist app is not launched when long-pressing on Home key

2016-12-16 10:52:20 -08:00

classifier

FalsingLog: Fix false positive Log.wtfs

2016-12-14 14:39:16 -08:00

doze

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:33:22 +00:00

egg

…

keyboard

…

keyguard

Keyguard: Don't lock on SIM removed during shutdown

2016-12-27 10:16:37 -08:00

media

…

net

…

power

Add additional logging for temperature readings.

2017-02-03 12:42:54 -08:00

qs

Merge "Hotspot Tile: longclick should open Tethering settings" am: 96c4f1a21e am: 4e82bf6c51

2017-02-07 00:17:43 +00:00

recents

Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev

2017-02-16 03:13:14 +00:00

screenshot

Create a global registry for system message IDs

2017-01-06 11:34:22 -08:00

settings

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:33:22 +00:00

shortcut

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:33:22 +00:00

stackdivider

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:33:22 +00:00

statusbar

resolve merge conflicts of 1723bc14ebfd to stage-aosp-master

2017-02-24 09:34:42 -05:00

tuner

Data activity icon in statusbar

2017-02-23 13:08:16 +09:00

tv/pip

Removing private system ui flags from status bar flags logic.

2016-09-19 18:39:25 -07:00

usb

Create a global registry for system message IDs

2017-01-06 11:34:22 -08:00

volume

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:33:22 +00:00

AutoReinflateContainer.java

…

BatteryMeterDrawable.java

…

BatteryMeterView.java

…

DejankUtils.java

…

DemoMode.java

…

DessertCase.java

…

DessertCaseDream.java

…

DessertCaseView.java

…

EventLogConstants.java

…

EventLogTags.logtags

…

ExpandHelper.java

Fixed a bug where notifications could stay expanded

2017-01-12 15:52:53 +00:00

FontSizeUtils.java

…

Gefingerpoken.java

…

GuestResumeSessionReceiver.java

…

ImageWallpaper.java

…

Interpolators.java

…

Prefs.java

DO NOT MERGE - Ensuring that there are per-user last stack active times.

2017-02-15 16:37:19 -08:00

RecentsComponent.java

…

ResizingSpace.java

…

Somnambulator.java

…

SwipeHelper.java

…

SystemUI.java

…

SystemUIApplication.java

Merge "Fix issue that Overview key doesn't work at secondary user" am: 5379f47d85 am: da9a9da520

2016-09-09 22:02:58 +00:00

SystemUIFactory.java

…

SystemUISecondaryUserService.java

…

SystemUIService.java

…

SysUIToast.java

…

VendorServices.java

…

ViewInvertHelper.java

…