Ben Wagner
c2d9470aa9
Remove SkDevice.h includes.
...
SkDevice.h is being removed from Skia. This removes these already unused
includes which mention this file.
Test: refactoring CL. Existing unit tests still pass.
Change-Id: I8340a5822ad2b75c54fe0dca1303ceab9bbee805
2017-01-13 17:03:13 -05:00
Kang Li
96b39666a7
Merge "Adds tests for b/34095835."
2017-01-13 18:15:25 +00:00
Hakan Seyalioglu
8e0a405fad
Merge "Only test the empty state in the right test."
2017-01-13 18:12:45 +00:00
Ashutosh Joshi
24f2a6f939
Merge "Add an uncalibrated acclerometer sensor type."
2017-01-13 17:47:33 +00:00
Kalle Raita
836320ff12
Merge "Add EGL_RECORDABLE_ANDROID enum in EGLExt"
2017-01-13 17:39:09 +00:00
Kang Li
64b018e0eb
Adds tests for b/34095835.
...
Bug: 34095835
Test: reproduced the bug in b/34095835 to ensure that it is covered by
the test. Manually ran the tests.
Change-Id: I28a887341906dc443e1a854ddba51cd1b4daeead
2017-01-13 08:35:13 -08:00
Andrei Stingaceanu
ed76b34c42
Merge "AutoSize TextView (part 6) - introduce autoSizeMaxTextSize"
2017-01-13 14:12:39 +00:00
TreeHugger Robot
61301e9cf5
Merge "Fix bad merge"
2017-01-13 13:28:53 +00:00
Jorim Jaggi
553cec66f7
Fix bad merge
...
Test: Boot device, hope for the best
Change-Id: I0231874a5f4d7cc8b49cc6f978c17c1af6fa93be
Fixes: 34227241
2017-01-13 13:00:42 +01:00
Andrei Stingaceanu
564328b21e
AutoSize TextView (part 6) - introduce autoSizeMaxTextSize
...
Using textSize as maxTextSize for autosizing is buggy and
unclean. Introduce and use new autoSizeMaxTextSize attribute for
TextView.
Also while doing this optimized the auto-size process by removing
unnecessary computations:
1. If auto-size is enabled than setTextSize(...) is no-op.
2. After setting the text size internally and from the auto-size
context onMeasure() will stop doing another round of redundant
measurements..
Bug: 33449596
Bug: 32221168
Test: atttached in the same topic
Change-Id: Ieecaea6df0aebb4c182bdd1114e3c6fc5066bed1
2017-01-13 11:52:00 +00:00
Andrew Scull
a7d1580547
Merge "Save password metrics on non-FBE devices."
2017-01-13 11:49:20 +00:00
TreeHugger Robot
e5bab865b3
Merge "Remove dependence on SkTRegistry"
2017-01-13 11:44:36 +00:00
Michal Karpinski
ab97986977
Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev am: 54b7388163
...
am: 3f0307c050
2017-01-13 09:58:11 +00:00
Michal Karpinski
3c461ee46a
[DPM] Improvements to the network logs batch finalization mechanism am: 4da4a5d0c8
...
am: f27cc410dd
2017-01-13 09:56:58 +00:00
Michal Karpinski
3f0307c050
Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev
...
am: 54b7388163
2017-01-13 09:51:32 +00:00
Michal Karpinski
f27cc410dd
[DPM] Improvements to the network logs batch finalization mechanism
...
am: 4da4a5d0c8
2017-01-13 09:51:27 +00:00
Michal Karpinski
54b7388163
Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev
2017-01-13 09:47:24 +00:00
Winson Chung
27379c0f89
Merge "Ensure that we always resume task overlay activities if requested."
2017-01-13 07:02:51 +00:00
Keisuke Kuroyanagi
846946ec06
Merge "Make selection end handle stick to selection at line end."
2017-01-13 06:39:22 +00:00
Manu Cornet
f67d4498ce
Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev am: 2660111259
...
am: 4c7317373c
2017-01-13 02:42:05 +00:00
Manu Cornet
fcff84c732
DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents am: da5900d0a7
...
am: afd96a08b1
2017-01-13 02:40:56 +00:00
Manu Cornet
4c7317373c
Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev
...
am: 2660111259
2017-01-13 02:36:06 +00:00
Manu Cornet
afd96a08b1
DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents
...
am: da5900d0a7
2017-01-13 02:36:02 +00:00
TreeHugger Robot
2660111259
Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev
2017-01-13 02:31:13 +00:00
Eugene Susla
c1facb81e0
Merge "Only send cache event if cache is detected to be used"
2017-01-13 02:26:38 +00:00
Bo Hu
82b0bcceba
Merge "Emulator: remove hardcoded isEmulator() logic in ImageWallpaper"
2017-01-13 02:16:26 +00:00
Roozbeh Pournader
383ac409df
Merge "Treat Latin American locales specially"
2017-01-13 01:53:15 +00:00
Winson Chung
cbcadc981b
Ensure that we always resume task overlay activities if requested.
...
- Distinguish between task overlays that need to be resumed and
those that should not.
Bug: 34240533
Test: Open PiP, tap to show menu.
Change-Id: Ibdb54d544c501a492260f02cdc2de40c5c1a66d1
2017-01-12 17:23:18 -08:00
Hakan Seyalioglu
79b69f06d2
Only test the empty state in the right test.
...
Test: Ran the test
Change-Id: I03908540d85830dd1165f1672fe49716df55d7a0
2017-01-12 17:15:24 -08:00
Manu Cornet
da5900d0a7
DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents
...
Bug: 32101881
Test: Checked the effect on app -> recents transition on local sw600dp device
Change-Id: Ic3e3af6e8db4a62028e1283e915a7cd12db49607
2017-01-13 01:05:17 +00:00
TreeHugger Robot
423f949594
Merge "Add logging constants for Settings search screen"
2017-01-13 00:51:22 +00:00
Manu Cornet
7eac56c726
Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev am: 5ee87b5b6a
...
am: ae5df0544a
2017-01-13 00:36:25 +00:00
Manu Cornet
a4e29361b6
2D Recents: Use a different task dismiss animation am: 5df7667edb
...
am: bc6bdb3ef8
2017-01-13 00:35:10 +00:00
Manu Cornet
ae5df0544a
Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev
...
am: 5ee87b5b6a
2017-01-13 00:28:26 +00:00
Manu Cornet
bc6bdb3ef8
2D Recents: Use a different task dismiss animation
...
am: 5df7667edb
2017-01-13 00:28:19 +00:00
Manu Cornet
5ee87b5b6a
Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev
2017-01-13 00:23:48 +00:00
Ashutosh Joshi
8fa60ce20e
Merge "Add a callback handler for nanoApp aborts."
2017-01-12 23:50:06 +00:00
Ta-wei Yen
a5a2e6d1b1
Merge "Add getNetworkSpecifier() and getCarrierConfig()"
2017-01-12 23:48:06 +00:00
Android Build Merger (Role)
96a3d9c7ca
Merge "Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375 am: 503d8fbb26 am: 907585c004"
2017-01-12 23:26:39 +00:00
TreeHugger Robot
fac595ae56
Merge "Add activity action for Configure Wi-Fi settings."
2017-01-12 23:25:50 +00:00
Robert Greenwalt
f299153487
Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375 am: 503d8fbb26
...
am: 907585c004
2017-01-12 23:25:36 +00:00
Robert Greenwalt
907585c004
Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375
...
am: 503d8fbb26
2017-01-12 23:20:45 +00:00
Robert Greenwalt
503d8fbb26
Merge "Add support for FDN contact dial" am: 082b118641
...
am: 24dea10375
2017-01-12 23:16:20 +00:00
Todd Kennedy
244a63a2d3
Merge "Allow starting ephemeral apps from 'am'"
2017-01-12 23:14:02 +00:00
Robert Greenwalt
24dea10375
Merge "Add support for FDN contact dial"
...
am: 082b118641
2017-01-12 23:12:23 +00:00
Robert Greenwalt
082b118641
Merge "Add support for FDN contact dial"
2017-01-12 23:07:00 +00:00
Ta-wei Yen
cc68f0409a
Add getNetworkSpecifier() and getCarrierConfig()
...
cherry-pick of https://android-review.googlesource.com/#/c/318111/
This allows making network request and getting carrier config on a
specfic SIM.
Bug: 32414216
Test: cts-tradefed run cts-dev --module CtsTelephonyTestCases
Change-Id: Iebe2d883e193afdde13303d76014dfd7f4fb06dd
Merged-In: Iebe2d883e193afdde13303d76014dfd7f4fb06dd
# Conflicts:
# telephony/java/android/telephony/TelephonyManager.java
2017-01-12 23:02:29 +00:00
Todd Kennedy
54b8e5deae
Merge "Turn off caching temporarily until we can address some of the issues."
2017-01-12 22:57:56 +00:00
Todd Kennedy
20274d15d8
Turn off caching temporarily until we can address some of the issues.
...
Revert "PackageManagerService: Enable package parse cache."
This reverts commit 6453db68ca
2017-01-12 22:56:44 +00:00
TreeHugger Robot
07323a9824
Merge "Add structured sort data to ContentResolver.query."
2017-01-12 22:21:53 +00:00
