TreeHugger Robot
ed82b166e7
Merge "Implement LineBreaker callback and fix indent repeating."
2017-08-31 01:41:01 +00:00
TreeHugger Robot
d65901b5a0
Merge changes I49057737,I68e3096d
...
* changes:
Frameworks: Clean up SystemProperties
Frameworks: Add warning to SystemProperties.get
2017-08-31 01:34:48 +00:00
TreeHugger Robot
c8eb3ecb63
Merge "Screen-pinning unpin security fails for secondary user."
2017-08-31 01:09:02 +00:00
TreeHugger Robot
37acb83e14
Merge "Do not call MediaSizeComp before it is initalized"
2017-08-31 01:03:03 +00:00
TreeHugger Robot
aab40a1516
Merge "Reset update spec after canceled layout"
2017-08-31 00:52:49 +00:00
Daniel Nishi
87a74185da
Merge "Add a photos app filter and a metric for using it."
2017-08-31 00:05:47 +00:00
David Stevens
48945246bb
Merge "Update DisplayContent tap exclude region on window resize"
2017-08-31 00:05:22 +00:00
Abodunrinwa Toki
8a9866298d
Merge "Introduce SmartSelectionEventTracker." into oc-mr1-dev am: 16da1f545c
...
am: f44588afb1
2017-08-30 23:18:13 +00:00
Paul Mclean
6598a033ab
Merge "Adding USB audio-class 2.0 spec descriptors." into oc-mr1-dev am: 87cb6d806e
...
am: ea09d76403
2017-08-30 23:13:35 +00:00
Adam Lesinski
6aeabfe3ba
Merge "BatteryStats: Don't schedule work when shutting down" into oc-mr1-dev am: 4a8f95ba56
...
am: aa8ed4fe2f
2017-08-30 23:07:13 +00:00
Bill Yi
8a4444c8c1
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: d9abde75e8 -s ours
...
am: b3240c2bb0
2017-08-30 22:56:32 +00:00
Abodunrinwa Toki
f44588afb1
Merge "Introduce SmartSelectionEventTracker." into oc-mr1-dev
...
am: 16da1f545c
2017-08-30 22:52:23 +00:00
Paul Mclean
ea09d76403
Merge "Adding USB audio-class 2.0 spec descriptors." into oc-mr1-dev
...
am: 87cb6d806e
2017-08-30 22:41:53 +00:00
Andreas Gampe
2e6b9cb563
Frameworks: Clean up SystemProperties
...
Clean up SystemProperties.java. Add annotations.
Clean up SystemProperties.cpp. Refactor for proper C++11.
Make sure C-string key construction is properly reused. Use
android::base functionality for actual reading.
Fix the test script to refer to the right location. Add some
test coverage.
Test: m
Test: frameworks/base/core/tests/systemproperties/run_core_systemproperties_test.sh --rebuild
Change-Id: I490577370da985f600fb1117e3c818d3f68bad5f
2017-08-30 15:37:27 -07:00
Adam Lesinski
aa8ed4fe2f
Merge "BatteryStats: Don't schedule work when shutting down" into oc-mr1-dev
...
am: 4a8f95ba56
2017-08-30 22:35:40 +00:00
Hall Liu
1076a376c7
Merge "Make slight API and doc adjustments" into oc-mr1-dev am: 1407bdd635 -s ours
...
am: 9e963e77bd
2017-08-30 22:25:01 +00:00
Edward Savage-Jones
47386b12b8
Merge "Merge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff46195e am: f124c72600 am: 99317517cb" into oc-mr1-dev-plus-aosp
...
am: 0583aa8749
2017-08-30 22:18:36 +00:00
TreeHugger Robot
16da1f545c
Merge "Introduce SmartSelectionEventTracker." into oc-mr1-dev
2017-08-30 22:13:58 +00:00
Paul Mclean
87cb6d806e
Merge "Adding USB audio-class 2.0 spec descriptors." into oc-mr1-dev
2017-08-30 22:13:36 +00:00
Bill Yi
14e5e1c43d
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 8ae8079ed6 -s ours
...
am: abde450589
2017-08-30 22:11:55 +00:00
TreeHugger Robot
4a8f95ba56
Merge "BatteryStats: Don't schedule work when shutting down" into oc-mr1-dev
2017-08-30 22:11:52 +00:00
Bill Yi
b3240c2bb0
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: d9abde75e8
2017-08-30 22:11:11 +00:00
TreeHugger Robot
9dd369e0af
Merge "Add statsd."
2017-08-30 22:09:08 +00:00
Hall Liu
9e963e77bd
Merge "Make slight API and doc adjustments" into oc-mr1-dev
...
am: 1407bdd635
2017-08-30 22:00:00 +00:00
Seigo Nonaka
749e57e5c3
Implement LineBreaker callback and fix indent repeating.
...
The last indent should be repeated, so we need to pass an int array
instead of null even if the indent offset is out of array length.
Bug: 65024629
Test: bit CtsTextTestCases:android.text.cts.StaticLayoutTest
Test: bit CtsTextTestCases:android.text.cts.DynamicLayoutTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Bug: 65024629
Change-Id: Ic1274d797db27ae1921135a27bab55e475369710
2017-08-30 14:57:50 -07:00
Bill Yi
7c4f93369b
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 9b9099ef3b -s ours
...
am: dc03550e09
2017-08-30 21:52:08 +00:00
Bill Yi
842b91c727
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: b997ba1131 -s ours
...
am: dd3cefb4ef
2017-08-30 21:45:22 +00:00
Bill Yi
f07acab0e6
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 249c45391e -s ours
...
am: f6667fb429
2017-08-30 21:36:54 +00:00
Android Build Merger (Role)
0583aa8749
Merge "Merge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff46195e am: f124c72600 am: 99317517cb" into oc-mr1-dev-plus-aosp
2017-08-30 21:36:06 +00:00
Edward Savage-Jones
41ef8e42bb
Merge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff46195e am: f124c72600
...
am: 99317517cb
2017-08-30 21:32:34 +00:00
Bill Yi
d4734775cc
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: f5bc976699 -s ours
...
am: 781afa3a89
2017-08-30 21:31:27 +00:00
Bill Yi
abde450589
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 8ae8079ed6
2017-08-30 21:30:37 +00:00
Bill Yi
9e8ea897aa
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 2ec3964ba4 -s ours
...
am: 2e38bfc0e1
2017-08-30 21:26:20 +00:00
Bill Yi
dc03550e09
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 9b9099ef3b
2017-08-30 21:25:10 +00:00
Amith Yamasani
7cbbf222f2
Screen-pinning unpin security fails for secondary user.
...
The setting that inidcates that the user must unlock the device first
to unpin an app is always read for the owner user, so if the owner
disables this it will also be disabled for all secondary users no
matter what they have selected.
Bug: 64235463
Test: Manual
- Enable Screen-pinning for owner
- Uncheck 'Ask for PIN when unpinning'
- Create a secondary user
- Create keyguard PIN
- Enable screen-pinning for secondary user
- Check 'Ask for PIN when unpinning'
- Exit settings and start an app
- Pin the app from recents
- Unpin the app
The keyguard should appear on unpin with this commit applied
This is a cherry-pick of I8b9a98dc50e061b14c091d723223577cd94513ab
Change-Id: I880440b82643915cdb088ef4f4da19ce2db689f6
2017-08-30 14:22:37 -07:00
Bill Yi
dd3cefb4ef
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: b997ba1131
2017-08-30 21:19:16 +00:00
Bill Yi
26353625d6
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 26f4e4dfca -s ours
...
am: 31f2b4bfc7
2017-08-30 21:15:44 +00:00
Bill Yi
f6667fb429
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 249c45391e
2017-08-30 21:14:03 +00:00
Edward Savage-Jones
99317517cb
Merge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff46195e
...
am: f124c72600
2017-08-30 21:10:58 +00:00
Bill Yi
781afa3a89
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: f5bc976699
2017-08-30 21:05:22 +00:00
Edward Savage-Jones
f124c72600
Merge "IllegalArgumentException in MagnificationGestureHandler"
...
am: 7aff46195e
2017-08-30 20:57:27 +00:00
Bill Yi
2e38bfc0e1
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 2ec3964ba4
2017-08-30 20:56:39 +00:00
TreeHugger Robot
d9abde75e8
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-08-30 20:52:19 +00:00
Bill Yi
31f2b4bfc7
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 26f4e4dfca
2017-08-30 20:48:07 +00:00
Hall Liu
1407bdd635
Merge "Make slight API and doc adjustments" into oc-mr1-dev
2017-08-30 20:41:53 +00:00
Treehugger Robot
7aff46195e
Merge "IllegalArgumentException in MagnificationGestureHandler"
2017-08-30 20:40:54 +00:00
TreeHugger Robot
8ae8079ed6
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-08-30 20:35:52 +00:00
Bill Yi
0b30543706
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 1dab2308cd -s ours
...
am: a9a2720fb0
2017-08-30 20:31:57 +00:00
TreeHugger Robot
9b9099ef3b
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-08-30 20:31:03 +00:00
TreeHugger Robot
b997ba1131
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-08-30 20:29:57 +00:00
