OSDN Git Service
Android Build Merger (Role) [Thu, 22 Jun 2017 22:34:52 +0000 (22:34 +0000)]
Merge "Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c am:
9e391f9f86" into oc-dr1-dev-plus-aosp
Rob Carr [Thu, 22 Jun 2017 22:33:51 +0000 (22:33 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c
am:
9e391f9f86
Change-Id: I8566d935ec735b360af54998599a8ce185fcf9ee
Rob Carr [Thu, 22 Jun 2017 22:32:07 +0000 (22:32 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c
am:
874b6402af
Change-Id: I3db14694bc27e9fed16b5efec6aba99570b89675
Rob Carr [Thu, 22 Jun 2017 22:23:19 +0000 (22:23 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
am:
82b41e460c
Change-Id: I47c8e096ccd513eb65fa9fd2a34fc75fa222a42c
Rob Carr [Thu, 22 Jun 2017 22:19:45 +0000 (22:19 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
am:
82b41e460c
Change-Id: I14f6fe76b3a24266432a8bc7286d1ae5da8f719d
Rob Carr [Thu, 22 Jun 2017 22:08:03 +0000 (22:08 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
Neil Fuller [Thu, 22 Jun 2017 21:56:18 +0000 (21:56 +0000)]
Merge "Fix code and test related to rules version check" am:
a3579d4b84 am:
c506ade205
am:
af32c3d234
Change-Id: I2dc13436ceb93eb620dcaaa6d141210dc57ea1fc
Android Build Merger (Role) [Thu, 22 Jun 2017 21:53:47 +0000 (21:53 +0000)]
Merge "Merge "Change PIP notification icon" into oc-dev am:
9f3967fee1 am:
e9ede0548b" into oc-dr1-dev-plus-aosp
Shubang [Thu, 22 Jun 2017 21:51:37 +0000 (21:51 +0000)]
Merge "Change PIP notification icon" into oc-dev am:
9f3967fee1
am:
e9ede0548b
Change-Id: Ifecd856ffeb53c3a7249caa58fdb98dff71f4b93
Shubang [Thu, 22 Jun 2017 21:51:34 +0000 (21:51 +0000)]
Merge "Change PIP notification icon" into oc-dev am:
9f3967fee1
am:
745bbf758d
Change-Id: I73fd01b193324ab9b4c1320e47ab8be1d77a3cc2
Neil Fuller [Thu, 22 Jun 2017 21:49:28 +0000 (21:49 +0000)]
Merge "Fix code and test related to rules version check" am:
a3579d4b84
am:
c506ade205
Change-Id: Ia72b94700d1a65de769beace27e699e62aedcd9f
Shubang [Thu, 22 Jun 2017 21:44:18 +0000 (21:44 +0000)]
Merge "Change PIP notification icon" into oc-dev
am:
9f3967fee1
Change-Id: I5c42cb241ef98bc5e70b03d460230e3ac2115240
Shubang [Thu, 22 Jun 2017 21:44:18 +0000 (21:44 +0000)]
Merge "Change PIP notification icon" into oc-dev
am:
9f3967fee1
Change-Id: I1f12ec16adaa173d90ffbb62c5a88387340e4042
Maurice Lam [Thu, 22 Jun 2017 21:44:10 +0000 (21:44 +0000)]
Merge "Add tintable icon support" into oc-dr1-dev
am:
53d79aa8ea
Change-Id: I11e1a99d8482871ac0c2fac0761f77d0a57f6938
Neil Fuller [Thu, 22 Jun 2017 21:37:48 +0000 (21:37 +0000)]
Merge "Fix code and test related to rules version check"
am:
a3579d4b84
Change-Id: I2021e64f04e0e55de21dcdc0a932ce535e6a7f9f
TreeHugger Robot [Thu, 22 Jun 2017 21:33:39 +0000 (21:33 +0000)]
Merge "Add tintable icon support" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 21:31:56 +0000 (21:31 +0000)]
Merge "Change PIP notification icon" into oc-dev
Treehugger Robot [Thu, 22 Jun 2017 21:23:52 +0000 (21:23 +0000)]
Merge "Fix code and test related to rules version check"
Android Build Merger (Role) [Thu, 22 Jun 2017 20:44:57 +0000 (20:44 +0000)]
Merge "Merge "Added more systrace points to window manager" into oc-dev am:
182d5ec2d2 am:
0e068632ef" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Thu, 22 Jun 2017 20:43:54 +0000 (20:43 +0000)]
Merge "Added more systrace points to window manager" into oc-dev am:
182d5ec2d2
am:
0e068632ef
Change-Id: I70d155d214a70fb451bb7468d91e782f0f6f4d49
Android Build Merger (Role) [Thu, 22 Jun 2017 20:43:15 +0000 (20:43 +0000)]
Merge "Merge "Add a common call when wrapping an app." am:
12e0975963 am:
bb6cf84a40 am:
1d10ce12ff" into oc-dr1-dev-plus-aosp
Christopher Ferris [Thu, 22 Jun 2017 20:42:00 +0000 (20:42 +0000)]
Merge "Add a common call when wrapping an app." am:
12e0975963 am:
bb6cf84a40
am:
1d10ce12ff
Change-Id: Ib814bcfc56ad6742a023bd7245952cefd51d5fd2
Android Build Merger (Role) [Thu, 22 Jun 2017 20:41:30 +0000 (20:41 +0000)]
Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am:
d0550a9b6c am:
206f1ef043" into oc-dr1-dev-plus-aosp
Lucas Dupin [Thu, 22 Jun 2017 20:39:59 +0000 (20:39 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev am:
d0550a9b6c
am:
206f1ef043
Change-Id: I3ee03acf859868b9225f1e90d537013875dc7e18
Jason Monk [Thu, 22 Jun 2017 20:36:32 +0000 (20:36 +0000)]
Merge "Make default status bar padding 8dp" into oc-dr1-dev
am:
5af936f31e
Change-Id: Ie735752778c98b3d8ee37c32f5bca175abb4e62d
Android Build Merger (Role) [Thu, 22 Jun 2017 20:32:46 +0000 (20:32 +0000)]
Merge "Merge "GnssLocationProvider: listening to conn lost event" into oc-dr1-dev am:
9564b4d168" into oc-dr1-dev-plus-aosp
Kevin Tang [Thu, 22 Jun 2017 20:29:58 +0000 (20:29 +0000)]
Merge "GnssLocationProvider: listening to conn lost event" into oc-dr1-dev
am:
9564b4d168
Change-Id: I02b2533b777d228d298283697aabaaf0602b567d
Jason Monk [Thu, 22 Jun 2017 20:29:32 +0000 (20:29 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am:
6791bee744
am:
9980bade09
Change-Id: Ic00fae7701ddb74914e7154fb878ffe4a48a9b55
Neil Fuller [Thu, 22 Jun 2017 16:58:02 +0000 (17:58 +0100)]
Fix code and test related to rules version check
Fix code and test related to an incorrectly implemented
rules version check.
This meant that a device could not return the rules version
it shipped with.
Another unused (and also confusing) method and
associated test is being deleted here.
To run tests:
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"
Test: See above.
Bug:
31008728
Change-Id: I31b55e88072dd73055cb3d8cf252be6eac920322
TreeHugger Robot [Thu, 22 Jun 2017 20:20:39 +0000 (20:20 +0000)]
Merge "Make default status bar padding 8dp" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 20:19:04 +0000 (20:19 +0000)]
Merge "GnssLocationProvider: listening to conn lost event" into oc-dr1-dev
Android Build Merger (Role) [Thu, 22 Jun 2017 20:16:55 +0000 (20:16 +0000)]
Merge "Merge "Ensure that android.test tests pass" am:
156775fea8 am:
34dc5a58b3 am:
e211119fea" into oc-dr1-dev-plus-aosp
Paul Duffin [Thu, 22 Jun 2017 20:15:27 +0000 (20:15 +0000)]
Merge "Ensure that android.test tests pass" am:
156775fea8 am:
34dc5a58b3
am:
e211119fea
Change-Id: I4692f9a86dae8bb2c5476eb477924230034cdd6b
Android Build Merger (Role) [Thu, 22 Jun 2017 20:14:25 +0000 (20:14 +0000)]
Merge "Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am:
be7657b038 -s ours am:
78def25969 -s ours" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 22 Jun 2017 20:12:59 +0000 (20:12 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am:
be7657b038 -s ours
am:
78def25969 -s ours
Change-Id: I73ca21bc6efe5b8d015e10cf562a0e48c5144b21
Android Build Merger (Role) [Thu, 22 Jun 2017 20:12:37 +0000 (20:12 +0000)]
Merge "Merge "Better merge fix for empty state signal drawable" into oc-dr1-dev am:
8ac5a94c01" into oc-dr1-dev-plus-aosp
Evan Laird [Thu, 22 Jun 2017 20:11:23 +0000 (20:11 +0000)]
Merge "Better merge fix for empty state signal drawable" into oc-dr1-dev
am:
8ac5a94c01
Change-Id: I4ada7c21457a3222274998269d565a9bf03fdc46
Narayan Kamath [Thu, 22 Jun 2017 20:09:25 +0000 (20:09 +0000)]
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am:
31cf02742e
am:
8bc86321ff
Change-Id: Id6edece20054d7725ca206bfa1d6c6b270bcef97
Erik Kline [Thu, 22 Jun 2017 20:02:45 +0000 (20:02 +0000)]
Only disable Wi-Fi IP serving on specific interface, if available am:
c8b180116d -s ours
am:
8fac8d8904 -s ours
Change-Id: Ia09a0a082c7f6e69c33e0426b7e8566fe7c9f3f8
TreeHugger Robot [Thu, 22 Jun 2017 20:00:23 +0000 (20:00 +0000)]
Merge "Better merge fix for empty state signal drawable" into oc-dr1-dev
Wale Ogunwale [Thu, 22 Jun 2017 19:58:40 +0000 (19:58 +0000)]
Merge "Added more systrace points to window manager" into oc-dev
am:
182d5ec2d2
Change-Id: I50d3778a7874656803a38594c0cdb1a5f95be123
Wale Ogunwale [Thu, 22 Jun 2017 19:52:20 +0000 (19:52 +0000)]
Merge "Added more systrace points to window manager" into oc-dev am:
182d5ec2d2
am:
a9c161bc28
Change-Id: I5e0a99a9b56bd0cb649fbd345e8fa0f6d6fe146e
Android Build Merger (Role) [Thu, 22 Jun 2017 19:48:06 +0000 (19:48 +0000)]
Merge "Merge "ConnectivityManager: fix style issue" am:
e74f3adba5 am:
ec54a40339 am:
ec7447b291" into oc-dr1-dev-plus-aosp
Hugo Benichi [Thu, 22 Jun 2017 19:46:28 +0000 (19:46 +0000)]
Merge "ConnectivityManager: fix style issue" am:
e74f3adba5 am:
ec54a40339
am:
ec7447b291
Change-Id: Iecf5399d77ae742cc66ac7a3cab4570464c4e95f
Wale Ogunwale [Thu, 22 Jun 2017 19:45:21 +0000 (19:45 +0000)]
Merge "Added more systrace points to window manager" into oc-dev
am:
182d5ec2d2
Change-Id: I6a1ac4ceee2ba943965382fc5cb7c782249b19a2
Jason Monk [Thu, 22 Jun 2017 19:45:06 +0000 (19:45 +0000)]
Merge "Add API to allow apps more control over instantiation" into oc-dr1-dev
am:
cc9ff706a4
Change-Id: I9852ed8eeeb32aff7150b367c1ba2a6861eddb43
Joel Scherpelz [Thu, 22 Jun 2017 19:38:18 +0000 (19:38 +0000)]
Merge "Use RFC 7217 stable privacy addresses" am:
a88b12ce5e am:
4c4d5477d4
am:
8a4667b911
Change-Id: I60e9d4e630ffb6f6ff6870102d4620c5c4c81c47
Erik Kline [Thu, 22 Jun 2017 19:35:47 +0000 (19:35 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev am:
c0af382a25 -s ours
am:
0ba9285c7d -s ours
Change-Id: Id02582c55ed51dfbe007967a74bcacc1d3b76c42
TreeHugger Robot [Thu, 22 Jun 2017 19:30:40 +0000 (19:30 +0000)]
Merge "Added more systrace points to window manager" into oc-dev
Felipe Leme [Thu, 22 Jun 2017 19:30:32 +0000 (19:30 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev am:
6358cdcd28
am:
95e074dab3
Change-Id: I03fbf818566f8c7601176dfd776edd24c126e27d
TreeHugger Robot [Thu, 22 Jun 2017 19:29:58 +0000 (19:29 +0000)]
Merge "Add API to allow apps more control over instantiation" into oc-dr1-dev
Amith Yamasani [Thu, 22 Jun 2017 19:27:46 +0000 (19:27 +0000)]
Merge "Clarify startScan API on how to get results" into oc-dev am:
78f3a0f722
am:
5d45ac6e68
Change-Id: I9058c3a0140102c324e0c7c8e5ec88f40a3e126a
Chen Xu [Thu, 22 Jun 2017 19:23:19 +0000 (19:23 +0000)]
Merge "resolve merge conflicts of
187fe9d5cf3c to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
fionaxu [Thu, 22 Jun 2017 19:11:02 +0000 (12:11 -0700)]
resolve merge conflicts of
187fe9d5cf3c to oc-dr1-dev-plus-aosp
Change-Id: I2cbfdd9b0fcf024509dbda84678ef067add014f9
Jason Monk [Thu, 22 Jun 2017 19:01:00 +0000 (19:01 +0000)]
Merge "Bring back transparency for QS" into oc-dr1-dev
am:
d037c6ac36
Change-Id: I8313648e66b97401ce81f9188823ddb9488dcb9f
jackqdyulei [Thu, 22 Jun 2017 18:57:52 +0000 (18:57 +0000)]
Merge "Add metric for anomaly action" into oc-dr1-dev
am:
378965aee1
Change-Id: I6c4906702b9b4c7612cd4e75a427d424bfb75853
Robert Carr [Wed, 21 Jun 2017 17:25:05 +0000 (10:25 -0700)]
ListPopupWindow: Wrap new bounds checking in targetSdk check.
While a negative height is pretty silly, crashing apps on
the new version of android makes them sad.
Test: Existing CTS passes.
Bug:
62434804
Change-Id: I5fc3fc50fb6ccfa9e96f38ded4fb8e338f263f09
TreeHugger Robot [Thu, 22 Jun 2017 18:52:45 +0000 (18:52 +0000)]
Merge "Bring back transparency for QS" into oc-dr1-dev
Jason Monk [Thu, 22 Jun 2017 18:51:21 +0000 (18:51 +0000)]
Merge "Add test for StatusBar.dump" into oc-dr1-dev
am:
4448d47ed2
Change-Id: I902114ceacb651690939851b9f2927d0f9bc0eaf
TreeHugger Robot [Thu, 22 Jun 2017 18:46:07 +0000 (18:46 +0000)]
Merge "Add metric for anomaly action" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 18:41:57 +0000 (18:41 +0000)]
Merge "Add test for StatusBar.dump" into oc-dr1-dev
Christopher Ferris [Thu, 22 Jun 2017 18:40:30 +0000 (18:40 +0000)]
Merge "Add a common call when wrapping an app." am:
12e0975963
am:
bb6cf84a40
Change-Id: I5a52a1cdfa5994f3f8c44e367c3a0bdbfba838fd
Christopher Ferris [Thu, 22 Jun 2017 18:32:22 +0000 (18:32 +0000)]
Merge "Add a common call when wrapping an app."
am:
12e0975963
Change-Id: I81830a6d826cd109c99f6e857204f96da9d4a656
Christopher Ferris [Thu, 22 Jun 2017 18:22:07 +0000 (18:22 +0000)]
Merge "Add a common call when wrapping an app."
Evan Laird [Thu, 22 Jun 2017 18:01:31 +0000 (14:01 -0400)]
Better merge fix for empty state signal drawable
The cutout for drawing STATE_EMPTY picked up a fudge factor in the merge
due to the rounded edges changing the size of the triangle. This change
parameterizes the drawing of the cutout based on the placement of the
rounded edges.
Test: visual
Bug:
62905681
Change-Id: Iba2bc0aa240f6bdfb285c2c6535b656bcacbd579
Lucas Dupin [Thu, 22 Jun 2017 18:01:12 +0000 (18:01 +0000)]
Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am:
d0550a9b6c" into oc-dr1-dev
am:
99613f8253
Change-Id: I09f5a5351f9c71be3db9d85405a4244cf0e3ee5d
Jason Monk [Thu, 22 Jun 2017 17:54:16 +0000 (17:54 +0000)]
Merge "Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am:
6791bee744" into oc-dr1-dev
am:
3072655374
Change-Id: I9be0689c6ad9e6c25a1f51c6368e539a841afa0c
Erik Kline [Thu, 22 Jun 2017 17:51:13 +0000 (17:51 +0000)]
Merge "Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am:
be7657b038" into oc-dr1-dev
am:
c4c5b6f806 -s ours
Change-Id: I3564c8dd49349802ede537f3c42c253376fba8b7
Narayan Kamath [Thu, 22 Jun 2017 17:48:32 +0000 (17:48 +0000)]
Merge "Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am:
31cf02742e" into oc-dr1-dev
am:
04bd18fb30
Change-Id: I2cc9faee52a7daedbe13a499f80f4ef36e13d0e8
Jason Monk [Thu, 22 Jun 2017 17:45:32 +0000 (17:45 +0000)]
Merge "Add config to artificially inflate number of bars" into oc-dr1-dev
am:
cfca96d28a
Change-Id: Ib95407d2ea4c81e4b0e7284fe96a9dac0bc36897
Jason Monk [Thu, 22 Jun 2017 17:45:11 +0000 (13:45 -0400)]
Make default status bar padding 8dp
So all the things can be the sames.
Test: visual
Change-Id: I14edd57e09b57ab8c7c06010346b99fada07e46b
Fixes:
38179995
Lucas Dupin [Thu, 22 Jun 2017 17:42:17 +0000 (17:42 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev
am:
d0550a9b6c
Change-Id: I6eb862d98fb45a07ce07894e4afd5e0b33befa5d
Android Build Merger (Role) [Thu, 22 Jun 2017 17:40:42 +0000 (17:40 +0000)]
Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am:
d0550a9b6c" into oc-dr1-dev
Lucas Dupin [Thu, 22 Jun 2017 17:39:24 +0000 (17:39 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev
am:
d0550a9b6c
Change-Id: Ic82b4d1316d5232712a0e395b080262c314ecf68
Android Build Merger (Role) [Thu, 22 Jun 2017 17:38:53 +0000 (17:38 +0000)]
Merge "Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am:
6791bee744" into oc-dr1-dev
Jason Monk [Thu, 22 Jun 2017 17:37:55 +0000 (17:37 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev
am:
6791bee744
Change-Id: I2bd4481438c382c718d51c65fe3941e88c63b2c7
Android Build Merger (Role) [Thu, 22 Jun 2017 17:37:22 +0000 (17:37 +0000)]
Merge "Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am:
be7657b038" into oc-dr1-dev
Erik Kline [Thu, 22 Jun 2017 17:36:51 +0000 (17:36 +0000)]
Merge "resolve merge conflicts of
c8b180116d42 to oc-dr1-dev" into oc-dr1-dev
am:
8839b4c7ba -s ours
Change-Id: Ife953e5775cbccacaeb3a325caa4b496f73f6458
Erik Kline [Thu, 22 Jun 2017 17:36:12 +0000 (17:36 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev
am:
be7657b038
Change-Id: Ie34a3c7aa39c9b70602236f4d4a4d5548566dd51
Android Build Merger (Role) [Thu, 22 Jun 2017 17:35:25 +0000 (17:35 +0000)]
Merge "Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am:
31cf02742e" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 17:34:09 +0000 (17:34 +0000)]
Merge "Add config to artificially inflate number of bars" into oc-dr1-dev
Narayan Kamath [Thu, 22 Jun 2017 17:34:12 +0000 (17:34 +0000)]
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev
am:
31cf02742e
Change-Id: Ie0d68df7a51c10bc82974680bdd16f1eab48e9fa
TreeHugger Robot [Thu, 22 Jun 2017 17:28:26 +0000 (17:28 +0000)]
Merge "resolve merge conflicts of
c8b180116d42 to oc-dr1-dev" into oc-dr1-dev
Wale Ogunwale [Thu, 22 Jun 2017 16:08:14 +0000 (09:08 -0700)]
Added more systrace points to window manager
To help debug performance issues
Test: external/chromium-trace/systrace.py -t 3
Bug:
62796190
Change-Id: Ie6012a895174053c4732fb58b9365546fdb979de
TreeHugger Robot [Thu, 22 Jun 2017 17:25:10 +0000 (17:25 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev
Jason Monk [Tue, 6 Jun 2017 22:01:31 +0000 (18:01 -0400)]
Add API to allow apps more control over instantiation
Let them control construction of standard manifest elements (like
activities) through Application. This will allow for things like
dependency injection and class loader magic.
Test: manual
Bug:
62534409
Change-Id: I5fc2a7ec52bb0e232966704d16f94a192d033267
Merged-In: Iaa2215b225c3b97f4e9ac809dfe499f98c7ad5f1
Lucas Dupin [Thu, 22 Jun 2017 16:59:45 +0000 (16:59 +0000)]
Merge "Darker extracted gradients." into oc-dr1-dev
am:
eaac5e2fe9
Change-Id: I31d11041f6a11558620c1a17bd5a6a8d637394bc
TreeHugger Robot [Thu, 22 Jun 2017 16:54:36 +0000 (16:54 +0000)]
Merge "Darker extracted gradients." into oc-dr1-dev
Jason Monk [Thu, 22 Jun 2017 16:32:05 +0000 (16:32 +0000)]
Merge "Use id directly when extensions change fragments" into oc-dr1-dev
am:
9aa0a8e1f4
Change-Id: I9e05dead59d49213f058e8c0efe17f329f49e1a9
TreeHugger Robot [Thu, 22 Jun 2017 16:25:48 +0000 (16:25 +0000)]
Merge "Use id directly when extensions change fragments" into oc-dr1-dev
Jason Monk [Thu, 22 Jun 2017 15:45:37 +0000 (15:45 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev
am:
6791bee744
Change-Id: If4957d57dd68bbbd459245c35ca8d049504e12bd
Jason Monk [Thu, 22 Jun 2017 15:41:08 +0000 (11:41 -0400)]
Add test for StatusBar.dump
and make it pass
Test: runtest systemui
Change-Id: I26cd913d8df468635b091d5fb3531c975e0ca848
Fixes:
62573356
TreeHugger Robot [Thu, 22 Jun 2017 15:39:22 +0000 (15:39 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev
Jason Monk [Thu, 22 Jun 2017 15:20:04 +0000 (11:20 -0400)]
Add config to artificially inflate number of bars
Test: manual
Bug:
62664881
Change-Id: Id8797f4f6178af16051147d3021bb34074afbca9
Erik Kline [Thu, 22 Jun 2017 15:10:12 +0000 (00:10 +0900)]
resolve merge conflicts of
c8b180116d42 to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Bug:
32163131
Bug:
62343300
Change-Id: I7f86e5f02c8b599aa71babbbb32bf4803cbd9a2f
Merged-In: I542e013aa19fefd3443588c9a81ee59cd669ab6f
Merged-In: I973bdc5b540cce66a9713cebfd5071ad4a4b0a08
Merged-In: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3
Jason Monk [Thu, 22 Jun 2017 15:05:58 +0000 (11:05 -0400)]
Bring back transparency for QS
It was accidentally removed
Test: visual
Change-Id: I569f582d2f81fb3ac8175249857bee507972b9fe
Fixes:
62580741
Paul Duffin [Thu, 22 Jun 2017 14:39:08 +0000 (14:39 +0000)]
Merge "Ensure that android.test tests pass" am:
156775fea8
am:
34dc5a58b3
Change-Id: I546ea542d0781f825e131eb94bc54e22adadfc4e
Paul Duffin [Thu, 22 Jun 2017 14:29:01 +0000 (14:29 +0000)]
Merge "Ensure that android.test tests pass"
am:
156775fea8
Change-Id: I7fe4f45bd98acea016e02b44a4df38f0e907c0e4
Juan Lang [Thu, 22 Jun 2017 14:17:21 +0000 (14:17 +0000)]
Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into oc-dr1-dev
am:
f5d8628779
Change-Id: I7299706fbc31f17fb18a5225be0f6460dd04707e
Treehugger Robot [Thu, 22 Jun 2017 14:17:16 +0000 (14:17 +0000)]
Merge "Ensure that android.test tests pass"