Seigo Nonaka
44a1df2cf3
Keep locale info in Hyphenator.
...
Even if the same data file is used, different hyphenation is applied
based on the locale. Now Hyphenator keeps locale and use it for
hyphenation.
Bug: 65024629
Test: bit CtsTextTestCases:android.text.cts.StaticLayoutTest
Test: bit CtsTextTestCases:android.text.cts.DynamicLayoutTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Change-Id: I7e2ece979181d12ac1adbede14995ec9b7b87d21
2017-09-27 18:54:03 -07:00
TreeHugger Robot
6070e80348
Merge "Take padding information into StaticLayout"
2017-09-28 01:07:01 +00:00
TreeHugger Robot
c18117d446
Merge "Enabling battery manager proto field for incidentd."
2017-09-28 00:58:55 +00:00
Jeff Sharkey
05b9531d73
Merge "Merge "Only construct real Throwable objects." into oc-dev am: 0868533760 am: f0278f30da am: 2c56bb54be" into oc-mr1-dev-plus-aosp
...
am: 9ac9862e16
2017-09-28 00:47:23 +00:00
Jeff Sharkey
d2f7b287fa
Merge "Only construct real Throwable objects." into oc-dev am: 0868533760 am: f0278f30da am: 08415b47b0
...
am: 187b437818
2017-09-28 00:43:24 +00:00
Android Build Merger (Role)
9ac9862e16
Merge "Merge "Only construct real Throwable objects." into oc-dev am: 0868533760 am: f0278f30da am: 2c56bb54be" into oc-mr1-dev-plus-aosp
2017-09-28 00:38:10 +00:00
Jeff Sharkey
222b8bed4f
Merge "Only construct real Throwable objects." into oc-dev am: 0868533760 am: f0278f30da
...
am: 2c56bb54be
2017-09-28 00:35:32 +00:00
Jeff Sharkey
187b437818
Merge "Only construct real Throwable objects." into oc-dev am: 0868533760 am: f0278f30da
...
am: 08415b47b0
2017-09-28 00:35:12 +00:00
Jeff Sharkey
08415b47b0
Merge "Only construct real Throwable objects." into oc-dev am: 0868533760
...
am: f0278f30da
2017-09-28 00:23:50 +00:00
Jeff Sharkey
2c56bb54be
Merge "Only construct real Throwable objects." into oc-dev am: 0868533760
...
am: f0278f30da
2017-09-28 00:23:46 +00:00
Jeff Sharkey
f0278f30da
Merge "Only construct real Throwable objects." into oc-dev
...
am: 0868533760
2017-09-28 00:15:18 +00:00
TreeHugger Robot
0868533760
Merge "Only construct real Throwable objects." into oc-dev
2017-09-28 00:05:42 +00:00
Mathieu Chartier
6985405bd8
Merge "Revert "Revert "Add preopt profile logic for compiling during first boot""" into oc-mr1-dev am: 00579bd49a
...
am: 7fe00cc2e7
2017-09-27 23:00:49 +00:00
Mathieu Chartier
7fe00cc2e7
Merge "Revert "Revert "Add preopt profile logic for compiling during first boot""" into oc-mr1-dev
...
am: 00579bd49a
2017-09-27 22:53:11 +00:00
Roozbeh Pournader
9a9179d48d
Take padding information into StaticLayout
...
This is useful for figuring out if we should adjust width of text
in case the overhangs are more than available padding.
Bug: 63938206
Test: pending
Change-Id: I04592a7cbce264fe133e17e4df0daee626a99d85
2017-09-27 15:52:05 -07:00
Mathieu Chartier
00579bd49a
Merge "Revert "Revert "Add preopt profile logic for compiling during first boot""" into oc-mr1-dev
2017-09-27 22:46:24 +00:00
TreeHugger Robot
353a02a5af
Merge "Adds new utility functions for evaluating log entry matching. Includes matching for both simple and compound matchers."
2017-09-27 22:30:09 +00:00
TreeHugger Robot
420b918e79
Merge "Add "ssid" command to demo mode for easy testing of AP names"
2017-09-27 22:16:33 +00:00
Zhi An Ng
6bd8c7afce
Merge "Show dialog if top app is killed by lmk"
2017-09-27 21:56:35 +00:00
TreeHugger Robot
023c37e7b6
Merge "Apply texture matrix to the layer canvas"
2017-09-27 21:14:06 +00:00
Doris Liu
ef623e606c
Merge "Fix end() for infinite AnimatorSet" into oc-mr1-dev am: aace655509
...
am: 198cde9450
2017-09-27 20:42:12 +00:00
Doris Liu
198cde9450
Merge "Fix end() for infinite AnimatorSet" into oc-mr1-dev
...
am: aace655509
2017-09-27 20:30:45 +00:00
Pulkit Bhuwalka
ca4f4951e6
Merge "Modify Bluetooth Class of Device from Android stack" am: f4ec2ab706 am: c037004fd9 am: 69da7a1766
...
am: 252eebec97
2017-09-27 20:25:33 +00:00
Doris Liu
aace655509
Merge "Fix end() for infinite AnimatorSet" into oc-mr1-dev
2017-09-27 20:23:12 +00:00
Pulkit Bhuwalka
252eebec97
Merge "Modify Bluetooth Class of Device from Android stack" am: f4ec2ab706 am: c037004fd9
...
am: 69da7a1766
2017-09-27 20:18:38 +00:00
TreeHugger Robot
76cf9291ee
Merge "Remove nSetLocales"
2017-09-27 20:18:20 +00:00
Pulkit Bhuwalka
69da7a1766
Merge "Modify Bluetooth Class of Device from Android stack" am: f4ec2ab706
...
am: c037004fd9
2017-09-27 20:12:09 +00:00
Pulkit Bhuwalka
c037004fd9
Merge "Modify Bluetooth Class of Device from Android stack"
...
am: f4ec2ab706
2017-09-27 20:04:32 +00:00
John Reck
bfc7a118fc
Merge "Add nullptr check" into oc-mr1-dev am: b20694ab00
...
am: 5fa85b7e2e
2017-09-27 19:56:58 +00:00
John Reck
5fa85b7e2e
Merge "Add nullptr check" into oc-mr1-dev
...
am: b20694ab00
2017-09-27 19:50:07 +00:00
Winson Chung
ef48ae837f
Merge "Minimal change to ensure that position is last saved when docking." into oc-mr1-dev am: 1ca7d06313
...
am: 4726b4e8dc
2017-09-27 19:50:07 +00:00
John Reck
b20694ab00
Merge "Add nullptr check" into oc-mr1-dev
2017-09-27 19:43:29 +00:00
Treehugger Robot
f4ec2ab706
Merge "Modify Bluetooth Class of Device from Android stack"
2017-09-27 19:43:17 +00:00
Winson Chung
4726b4e8dc
Merge "Minimal change to ensure that position is last saved when docking." into oc-mr1-dev
...
am: 1ca7d06313
2017-09-27 19:41:39 +00:00
Winson Chung
1ca7d06313
Merge "Minimal change to ensure that position is last saved when docking." into oc-mr1-dev
2017-09-27 19:34:45 +00:00
TreeHugger Robot
c014a7f1fb
Merge "Simplifying writeToParcel for various actions"
2017-09-27 19:18:18 +00:00
Kweku Adams
c22b1c4473
Enabling battery manager proto field for incidentd.
...
BUG: 65750806
Test: flash device and check incident proto output
Change-Id: I9ea14a4e8945f1885c68a64213477a1ed70968ad
2017-09-27 12:07:32 -07:00
Stan Iliev
944dbf255a
Apply texture matrix to the layer canvas
...
Fix camera preview shown inverted. Apply texture matrix when
drawing opengl layer.
Test: Ran camera preview in message app and smart lock with face.
Ran CtsUiRenderingTestCases and CtsGraphicsTestCases tests.
Bug: 65534412
Change-Id: I3ed52a6c62921fcdfe30104dd176802ed1533fad
2017-09-27 14:39:07 -04:00
TreeHugger Robot
43ddc05bbd
Merge "AAPT2: Convert binary ResTable_config to proto"
2017-09-27 18:37:39 +00:00
Tony Mantler
490a38bae5
Merge "Make ApplicationsState.Session lifecycle-aware"
2017-09-27 18:22:10 +00:00
Evan Laird
27a9957ae7
Add "ssid" command to demo mode for easy testing of AP names
...
Test: turn on SystemUI demo mode;
adb shell am broadcast -a "com.android.systemui.demo" -e command
network -e wifi show -e ssid DemoWifiName
Bug: (inspired by) 65765440
Change-Id: Ibd13478e44d013ca43e604812fece15f78390932
2017-09-27 14:09:30 -04:00
Fyodor Kupolov
d1d969084b
Merge "Use separate lock in UserController"
2017-09-27 17:39:17 +00:00
David Chen
dd89694f5e
Adds new utility functions for evaluating log entry matching.
...
Includes matching for both simple and compound matchers.
Change-Id: Id913d2625d205ad9a529019e98ae805f730f4d48
Test: Added new unit-tests and checked on marlin device.
2017-09-27 10:24:01 -07:00
Jeffrey Huang
7c7a714be6
Merge "Add new methods to PkgMgrWrapper for testing"
2017-09-27 17:03:15 +00:00
Winson Chung
37b202492e
Minimal change to ensure that position is last saved when docking.
...
- When a task is docked from Recents, the last position is never updated
if the user never touches the divider. Ensure that the default dock
snap target is saved in this case as well.
Bug: 66903645
Test: Dock a task from Recents, go home, and hit recents
Change-Id: Ia229d2ba0eee792424fb9e9c043320cec71695dc
2017-09-27 09:59:28 -07:00
Siyamed Sinir
287d730184
Merge "Refactor imports for text performance tests"
2017-09-27 16:52:51 +00:00
John Reck
3885bf6f04
Add nullptr check
...
Bug: 65717856
Test: builds
Change-Id: I188d3366e956f087c6317ae0b56d5fb19a20708d
2017-09-27 09:30:30 -07:00
Sunny Goyal
5b15392c9a
Simplifying writeToParcel for various actions
...
> Using helper methods when writing and reading typed objects
> Moving the tag write outside the action, as it is read outside
the action as well
> Removing usused tags
Test: am instrument -w -e class android.widget.RemoteViewsTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug: 65574108
Change-Id: Iaf51cae6ef9f82b70dc1f19c2f019af40c4424a2
2017-09-27 08:52:30 -07:00
TreeHugger Robot
de893f3f0a
Merge "use new SkFontMgr API"
2017-09-27 14:39:06 +00:00
Abodunrinwa Toki
7a8e64acf9
Fix crash due to TextView.getText() returning null. am: 8f22de0e7f
...
am: e6a5d22b42
2017-09-27 14:25:28 +00:00
