git.osdn.net Git - android-x86/frameworks-base.git/log

Kevin Tang [Thu, 22 Jun 2017 20:56:29 +0000 (20:56 +0000)]

Merge "Merge "GnssLocationProvider: listening to conn lost event" into oc-dr1-dev am: 9564b4d168" into oc-dr1-dev-plus-aosp
am: 7904864fa5

Change-Id: I19f7da4ae70e4d9fd4a2de79d18020e70fb5fe7d

commit | commitdiff | tree

Jason Monk [Thu, 22 Jun 2017 20:53:11 +0000 (20:53 +0000)]

Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am: 6791bee744 am: 9980bade09
am: ce3775bbf7

Change-Id: I763b909dd371450f50ebe03bb20655bad23793da

commit | commitdiff | tree

Paul Duffin [Thu, 22 Jun 2017 20:50:34 +0000 (20:50 +0000)]

Merge "Merge "Ensure that android.test tests pass" am: 156775fea8 am: 34dc5a58b3 am: e211119fea" into oc-dr1-dev-plus-aosp
am: 989b7db027

Change-Id: I1e3bcb0b3607464ab2267c14ff2e8dcd96a19f56

commit | commitdiff | tree

Erik Kline [Thu, 22 Jun 2017 20:47:45 +0000 (20:47 +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
am: 61f8509891 -s ours

Change-Id: I83caf660ba34cc6abeadac44272b76638f92c29a

commit | commitdiff | tree

Evan Laird [Thu, 22 Jun 2017 20:42:20 +0000 (20:42 +0000)]

Merge "Merge "Better merge fix for empty state signal drawable" into oc-dr1-dev am: 8ac5a94c01" into oc-dr1-dev-plus-aosp
am: 6085cae23f

Change-Id: Iad86c9239ba5fd9b764063c15ae7a7a716746822

commit | commitdiff | tree

Narayan Kamath [Thu, 22 Jun 2017 20:37:25 +0000 (20:37 +0000)]

Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am: 31cf02742e am: 8bc86321ff
am: 4a4cd884ad

Change-Id: I1dfd4d89fcb54491706661d28145f5450e804463

commit | commitdiff | tree

Erik Kline [Thu, 22 Jun 2017 20:34:08 +0000 (20:34 +0000)]

Only disable Wi-Fi IP serving on specific interface, if available am: c8b180116d -s ours am: 8fac8d8904 -s ours
am: 501333f1e4 -s ours

Change-Id: I4735f4b99c6d9f4485c49c7f6abf7e002f68fa47

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Wale Ogunwale [Thu, 22 Jun 2017 20:28:12 +0000 (20:28 +0000)]

Merge "Added more systrace points to window manager" into oc-dev am: 182d5ec2d2 am: a9c161bc28
am: f3800287c7

Change-Id: I931b244ead0c1a11f0678ccebbbb8ab01a196642

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Jun 2017 20:19:04 +0000 (20:19 +0000)]

Merge "GnssLocationProvider: listening to conn lost event" into oc-dr1-dev

commit | commitdiff | tree

Hugo Benichi [Thu, 22 Jun 2017 20:17:58 +0000 (20:17 +0000)]

Merge "Merge "ConnectivityManager: fix style issue" am: e74f3adba5 am: ec54a40339 am: ec7447b291" into oc-dr1-dev-plus-aosp
am: 83ae6653ca

Change-Id: I959b2aa411868bdc4c3256dc5a2025bc84692726

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jason Monk [Thu, 22 Jun 2017 20:15:05 +0000 (20:15 +0000)]

Merge "Add API to allow apps more control over instantiation" into oc-dr1-dev am: cc9ff706a4
am: 2693dd810d -s ours

Change-Id: Ife8dead124a9bf9271bd1713ce23f7af1e6cbb0b

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Joel Scherpelz [Thu, 22 Jun 2017 19:55:02 +0000 (19:55 +0000)]

Merge "Use RFC 7217 stable privacy addresses" am: a88b12ce5e am: 4c4d5477d4 am: 8a4667b911
am: 7019b5aa81

Change-Id: I03ddd946247bc9d3b321be4eedf225ad4209e6d4

commit | commitdiff | tree

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

commit | commitdiff | tree

Erik Kline [Thu, 22 Jun 2017 19:51:33 +0000 (19:51 +0000)]

Merge "Refactor TISM add/remove code" into oc-dev am: c0af382a25 -s ours am: 0ba9285c7d -s ours
am: d25743346a -s ours

Change-Id: I1e5172b24c7c444f33b473ddb7a63101a7ff3547

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Felipe Leme [Thu, 22 Jun 2017 19:40:47 +0000 (19:40 +0000)]

Merge "Autofill fixes for secondary users:" into oc-dev am: 6358cdcd28 am: 95e074dab3
am: 1e48839f03

Change-Id: Ibad5c3cd8e1c36923e36655fe191c50a7c603b9b

commit | commitdiff | tree

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

commit | commitdiff | tree

Amith Yamasani [Thu, 22 Jun 2017 19:37:58 +0000 (19:37 +0000)]

Merge "Clarify startScan API on how to get results" into oc-dev am: 78f3a0f722 am: 5d45ac6e68
am: 88f31c5625

Change-Id: Ica775d806f47d1cce21a65c0b49db1a51c04be46

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Jun 2017 19:30:40 +0000 (19:30 +0000)]

Merge "Added more systrace points to window manager" into oc-dev

commit | commitdiff | tree

Chen Xu [Thu, 22 Jun 2017 19:30:44 +0000 (19:30 +0000)]

Merge "resolve merge conflicts of 187fe9d5cf3c to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
am: 595ff996dd -s ours

Change-Id: Icd656b92302aa8771fededcaab9f6388dedc09f8

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jason Monk [Thu, 22 Jun 2017 19:13:44 +0000 (19:13 +0000)]

Merge "Bring back transparency for QS" into oc-dr1-dev am: d037c6ac36
am: a31688b8cb

Change-Id: I0dd0cd775568bbcbf4f09a2528c707b992eed735

commit | commitdiff | tree

jackqdyulei [Thu, 22 Jun 2017 19:07:08 +0000 (19:07 +0000)]

Merge "Add metric for anomaly action" into oc-dr1-dev am: 378965aee1
am: 4ba0f3ef07

Change-Id: I1606aec1a193ccfed5c1a7f0946c12d7e101f43d

commit | commitdiff | tree

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

commit | commitdiff | tree

Jason Monk [Thu, 22 Jun 2017 18:59:18 +0000 (18:59 +0000)]

Merge "Add test for StatusBar.dump" into oc-dr1-dev am: 4448d47ed2
am: d7d1189826

Change-Id: I5a58420a7bca1758ea3b98896bae8ab95ec02f61

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Jun 2017 18:52:45 +0000 (18:52 +0000)]

Merge "Bring back transparency for QS" into oc-dr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Jun 2017 18:46:07 +0000 (18:46 +0000)]

Merge "Add metric for anomaly action" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Jun 2017 18:41:57 +0000 (18:41 +0000)]

Merge "Add test for StatusBar.dump" into oc-dr1-dev

commit | commitdiff | tree

Lucas Dupin [Thu, 22 Jun 2017 18:18:04 +0000 (18:18 +0000)]

Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am: d0550a9b6c" into oc-dr1-dev am: 99613f8253
am: de1008b580

Change-Id: I311cda385ad3662c8c4298b290a4367d39fc0836

commit | commitdiff | tree

Jason Monk [Thu, 22 Jun 2017 18:14:28 +0000 (18:14 +0000)]

Merge "Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am: 6791bee744" into oc-dr1-dev am: 3072655374
am: ff36065f1c

Change-Id: I50e6f1b614558d215dea79c0bfa526d9ffbe9e9a

commit | commitdiff | tree

Erik Kline [Thu, 22 Jun 2017 18:10:47 +0000 (18:10 +0000)]

Merge "Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am: be7657b038" into oc-dr1-dev am: c4c5b6f806 -s ours
am: e9154b5ec2 -s ours

Change-Id: Ie2b2667a0b3f8841b3f3879fc17a55a63c14d6e2

commit | commitdiff | tree

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

commit | commitdiff | tree

Narayan Kamath [Thu, 22 Jun 2017 18:04:24 +0000 (18:04 +0000)]

Merge "Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am: 31cf02742e" into oc-dr1-dev am: 04bd18fb30
am: 6da2b86237

Change-Id: I434678eb093574d96d356e90bcc8fdb5825f62a9

commit | commitdiff | tree

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

commit | commitdiff | tree

Jason Monk [Thu, 22 Jun 2017 18:00:24 +0000 (18:00 +0000)]

Merge "Add config to artificially inflate number of bars" into oc-dr1-dev am: cfca96d28a
am: 17efbe25f8

Change-Id: I4304f12d3e6dc0b4091cd1fa4381f1f574c07c6c

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Erik Kline [Thu, 22 Jun 2017 17:49:51 +0000 (17:49 +0000)]

Merge "resolve merge conflicts of c8b180116d42 to oc-dr1-dev" into oc-dr1-dev am: 8839b4c7ba -s ours
am: 173dddb9e0 -s ours

Change-Id: I53ae6be474faa2b80060b56601b043d592d8b9ba

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Jun 2017 17:44:33 +0000 (17:44 +0000)]

Merge "Flush out existing sessions when the Autofill service is changed."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Jun 2017 17:25:10 +0000 (17:25 +0000)]

Merge "Ensure icon contrast on the shelf" into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Lucas Dupin [Thu, 22 Jun 2017 17:07:40 +0000 (17:07 +0000)]

Merge "Darker extracted gradients." into oc-dr1-dev am: eaac5e2fe9
am: df6048a1b6

Change-Id: I4553cc8cd5991756e96451b417a128f7b61f041f

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Jun 2017 16:57:25 +0000 (16:57 +0000)]

Merge "Add API to allow apps more control over instantiation"

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Jun 2017 16:54:36 +0000 (16:54 +0000)]

Merge "Darker extracted gradients." into oc-dr1-dev

commit | commitdiff | tree

Jason Monk [Thu, 22 Jun 2017 16:40:08 +0000 (16:40 +0000)]

Merge "Use id directly when extensions change fragments" into oc-dr1-dev am: 9aa0a8e1f4
am: 1865441acf

Change-Id: I2d6446eac0d36c32a4effa7111488b261f658a67

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Fyodor Kupolov [Thu, 22 Jun 2017 15:47:58 +0000 (15:47 +0000)]

Merge "Purge user data on ACTION_USER_REMOVED"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Jun 2017 15:39:22 +0000 (15:39 +0000)]

Merge "Fix ConcurrentModificationException from LocationController" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Jun 2017 15:37:44 +0000 (15:37 +0000)]

Merge "Pass all locale information down to Minikin"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Juan Lang [Thu, 22 Jun 2017 14:35:41 +0000 (14:35 +0000)]

Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into oc-dr1-dev am: f5d8628779
am: 1911226ba2 -s ours

Change-Id: I347d9a78fd5cc00b9f47b2331b7ecb750c38eeda

commit | commitdiff | tree

Erik Kline [Thu, 22 Jun 2017 14:32:55 +0000 (14:32 +0000)]

Merge "Refactor TISM add/remove code" into oc-dev am: c0af382a25 -s ours am: caafb1fbe3 -s ours
am: 09bd349962 -s ours

Change-Id: I3796c1f776101e6d2d236a13a2375a19bd7df158

commit | commitdiff | tree

Felipe Leme [Thu, 22 Jun 2017 14:30:10 +0000 (14:30 +0000)]

Merge "Autofill fixes for secondary users:" into oc-dev am: 6358cdcd28 am: 17911ae02b
am: e7e3f0657b

Change-Id: I7792d514d44ebece52bf06f319a54181801afb29

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 22 Jun 2017 14:23:01 +0000 (14:23 +0000)]

Merge "Merge "Merge "Clarify startScan API on how to get results" into oc-dev am: 78f3a0f722 am: ef863368b4" into oc-dr1-dev-plus-aosp am: e8ac390ae3"

commit | commitdiff | tree

Amith Yamasani [Thu, 22 Jun 2017 14:21:16 +0000 (14:21 +0000)]

Merge "Merge "Clarify startScan API on how to get results" into oc-dev am: 78f3a0f722 am: ef863368b4" into oc-dr1-dev-plus-aosp
am: e8ac390ae3

Change-Id: Id29bcd5ba1c41f724934232000f9acae96f722ca

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 22 Jun 2017 14:20:39 +0000 (14:20 +0000)]

Merge "Merge "Merge "Provide content description for WorkLockActivity." into oc-dev am: f044e0b87f am: fcc7a55558" into oc-dr1-dev-plus-aosp am: eec4ffbee6"