Salvador Martinez
c27e9befea
Merge "Update action bar dark theme style" into qt-dev am: 6527a2e48a
...
am: 7decb848f1
2019-04-05 17:25:03 -07:00
Rob Carr
ef76898c14
Merge "SurfaceFlinger: Add exclusion list for captureLayers." into qt-dev am: f6bd0bc297
...
am: e7139682af
2019-04-05 16:53:41 -07:00
Evan Rosky
7d575beaea
Merge "Fix metadata surfacecontrol api/jni" into qt-dev am: 96aaa9f237
...
am: cba56aca14
2019-04-05 16:47:16 -07:00
Amin Shaikh
bd38503a8f
Merge "Format all IconPack overlay resources." into qt-dev am: 2a621c079c
...
am: 4fb7420802
2019-04-05 16:41:57 -07:00
Nader Jawad
4ab6b7b6b4
Merge "Fix LaTeX formatting in Android documentation"
2019-04-05 23:27:05 +00:00
Nick Kralevich
886a5c7a49
Merge "Don't set sehash when calling restoreconRecursive" into qt-dev am: 4ef3e8a309
...
am: 83c282af83
2019-04-05 16:18:44 -07:00
Philip P. Moltmann
84595ce8cf
Merge "Remove Gallery and Music role" into qt-dev am: ddb9bb211c
...
am: d717015856
2019-04-05 16:08:17 -07:00
Tony Mak
89f4c8027b
Merge "Add getTextClassifier perf test" into qt-dev am: 08f5841707
...
am: d28876a3b5
2019-04-05 16:03:01 -07:00
John Reck
c2168e8d56
Merge "Fix lifecycle issue in CommonPool" into qt-dev am: 562888399c
...
am: 881dc1bc2a
2019-04-05 15:58:00 -07:00
Robert Carr
53a8ebbf89
Merge "Ensure getParentSurfaceControl and getSurfaceControl return valid or null SC" into qt-dev am: ce3cd94e44
...
am: dbf956b62c
2019-04-05 15:53:02 -07:00
Priyank Singh
e44a03dd67
Merge "Adding a level of indirection. Dimens value should live in the framework/base and not the overlay." into qt-dev am: 1bd2e9b5d6
...
am: ec00411262
2019-04-05 15:47:34 -07:00
Joshua Mccloskey
8b4845f913
Merge "Adding debug value to Biometric atoms."
2019-04-05 21:48:08 +00:00
Salvador Martinez
7decb848f1
Merge "Update action bar dark theme style" into qt-dev
...
am: 6527a2e48a
2019-04-05 14:02:02 -07:00
Nader Jawad
39055b05e0
Fix LaTeX formatting in Android documentation
...
Added missing usesMathJax tag within Javadoc for
each BlendMode enum value. This should ensure that the
blending formulas are rendered properly in the android documentation
Test: N/A
Bug: 130041190
Change-Id: I6c6dcc1804d8399468191bf758bf6cc7685918b5
2019-04-05 13:55:26 -07:00
Rob Carr
e7139682af
Merge "SurfaceFlinger: Add exclusion list for captureLayers." into qt-dev
...
am: f6bd0bc297
2019-04-05 13:53:50 -07:00
Evan Rosky
cba56aca14
Merge "Fix metadata surfacecontrol api/jni" into qt-dev
...
am: 96aaa9f237
2019-04-05 13:45:49 -07:00
Android Build Merger (Role)
08199d20c7
Merge "Merge "Support profileable application action" into qt-dev am: 7cefe09ec7 am: dca6b7746e"
2019-04-05 20:43:17 +00:00
Chris Craik
6c463d2475
Merge "Support profileable application action" into qt-dev am: 7cefe09ec7
...
am: dca6b7746e
2019-04-05 13:42:25 -07:00
Amin Shaikh
4fb7420802
Merge "Format all IconPack overlay resources." into qt-dev
...
am: 2a621c079c
2019-04-05 13:40:26 -07:00
TreeHugger Robot
cce0f72580
Merge "Fix missing call to requestTransparentRegion()"
2019-04-05 20:39:42 +00:00
Chong Zhang
3784243414
Merge "make libmedia_jni_utils depends on libgui" into qt-dev am: d937a7916f
...
am: 8b25efda04
2019-04-05 13:36:11 -07:00
Nick Kralevich
83c282af83
Merge "Don't set sehash when calling restoreconRecursive" into qt-dev
...
am: 4ef3e8a309
2019-04-05 13:32:36 -07:00
David Su
7b15d7daf8
Merge "wifi.proto: Add link probe event to StaEvent" into qt-dev am: a3ef6c2d1f
...
am: b7b706d460
2019-04-05 13:29:49 -07:00
Philip P. Moltmann
d717015856
Merge "Remove Gallery and Music role" into qt-dev
...
am: ddb9bb211c
2019-04-05 13:22:43 -07:00
Tim Murray
359cb3ed1f
Merge "zygote: initialize ashmem early" into qt-dev am: ce3a694103
...
am: e21b748b2e
2019-04-05 13:22:38 -07:00
Chavi Weingarten
91ae702142
Merge "Only switch task focus to window's task that was tapped outside current focus" into qt-dev am: da8ecc5154
...
am: bb75959f52
2019-04-05 13:17:24 -07:00
Leon Scroggins
dc2557334a
Merge "Remove redundant calls to invalidateParentIfNeeded"
2019-04-05 20:04:02 +00:00
Evan Laird
f9e6ed2996
Merge "Re-enable NonPhoneDependencyTest"
2019-04-05 20:01:36 +00:00
joshmccloskey
7d7cad2289
Adding debug value to Biometric atoms.
...
Bug: 129438832
Test: It builds
Change-Id: I86e3a39f0bd1ac0986a350611657a34b512e0aef
2019-04-05 19:44:40 +00:00
Tony Mak
d28876a3b5
Merge "Add getTextClassifier perf test" into qt-dev
...
am: 08f5841707
2019-04-05 12:30:12 -07:00
John Reck
881dc1bc2a
Merge "Fix lifecycle issue in CommonPool" into qt-dev
...
am: 562888399c
2019-04-05 12:23:56 -07:00
Robert Carr
dbf956b62c
Merge "Ensure getParentSurfaceControl and getSurfaceControl return valid or null SC" into qt-dev
...
am: ce3cd94e44
2019-04-05 12:18:10 -07:00
Priyank Singh
ec00411262
Merge "Adding a level of indirection. Dimens value should live in the framework/base and not the overlay." into qt-dev
...
am: 1bd2e9b5d6
2019-04-05 12:09:35 -07:00
Android Build Merger (Role)
4ca4678c76
Merge "Merge "EGLAttrib requires special handling in JNI" into qt-dev am: 44e30f9a0d am: 1b53374b88"
2019-04-05 18:55:59 +00:00
Courtney Goeltzenleuchter
8b7298c890
Merge "EGLAttrib requires special handling in JNI" into qt-dev am: 44e30f9a0d
...
am: 1b53374b88
2019-04-05 11:55:02 -07:00
Chris Craik
dca6b7746e
Merge "Support profileable application action" into qt-dev
...
am: 7cefe09ec7
2019-04-05 11:50:55 -07:00
TreeHugger Robot
6527a2e48a
Merge "Update action bar dark theme style" into qt-dev
2019-04-05 18:50:23 +00:00
Android Build Merger (Role)
90231826ed
Merge changes from topic "am-210e5cc30e434357bd552419de9c31d2"
...
* changes:
Merge "fix AudioAttributes matching rule in AudioProductStrategy" into qt-dev am: 960c4f06aed91287e09af83192de79162ac3ad85
2019-04-05 18:49:12 +00:00
Eric Laurent
03bdec953b
Merge "fix AudioAttributes matching rule in AudioProductStrategy" into qt-dev am: 960c4f06ae
...
am: d91287e09a
2019-04-05 11:48:08 -07:00
Rob Carr
f6bd0bc297
Merge "SurfaceFlinger: Add exclusion list for captureLayers." into qt-dev
2019-04-05 18:47:40 +00:00
Chong Zhang
8b25efda04
Merge "make libmedia_jni_utils depends on libgui" into qt-dev
...
am: d937a7916f
2019-04-05 11:42:37 -07:00
Eric Laurent
9ac445935b
Merge "Revert "Revert "Mute haptic channels by default.""" into qt-dev am: f83192de79
...
am: 162ac3ad85
2019-04-05 11:40:58 -07:00
William Hester
eb6908df5e
Merge "Disable lock screen and enable location in THM"
2019-04-05 18:39:02 +00:00
William Hester
fd0230bffc
Disable lock screen and enable location in THM
...
In Test Harness Mode, the lock screen will be disabled so that tests can
start immediately, and location will be enabled (for use with CTS).
Bug: 80137798
Test: make, adb shell cmd testharness enable
Change-Id: I08f4c06865013d2cbdf7e95cf12fdf469c30b9e7
2019-04-05 18:38:07 +00:00
David Su
b7b706d460
Merge "wifi.proto: Add link probe event to StaEvent" into qt-dev
...
am: a3ef6c2d1f
2019-04-05 11:35:55 -07:00
Tony Mak
67afc2cd93
Merge "Merge "Flag to configure model parameters" into qt-dev am: 3b74731f4e" into qt-dev-plus-aosp
...
am: 0ca098c3ab
2019-04-05 11:35:42 -07:00
TreeHugger Robot
96aaa9f237
Merge "Fix metadata surfacecontrol api/jni" into qt-dev
2019-04-05 18:33:24 +00:00
Tim Murray
e21b748b2e
Merge "zygote: initialize ashmem early" into qt-dev
...
am: ce3a694103
2019-04-05 11:29:01 -07:00
Chavi Weingarten
bb75959f52
Merge "Only switch task focus to window's task that was tapped outside current focus" into qt-dev
...
am: da8ecc5154
2019-04-05 11:23:48 -07:00
TreeHugger Robot
2a621c079c
Merge "Format all IconPack overlay resources." into qt-dev
2019-04-05 18:22:25 +00:00
