OSDN Git Service
Daniel Nishi [Tue, 2 May 2017 17:09:51 +0000 (17:09 +0000)]
Merge "Don't crash during app uninstall." into oc-dev
am:
661b6badef
Change-Id: Iceab4bdd88e348c4bd4019ee1fb6c7c8b3f5baf1
Daniel Nishi [Tue, 2 May 2017 17:03:51 +0000 (17:03 +0000)]
Merge "Don't crash during app uninstall." into oc-dev
Abodunrinwa Toki [Tue, 2 May 2017 16:31:50 +0000 (16:31 +0000)]
Merge "Add "Paste as plain text" in TextView's toolbar." into oc-dev
am:
0fe5a2d5b3
Change-Id: I72d5fdd4351860bc02289abde6b1c36e13407e69
TreeHugger Robot [Tue, 2 May 2017 16:21:10 +0000 (16:21 +0000)]
Merge "Add "Paste as plain text" in TextView's toolbar." into oc-dev
Android Build Merger (Role) [Tue, 2 May 2017 16:10:47 +0000 (16:10 +0000)]
Merge "Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 -s ours" into oc-dev am:
550e1c9a6b" into oc-dev-plus-aosp
Erik Wolsheimer [Tue, 2 May 2017 16:10:00 +0000 (16:10 +0000)]
Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 -s ours" into oc-dev
am:
550e1c9a6b
Change-Id: Ie3ec9c7b8aee293f79cccde97b197c8c77d63281
Android Build Merger (Role) [Tue, 2 May 2017 16:09:21 +0000 (16:09 +0000)]
Merge "Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev am:
9967a4d3af" into oc-dev-plus-aosp
Erik Wolsheimer [Tue, 2 May 2017 16:07:10 +0000 (16:07 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286
am:
ab4617dd92 -s ours
Change-Id: I4d65ed8df4f31b6e7aff05a554207a6a3d093614
Jiwen Cai [Tue, 2 May 2017 16:04:26 +0000 (16:04 +0000)]
Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev
am:
9967a4d3af
Change-Id: If2ec26782f82e0f22deb7d952b79436e30a91867
Android Build Merger (Role) [Tue, 2 May 2017 16:00:52 +0000 (16:00 +0000)]
Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759 am:
a399705286 -s ours" into oc-dev
Erik Wolsheimer [Tue, 2 May 2017 15:59:55 +0000 (15:59 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759
am:
a399705286
Change-Id: I31b67a7bb496051a9062d4770a96119251a1b434
Erik Wolsheimer [Tue, 2 May 2017 15:59:43 +0000 (15:59 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am:
a686345759
am:
a399705286 -s ours
Change-Id: I654fc19afef7f11d894590d287cde3650b8252af
Jiwen Cai [Tue, 2 May 2017 15:59:21 +0000 (15:59 +0000)]
Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev
The Android Open Source Project [Tue, 2 May 2017 15:56:20 +0000 (15:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7f43068aa5 -s ours
Change-Id: Ib3bf970248fec4410e2a4de47825c511b34fff6e
Erik Wolsheimer [Tue, 2 May 2017 15:54:40 +0000 (15:54 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s
am:
a686345759
Change-Id: I0598c6210dbf0d0447c31112419a2fee829037be
The Android Open Source Project [Tue, 2 May 2017 15:54:35 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
71ffd8bc87 -s ours
Change-Id: Iff4a81cc730f7d35d95da27937df2d171b3379d9
TreeHugger Robot [Tue, 2 May 2017 15:49:24 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Vladislav Kaznacheev [Tue, 2 May 2017 15:48:11 +0000 (15:48 +0000)]
Merge "Fix submenu position when showing with Gravity.END" into oc-dev
am:
883af0766a
Change-Id: Ib2799189f34cb8fc2baeb19a6a4a005eb13b64d1
TreeHugger Robot [Tue, 2 May 2017 15:47:33 +0000 (15:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Tony Mak [Tue, 2 May 2017 15:46:13 +0000 (15:46 +0000)]
Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev
am:
91c6e44e9e
Change-Id: I360c03f15bf8a84d58100e371ed5528db6975f4d
TreeHugger Robot [Tue, 2 May 2017 15:40:37 +0000 (15:40 +0000)]
Merge "Fix submenu position when showing with Gravity.END" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 15:38:44 +0000 (15:38 +0000)]
Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev
Jorim Jaggi [Tue, 2 May 2017 15:05:12 +0000 (15:05 +0000)]
Merge "Split out whether frame callback and tick is scheduled" into oc-dev
am:
756efea145
Change-Id: I73a1585ac7e287afcf2f0d15d9ccedc5627deed0
TreeHugger Robot [Tue, 2 May 2017 14:58:15 +0000 (14:58 +0000)]
Merge "Split out whether frame callback and tick is scheduled" into oc-dev
Abodunrinwa Toki [Fri, 28 Apr 2017 21:14:13 +0000 (22:14 +0100)]
Add "Paste as plain text" in TextView's toolbar.
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Bug:
36179795
Change-Id: Iee0502678adcfb9de58c107b9247a528718b2c40
Wale Ogunwale [Tue, 2 May 2017 14:06:01 +0000 (14:06 +0000)]
Merge "Don't send configuration that app doesn't support to it." into oc-dev
am:
22c1275c89
Change-Id: Ib7b3b945c476fae59800421c6075397d8bb6352c
TreeHugger Robot [Tue, 2 May 2017 13:58:55 +0000 (13:58 +0000)]
Merge "Don't send configuration that app doesn't support to it." into oc-dev
Tony Mak [Tue, 2 May 2017 12:50:18 +0000 (13:50 +0100)]
Add back the throwIfParentInstance checking in getAffiliationIds
Fix:
37887947
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.ParentProfileTest#testParentProfileApiDisabled
Change-Id: I05944c7a2447998d3ea948195fb25b09ab9735fc
Oleksiy Avramchenko [Tue, 2 May 2017 12:58:12 +0000 (12:58 +0000)]
Merge "Force a light to be set for the first time" am:
e6ad7a6704 am:
96a8556990
am:
db877fa31c
Change-Id: Ib03f7ded6bb232193eec32a4f566244d3caa94b5
Oleksiy Avramchenko [Tue, 2 May 2017 12:53:33 +0000 (12:53 +0000)]
Merge "Force a light to be set for the first time" am:
e6ad7a6704
am:
96a8556990
Change-Id: I5caed909e1ba67931f05b0b44a0ff0fd62b131d0
Oleksiy Avramchenko [Tue, 2 May 2017 12:48:34 +0000 (12:48 +0000)]
Merge "Force a light to be set for the first time"
am:
e6ad7a6704
Change-Id: Icc13b24debc55f4c107dea61123e468a79828f11
Treehugger Robot [Tue, 2 May 2017 12:42:12 +0000 (12:42 +0000)]
Merge "Force a light to be set for the first time"
Jorim Jaggi [Fri, 28 Apr 2017 14:39:19 +0000 (16:39 +0200)]
Split out whether frame callback and tick is scheduled
Since the animation/gesture for screen zoom is running at
vsync-app, calling WMS.scheduleAnimation will schedule only
at the next frame. However, in the next frame, only the frame
callback is handled but not the tick yet, however
mAnimationScheduled was still true. Thus, the request to schedule
another frame callback is ignored, and then the things get
updated only every 2nd frame.
Fix this by splitting the information whether the frame callback
is scheduled or the actual tick.
Test: Use accessibility screen zoom, make sure gestures are
smooth.
Fixes:
37476440
Change-Id: I2301fab5bf3f3b896d4aa131fb041b89572fa3a7
Narayan Kamath [Tue, 2 May 2017 10:26:33 +0000 (10:26 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7." am:
194f8471fd am:
f06800c3ff
am:
58508dfd6e
Change-Id: Ia3f2a9ac5843a32da7c730a172af248abebd7b00
Narayan Kamath [Tue, 2 May 2017 10:19:30 +0000 (10:19 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7." am:
194f8471fd
am:
f06800c3ff
Change-Id: I3c734734bf553e0b4695a897de113d9031f18abd
Narayan Kamath [Tue, 2 May 2017 10:13:48 +0000 (10:13 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7."
am:
194f8471fd
Change-Id: Ie4fbcc4defee14c91cd3b84adf4f3ae5f47add3f
Narayan Kamath [Tue, 2 May 2017 10:06:48 +0000 (10:06 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7."
Hugo Benichi [Tue, 2 May 2017 09:04:59 +0000 (09:04 +0000)]
Merge "NsdManager: add test coverage for discoverServices()" am:
3e21b1745c am:
60182dbe4e
am:
27b0eebb4d
Change-Id: I46acfd104ac3457126c3ccef5041788e4146321c
Hugo Benichi [Tue, 2 May 2017 08:59:22 +0000 (08:59 +0000)]
Merge "NsdManager: add test coverage for discoverServices()" am:
3e21b1745c
am:
60182dbe4e
Change-Id: I341cbbfd36b4e849651505c187053115833ca4b0
Hugo Benichi [Tue, 2 May 2017 08:54:46 +0000 (08:54 +0000)]
Merge "NsdManager: add test coverage for discoverServices()"
am:
3e21b1745c
Change-Id: I0fd1d8e6ea3264a96b144c6701200f7b0be5f9c4
Treehugger Robot [Tue, 2 May 2017 08:44:27 +0000 (08:44 +0000)]
Merge "NsdManager: add test coverage for discoverServices()"
Oleksiy Avramchenko [Tue, 25 Apr 2017 10:30:49 +0000 (12:30 +0200)]
Force a light to be set for the first time
The check in LightImpl::setLightLocked skips HAL call if light
parameters aren't changed. During initialization these parameters
are zeroed, thus it's not possible to turn the light off at the
startup.
As an example this fixes the issue with "stuck" battery light
in the following scenario:
1. Device has secure start-up option set (either pin or pattern).
2. Charger is connected at the startup and battery light shows the
charging state on pin or pattern prompt.
3. Device is unlocked and charger disconnected after some time,
e.g. after com.android.server.lights.LightsService restarted.
4. The battery light is not off and stuck in the previous state
until charger is connected / disconnected again.
Bug:
37662368
Test: manual - follow the above step-by-step
Change-Id: I45470e945fe4d26d37a5641dfff3311968f51ee4
The Android Open Source Project [Tue, 2 May 2017 07:05:25 +0000 (00:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia533546d474a51fa42205fa4ebf7ec122d17fa38
Auto-generated-cl: translation import
Chulwoo Lee [Tue, 2 May 2017 07:02:35 +0000 (07:02 +0000)]
Merge "Allow null setup activity for TV input" into oc-dev
am:
90074d1ec8
Change-Id: I18545582572c60956548af8c732b7e6543f00d76
TreeHugger Robot [Tue, 2 May 2017 06:56:48 +0000 (06:56 +0000)]
Merge "Allow null setup activity for TV input" into oc-dev
Hugo Benichi [Tue, 2 May 2017 06:49:52 +0000 (06:49 +0000)]
Merge "NsdManager: unit test coverage for servive registration" am:
b0e408450c am:
bc57faa1ac
am:
9a3e69d9b6
Change-Id: Ideabb1c929ddd4307e66831cddb20e2feac2c6d9
Hugo Benichi [Tue, 2 May 2017 06:42:44 +0000 (06:42 +0000)]
Merge "NsdManager: unit test coverage for servive registration" am:
b0e408450c
am:
bc57faa1ac
Change-Id: I55a7a1a33cfd30a5c8d5ede67f6a1c602a840e6a
Hugo Benichi [Tue, 2 May 2017 06:35:11 +0000 (06:35 +0000)]
Merge "NsdManager: unit test coverage for servive registration"
am:
b0e408450c
Change-Id: I0b47ad5a1ccee4a2efb169d717b512a46ad4ecc2
Treehugger Robot [Tue, 2 May 2017 06:27:08 +0000 (06:27 +0000)]
Merge "NsdManager: unit test coverage for servive registration"
Hugo Benichi [Fri, 28 Apr 2017 04:29:21 +0000 (13:29 +0900)]
NsdManager: add test coverage for discoverServices()
Test: added new tests
Bug:
37013369,
33298084
Change-Id: If6c1113ee1bd4690db90abd5a61c3e229c827aec
Lorenzo Colitti [Tue, 2 May 2017 04:44:31 +0000 (04:44 +0000)]
Merge "Add a method to start the captive portal login app." into oc-dev
am:
5555b1e3d1
Change-Id: Ic7c14bd3dfd07f97c04901f043ed1cd3b1eee6e4
Lorenzo Colitti [Tue, 2 May 2017 04:38:50 +0000 (04:38 +0000)]
Merge "Add a method to start the captive portal login app." into oc-dev
Hugo Benichi [Fri, 28 Apr 2017 02:01:22 +0000 (11:01 +0900)]
NsdManager: unit test coverage for servive registration
This patch adds test coverage for NsdManager#registerService() and
NsdManager#unregisterService(). This test shows a potential defect in
the api: if unregisterService() fails, the associated listener is always
unregistered from NsdManager. If the service initially registered is
still registered, this potentially make it impossible to unregister.
Test: added new unit test
Bug:
37013369,
33298084
Change-Id: Ia089b6d2f2a349907a8b29d9a3acd7f59e177887
Casey Burkhardt [Tue, 2 May 2017 04:11:01 +0000 (04:11 +0000)]
Merge "Refactor accessibility button support detection" into oc-dev
am:
337e2aae53
Change-Id: I4f96a5ae3e847b2439d017b34038a4b7b07965fa
Casey Burkhardt [Tue, 2 May 2017 04:05:26 +0000 (04:05 +0000)]
Merge "Refactor accessibility button support detection" into oc-dev
Conrad Chen [Tue, 2 May 2017 03:34:25 +0000 (03:34 +0000)]
Merge "TIF: change documentation wording for onSetSurface()" into oc-dev
am:
12c6a04db0
Change-Id: I8c60455d744a2f44175cc913a0266fd6a4cb8995
TreeHugger Robot [Tue, 2 May 2017 03:26:29 +0000 (03:26 +0000)]
Merge "TIF: change documentation wording for onSetSurface()" into oc-dev
Jeremy Joslin [Tue, 2 May 2017 02:24:52 +0000 (02:24 +0000)]
Merge "Adding the AOSP header." into oc-dev
am:
35dcb5f5bb
Change-Id: I89a4019f462958c8b87597b5bb3cc11e751fb476
TreeHugger Robot [Tue, 2 May 2017 02:18:50 +0000 (02:18 +0000)]
Merge "Adding the AOSP header." into oc-dev
Wale Ogunwale [Tue, 2 May 2017 02:02:13 +0000 (02:02 +0000)]
Merge "Don't relaunch activity in TaskRecord.size if caller deferResume" into oc-dev
am:
25cedc232d
Change-Id: I66994bfd9c39c60f78f2afda6953bef162c74d6f
The Android Open Source Project [Tue, 2 May 2017 01:55:24 +0000 (01:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
71d03d43f1 -s ours
Change-Id: I926c75446383b667bbc70d9e83fe686d6870ef4f
TreeHugger Robot [Tue, 2 May 2017 01:55:15 +0000 (01:55 +0000)]
Merge "Don't relaunch activity in TaskRecord.size if caller deferResume" into oc-dev
Peter Qiu [Tue, 2 May 2017 01:52:44 +0000 (01:52 +0000)]
Merge "hotspot2: hide Release 2 APIs" into oc-dev
am:
39da850a95
Change-Id: Id5e1f6184de563b51fcd185fb2768c648f788ff9
TreeHugger Robot [Tue, 2 May 2017 01:48:15 +0000 (01:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
The Android Open Source Project [Tue, 2 May 2017 01:48:05 +0000 (01:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
8864da5149 -s ours
Change-Id: I6cb8a94cee9188985185288fbf6320c1927bc0c1
TreeHugger Robot [Tue, 2 May 2017 01:44:41 +0000 (01:44 +0000)]
Merge "hotspot2: hide Release 2 APIs" into oc-dev
Svetoslav Ganov [Tue, 2 May 2017 01:41:58 +0000 (01:41 +0000)]
Merge "Make auth fill UI size sane size" into oc-dev
am:
c0851e72a5
Change-Id: Ie7ce1a2a92e2fa3e653df3f95be8ff6a8f4d2a47
TreeHugger Robot [Tue, 2 May 2017 01:38:26 +0000 (01:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 01:33:24 +0000 (01:33 +0000)]
Merge "Make auth fill UI size sane size" into oc-dev
Rob Carr [Tue, 2 May 2017 01:11:16 +0000 (01:11 +0000)]
Merge "Fix cropping in docked stack." into oc-dev
am:
8658d43382
Change-Id: I2202a702f7d30c991399eccaa330ddfa650f5278
Rob Carr [Tue, 2 May 2017 01:09:25 +0000 (01:09 +0000)]
Merge "Fix rotation animation selection." into oc-dev
am:
e8d7c01e8a
Change-Id: Ife07062b479b5cffc6e56a8d46d545c22caf8198
The Android Open Source Project [Tue, 2 May 2017 01:07:07 +0000 (18:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iad23566a92d65a5dc0b703f0a2afcb602c0b6025
Auto-generated-cl: translation import
Rob Carr [Tue, 2 May 2017 01:03:44 +0000 (01:03 +0000)]
Merge "Fix cropping in docked stack." into oc-dev
Felipe Leme [Tue, 2 May 2017 01:02:55 +0000 (01:02 +0000)]
Merge "Removed deprecated setAuthentication() method that didn't take ids." into oc-dev
am:
136a48e36a
Change-Id: Ia81cd576c5acdaf0008c21fbea9fb5a16c3c89bf
Rob Carr [Tue, 2 May 2017 01:01:29 +0000 (01:01 +0000)]
Merge "Fix rotation animation selection." into oc-dev
Eric Laurent [Tue, 2 May 2017 01:01:13 +0000 (01:01 +0000)]
Merge "AudioService: send AUDIO_BECOMING_NOISY intent when disconnecting USB" into oc-dev
am:
fe79cbed5d
Change-Id: I1f10b386f6e71d3c758199d880e235a0775aea66
TreeHugger Robot [Tue, 2 May 2017 00:53:30 +0000 (00:53 +0000)]
Merge "Removed deprecated setAuthentication() method that didn't take ids." into oc-dev
Jeff Sharkey [Tue, 2 May 2017 00:53:04 +0000 (00:53 +0000)]
Merge "Video badging levels: @Deprecate and @remove" into oc-dev
am:
0a5b14309a
Change-Id: Icce4883fe59bede2e91c091b8e4734b7224eb0e3
Wale Ogunwale [Mon, 10 Apr 2017 13:35:59 +0000 (06:35 -0700)]
Don't send configuration that app doesn't support to it.
If an app doesn't support the current device orientation configuration,
then don't run the app in that configuration. Instead have the run in
the last configuration that it supports.
This mostly fixes transient cases where there is a short window that the
device is switching configuration and the app could be sent the single
incorrect configuration that is quickly corrected
Test: Will be added soon.
Fixes:
36897968
Change-Id: I030a04200fdf33c4c1938bda980ea8c14aa1c736
TreeHugger Robot [Tue, 2 May 2017 00:45:39 +0000 (00:45 +0000)]
Merge "AudioService: send AUDIO_BECOMING_NOISY intent when disconnecting USB" into oc-dev
Jeff Sharkey [Tue, 2 May 2017 00:44:47 +0000 (00:44 +0000)]
Merge "Video badging levels: @Deprecate and @remove" into oc-dev
Jeremy Joslin [Tue, 25 Apr 2017 22:43:13 +0000 (15:43 -0700)]
Adding the AOSP header.
Test: make
Bug:
37683421
Change-Id: I0c656b91f3533b87a80c34e7461000e75ee1da8e
Jiwen 'Steve' Cai [Sat, 22 Apr 2017 02:05:01 +0000 (19:05 -0700)]
SurfaceTexture: setConsumerIsProtected
When in a protected context, SurfaceTexture should call
setConsumerIsProtected Instead of setting consumer usage bits to
indicate the producer that the consumer can handle protected content.
Bug:
35726763
Test: videoplayer-nodrm-protected.apk and videoplayer-drm-protected.apk
both works.
Change-Id: I0028c040e727691e1e42226c0b66de075fe5515d
The Android Open Source Project [Mon, 1 May 2017 23:47:11 +0000 (16:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae5f3f4f17f19f75e5cbf73133e88105fab69622
Auto-generated-cl: translation import
Adam Powell [Mon, 1 May 2017 23:37:00 +0000 (23:37 +0000)]
Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev
am:
ba9b2ce254
Change-Id: I787a726517687d1cec60a0f96d3abef3229a5dcc
Eugene Susla [Mon, 1 May 2017 23:32:21 +0000 (23:32 +0000)]
Merge "Change protection level of companion permissions" into oc-dev
am:
897f883409
Change-Id: I5b123b603debc11a6ef0ed12a5f6da5d0c3ee533
TreeHugger Robot [Mon, 1 May 2017 23:30:08 +0000 (23:30 +0000)]
Merge "Hide FragmentContainer#instantiate for API 26" into oc-dev
Hyunyoung Song [Mon, 1 May 2017 23:28:48 +0000 (23:28 +0000)]
Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev
am:
1e8f451bbf
Change-Id: I9d95fdcd56ccf99fe497b68f85fd5db036548a83
Jeff Sharkey [Mon, 1 May 2017 23:25:24 +0000 (23:25 +0000)]
Merge "Rename to follow API council guidance." into oc-dev
am:
0d6c3a691e
Change-Id: I9116471537b51bd3aa785ff21f0bef48ec380889
Peter Qiu [Mon, 1 May 2017 22:59:53 +0000 (15:59 -0700)]
hotspot2: hide Release 2 APIs
Bug:
37514629
Test: builds
Change-Id: Idcd684cf9846791cb02ae0f74ec35ff4850666f1
TreeHugger Robot [Mon, 1 May 2017 23:22:06 +0000 (23:22 +0000)]
Merge "Change protection level of companion permissions" into oc-dev
Adrian Roos [Mon, 1 May 2017 23:20:00 +0000 (23:20 +0000)]
Merge "AOD: Increase shelf icon size while dark" into oc-dev
am:
f852ed40a6
Change-Id: Ic9d9e0878695962e947a0f9cc25e012350f7ffba
TreeHugger Robot [Mon, 1 May 2017 23:18:37 +0000 (23:18 +0000)]
Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev
Svetoslav Ganov [Mon, 1 May 2017 23:11:14 +0000 (16:11 -0700)]
Make auth fill UI size sane size
Now the width and height are capped to 0.9 of the screen
dimensions. The height is also adjusted as needed by the
popup window positioning logic.
Test: manual
bug:
36660292
Change-Id: I54d032f4e9b9b8fae6f98846c470a1455babcb68
TreeHugger Robot [Mon, 1 May 2017 23:15:54 +0000 (23:15 +0000)]
Merge "Rename to follow API council guidance." into oc-dev
TreeHugger Robot [Mon, 1 May 2017 23:11:49 +0000 (23:11 +0000)]
Merge "AOD: Increase shelf icon size while dark" into oc-dev
The Android Open Source Project [Mon, 1 May 2017 23:07:16 +0000 (16:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4eebfaa9c9983fcff35af8c1c0f98b945ded2631
Auto-generated-cl: translation import
Eric Laurent [Mon, 1 May 2017 22:58:01 +0000 (22:58 +0000)]
Merge "AudioService: more AUDIO_BECOMING_NOISY intent fixes" into oc-dev
am:
4226b27efa
Change-Id: I206d0af2a3463b554b017b3e61f85ce102566cdf
Casey Burkhardt [Fri, 28 Apr 2017 02:30:15 +0000 (19:30 -0700)]
Refactor accessibility button support detection
- Moves logic to detect devices capable of supporting the
accessibility button into AccessibilityManager from
SettingsLib to avoid issues with resource shifting in the
SUW binary
Bug:
37650567
Test: Existing Robolectric / Manual
Merged-In: Ibb2aaa3c2f79570df768cfa796fa890988ef82cc
Change-Id: I83bbecdf7836ae0de32ce7d39155ac0c111a8f15
Svetoslav Ganov [Mon, 1 May 2017 22:52:33 +0000 (22:52 +0000)]
Merge "Addess API council comments" into oc-dev
am:
a9bb97993f
Change-Id: I1e521c08500bcdbbfc7fd708baa4762dbb91e39a
OSDN Git Service
