Felipe Leme
eefedbaf5b
Merge "Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am: 7d29b6f2df am: da31220015 am: d29128d699" into oc-mr1-dev-plus-aosp
...
am: 08a6dde180
2017-08-25 22:35:00 +00:00
Felipe Leme
8c9167565b
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am: 7d29b6f2df am: da31220015
...
am: d29128d699
2017-08-25 22:05:01 +00:00
Felipe Leme
d29128d699
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am: 7d29b6f2df
...
am: da31220015
2017-08-25 21:55:40 +00:00
Felipe Leme
da31220015
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev
...
am: 7d29b6f2df
2017-08-25 21:36:04 +00:00
TreeHugger Robot
7d29b6f2df
Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev
2017-08-25 21:27:56 +00:00
Michael Wright
f9c1757836
Merge "Add new system API for stable display size" into oc-mr1-dev am: c217d744b4
...
am: 9d9693e4af
2017-08-25 21:21:13 +00:00
Michael Wright
9d9693e4af
Merge "Add new system API for stable display size" into oc-mr1-dev
...
am: c217d744b4
2017-08-25 21:02:36 +00:00
TreeHugger Robot
c217d744b4
Merge "Add new system API for stable display size" into oc-mr1-dev
2017-08-25 20:56:57 +00:00
Michael Wright
eedcbf1504
Add new system API for stable display size
...
Fixes: 34388294
Test: manual
Change-Id: Ie380230bbd82370f507161b4cdb6f0d100b09f11
2017-08-25 20:56:00 +00:00
Santos Cordon
46ea857e47
Merge "Allow VR State Listeners with RESTRICTED_VR_ACCESS permission." into oc-mr1-dev am: 0405d12a31
...
am: 49ef0ee289
2017-08-25 20:41:06 +00:00
Santos Cordon
49ef0ee289
Merge "Allow VR State Listeners with RESTRICTED_VR_ACCESS permission." into oc-mr1-dev
...
am: 0405d12a31
2017-08-25 20:18:50 +00:00
TreeHugger Robot
0405d12a31
Merge "Allow VR State Listeners with RESTRICTED_VR_ACCESS permission." into oc-mr1-dev
2017-08-25 20:13:31 +00:00
Felipe Leme
0abc757431
Merge "Minor Autofill javadoc fixes." into oc-dev am: 560221752e am: 948e9ff4d3 am: 017c0192d7
...
am: 8f71607fda
2017-08-25 20:08:37 +00:00
Felipe Leme
8f71607fda
Merge "Minor Autofill javadoc fixes." into oc-dev am: 560221752e am: 948e9ff4d3
...
am: 017c0192d7
2017-08-25 19:56:01 +00:00
Felipe Leme
017c0192d7
Merge "Minor Autofill javadoc fixes." into oc-dev am: 560221752e
...
am: 948e9ff4d3
2017-08-25 19:48:51 +00:00
Felipe Leme
6660644576
Merge "Minor Autofill javadoc fixes." into oc-dev am: 560221752e
...
am: 948e9ff4d3
2017-08-25 19:47:23 +00:00
Alex Klyubin
bb2bd9fb9a
Merge "Delete android.net.PskKeyManager"
2017-08-25 19:44:14 +00:00
Felipe Leme
948e9ff4d3
Merge "Minor Autofill javadoc fixes." into oc-dev
...
am: 560221752e
2017-08-25 19:36:56 +00:00
TreeHugger Robot
560221752e
Merge "Minor Autofill javadoc fixes." into oc-dev
2017-08-25 19:12:22 +00:00
TreeHugger Robot
71a02b2f55
Merge changes I91673d51,I50bc9e06
...
* changes:
Corrected typo in magnification spec crop calculation.
Generate stack override config in AM vs. WM
2017-08-25 19:03:35 +00:00
Wale Ogunwale
f75962a2f0
Generate stack override config in AM vs. WM
...
First step in allowing activity manager to drive the override
configuration of stacks at creation time vs. using what window manager
returns. Also moves us in the direction where callers outside of AM/WM
will eventually be able to drive the window configuration.
Test: bit FrameworksServicesTests:com.android.server.wm.WindowConfigurationTests
Test: adb shell am instrument -w -e package com.android.server.wm com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Test: go/wm-smoke
Change-Id: I50bc9e0634779142c173e501d16e7aa1b71f28ce
2017-08-25 10:01:45 -07:00
Benjamin Franz
afb458f52c
Merge "Refactor all lock task related methods into a new class"
2017-08-25 15:54:02 +00:00
Chavi Weingarten
dad6dea2dd
Merge "Added jni and SurfaceControl methods for native reparentChild"
2017-08-25 15:14:35 +00:00
Benjamin Franz
a83859ffaa
Refactor all lock task related methods into a new class
...
This simplifies the way lock task mode is called by creating a class
that is fully responsible for managing locked tasks. This enables unit
testing and makes it easier to see where individual calls are coming
from. Feeling is that there are some subtle bugs around synchronization
and expectations on the locked task APIs.
Also added unit tests for the new manager class.
Test: bit
FrameworksServicesTests:com.android.server.am.LockTaskManagerTest
Test: go/wm-smoke
Test: cts-tradefed run cts -m DevicePolicyManager --test
com.android.cts.devicepolicy.DeviceOwnerTest#testLockTask_deviceOwnerUser
Bug: 63909481
Change-Id: I3fa8606778fea5a801c21aebeb231db5a6bee47f
2017-08-25 14:54:42 +01:00
John Reck
1d4be040e0
Merge "Avoid setting high contrast in every view draw"
2017-08-25 04:33:31 +00:00
Jesse Hall
beaa76b8ad
Merge "Update FEATURE_VULKAN_HARDWARE_COMPUTE documentation" into oc-mr1-dev am: d1736cb2a7
...
am: b02a9c862a
2017-08-25 02:10:43 +00:00
Jesse Hall
b02a9c862a
Merge "Update FEATURE_VULKAN_HARDWARE_COMPUTE documentation" into oc-mr1-dev
...
am: d1736cb2a7
2017-08-25 01:58:42 +00:00
TreeHugger Robot
d1736cb2a7
Merge "Update FEATURE_VULKAN_HARDWARE_COMPUTE documentation" into oc-mr1-dev
2017-08-25 01:50:38 +00:00
Fyodor Kupolov
cd0e22002b
Merge "Keep close_idle_connections optimization for all devices" into oc-mr1-dev am: f0b56a65f6
...
am: b68c260a73
2017-08-25 00:04:30 +00:00
Fyodor Kupolov
b68c260a73
Merge "Keep close_idle_connections optimization for all devices" into oc-mr1-dev
...
am: f0b56a65f6
2017-08-24 23:46:59 +00:00
Fyodor Kupolov
f0b56a65f6
Merge "Keep close_idle_connections optimization for all devices" into oc-mr1-dev
2017-08-24 23:27:37 +00:00
John Reck
938e884a1f
Avoid setting high contrast in every view draw
...
Test: high contrast text still works
Change-Id: I6674d1aca8dddf7eb9725a5346aed12ef1dbc195
2017-08-24 16:15:58 -07:00
Jack He
1a5e05cf34
Merge "Merge changes from topic "bt-fix-checkstyle-errors" am: 838ab94a0f am: 8ae5462199 am: 24ad4cfc48" into oc-mr1-dev-plus-aosp
...
am: 450c6035b5
2017-08-24 22:41:41 +00:00
Garry Boyer
63431405de
Merge "Remove child package max."
2017-08-24 22:28:15 +00:00
Jack He
bcdfca9030
Merge changes from topic "bt-fix-checkstyle-errors" am: 838ab94a0f am: 8ae5462199
...
am: 24ad4cfc48
2017-08-24 22:10:22 +00:00
Yohei Yukawa
c6f9b06164
Merge "New haptic feedback constants" into oc-mr1-dev am: f3b78305ff
...
am: b737076a4e
2017-08-24 21:57:08 +00:00
Santos Cordon
e6d7723307
Allow VR State Listeners with RESTRICTED_VR_ACCESS permission.
...
Extend the ability to use VrStateListeners to applications that
have RESTRICTED_VR_ACCESS permission. Previously, it required
ACCESS_VR_MANAGER only.
Add VrStateCallback object and methods to VrManager to access the
functionality outside of frameworks.
Bug: 64360244
Test: Manual. Tested ability from VrCore.
Change-Id: I01f1c75b1ccd44a09364df84218168cf6caab322
2017-08-24 21:45:24 +00:00
Jack He
8ae5462199
Merge changes from topic "bt-fix-checkstyle-errors"
...
am: 838ab94a0f
2017-08-24 21:43:08 +00:00
Yohei Yukawa
b737076a4e
Merge "New haptic feedback constants" into oc-mr1-dev
...
am: f3b78305ff
2017-08-24 21:14:36 +00:00
TreeHugger Robot
f3b78305ff
Merge "New haptic feedback constants" into oc-mr1-dev
2017-08-24 21:02:57 +00:00
Andrii Kulian
d48474969e
Merge "Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD" into oc-mr1-dev am: 7ee92d5291
...
am: a64529a989
2017-08-24 20:39:54 +00:00
Siyamed Sinir
5186589eba
Merge changes from topic "siyamed_maxlines" into oc-mr1-dev
...
am: faba49c4d3
2017-08-24 20:39:27 +00:00
Andrii Kulian
a64529a989
Merge "Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD" into oc-mr1-dev
...
am: 7ee92d5291
2017-08-24 20:14:28 +00:00
Etan Cohen
81c76a98f9
Merge "[CS] Allow network factory implementations to re-evaluate requests" into oc-mr1-dev am: 19f12028b7
...
am: 58d610c5c2
2017-08-24 20:10:50 +00:00
Siyamed Sinir
faba49c4d3
Merge changes from topic "siyamed_maxlines" into oc-mr1-dev
...
* changes:
StaticLayout capped height should be 0 when maxLines=0
Reset StaticLayout.mEllipsized during generate()
2017-08-24 19:59:22 +00:00
Andrii Kulian
7ee92d5291
Merge "Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD" into oc-mr1-dev
2017-08-24 19:59:08 +00:00
Etan Cohen
58d610c5c2
Merge "[CS] Allow network factory implementations to re-evaluate requests" into oc-mr1-dev
...
am: 19f12028b7
2017-08-24 19:54:06 +00:00
TreeHugger Robot
19f12028b7
Merge "[CS] Allow network factory implementations to re-evaluate requests" into oc-mr1-dev
2017-08-24 19:29:02 +00:00
Roozbeh Pournader
2be7eff3a4
Merge "Use fallback-based line spacing in TextView etc"
2017-08-24 19:24:06 +00:00
Jack He
2992cd084c
Fix checkstyle errors (2/2)
...
* Manual style corrections with IDE assistance
* Variable name refactors are done through IDE
* Corrected general style errors such as:
- "final private var" -> "private final var"
- "&&", "+", "||" should not be at the end of line
- Non-static private variable should be like "mVar"
- Private static variable should be like "sVar"
- Code file should always end with newline
- Inherited methods should be annotated with @Override
and no @hide tags
- Public methods should always have a JavaDoc entry
- "int[] array" is preferred over "int array[]"
- private methods should be accessed without "this."
when there is no name collisions.
- "boolean ? true : false" -> boolean
- "boolean ? false : true" -> !boolean
- "boolean == true" OR "boolean != false" -> boolean
- "boolean != true" OR "boolean == false" -> !boolean
Bug: 63596319
Test: make checkbuild, no functional changes
Change-Id: Iabdc2be912a32dd63a53213d175cf1bfef268ccd
2017-08-24 19:09:58 +00:00
