OSDN Git Service
Wei Liu [Tue, 17 Jan 2017 01:41:13 +0000 (01:41 +0000)]
Merge "Add WearCellularMediatorService to the system server. am:
d741f3de81 am:
e0d2c77a50" into nyc-mr2-dev-plus-aosp
am:
6a5bf5ef71
Change-Id: I72d10becb6deecc259dbb888c59f3449f0a1cf22
Wei Liu [Tue, 17 Jan 2017 01:39:12 +0000 (01:39 +0000)]
Add WearCellularMediatorService to the system server. am:
d741f3de81 am:
e0d2c77a50
am:
bd538c2e96
Change-Id: I7dbc21fed9cd72b13e02d50dc63993f6ba4656ff
TreeHugger Robot [Tue, 17 Jan 2017 01:35:29 +0000 (01:35 +0000)]
Merge "resolve merge conflicts of
989b267015b9 to master"
Zach Johnson [Mon, 16 Jan 2017 23:15:25 +0000 (15:15 -0800)]
resolve merge conflicts of
989b267015b9 to master
Change-Id: I0c967e85eb73664e236c0b7286ed14facdb327fa
TreeHugger Robot [Mon, 16 Jan 2017 23:09:43 +0000 (23:09 +0000)]
Merge "Add supportsDismissingSelfWindow attribute of IME"
Kang Li [Mon, 16 Jan 2017 21:36:06 +0000 (21:36 +0000)]
Merge "Adds annotations to Intent, and enables ChooserActivity to rank apps according to annotations."
TreeHugger Robot [Mon, 16 Jan 2017 18:26:20 +0000 (18:26 +0000)]
Merge "Use screenshotToBuffer"
TreeHugger Robot [Mon, 16 Jan 2017 18:09:47 +0000 (18:09 +0000)]
Merge "Make device wide DO features available if all users affiliated"
Diego Perez [Mon, 16 Jan 2017 18:05:48 +0000 (18:05 +0000)]
Merge changes Ia7a8a27f,I0646aab6,Ia324f18d,I38c6c6df,Ic9214929, ...
* changes:
Add missing attributes to old themes
Fix plurals support in layoutlib
Do not log errors while loading string arrays
Hack to deal with android:pointerIcon in layoutlib
Force animateFirstValue to false
Avoid passing antialias when measuring scaled text
Catch all exceptions in NativeAllocationRegistry free
Jerome Gaillard [Mon, 16 Jan 2017 17:40:12 +0000 (17:40 +0000)]
Merge "Call layout when doing an only-measure pass"
Jorim Jaggi [Wed, 11 Jan 2017 23:44:33 +0000 (00:44 +0100)]
Use screenshotToBuffer
To avoid copying buffers. Yay!
Test: Open app, go to recents, make sure screenshot is showing.
Bug:
31339431
Change-Id: I62736b8ba9ca45155d602286de8280304160bbd6
Diego Perez [Fri, 9 Dec 2016 13:59:57 +0000 (13:59 +0000)]
Add missing attributes to old themes
Because we always use the latest framework code, some resources might
fail to resolve when using old themes (they haven't been backported).
Since this is an artifact caused by us using always the latest code, we
check for some of those values and replace them here.
Bug: http://b.android.com/225105
Test: Included new testActivityOnOldTheme
Change-Id: Ia7a8a27fb81fe0b4a1e0c9610a2033a87720864d
Diego Perez [Mon, 5 Dec 2016 17:47:23 +0000 (17:47 +0000)]
Fix plurals support in layoutlib
Bug: http://b.android.com/213000
Test: Manually tested on Android Studio. Adding tests for this specific
case requires bringing a new sdk-common prebuilt to the the maintenance
branch so it's not really practical.
Change-Id: I0646aab656d5d5769355c6cc026e877b8784d173
Diego Perez [Fri, 2 Dec 2016 11:16:26 +0000 (11:16 +0000)]
Do not log errors while loading string arrays
When arrays contain references, if we can not resolve them, just return
the reference string. This matches the behaviour of resource resolution
in BridgeTypeArray.
Bug: http://b.android.com/228620
Test: Updates existing tests
Change-Id: Ia324f18d9128b8abf2ba676a83d4b424914e2c88
Jerome Gaillard [Fri, 25 Nov 2016 17:28:05 +0000 (17:28 +0000)]
Hack to deal with android:pointerIcon in layoutlib
android:pointerIcon is a View attribute that can be an enum or a
reference. Layoutlib cannot easily deal with the way that is handled
in the platform. As the property would not have any impact on the
result in layoutlib, that property is bypassed.
Test: Main.testAllWidgets
Change-Id: I38c6c6df45c1836d44b4f80245a453fb432ea251
Diego Perez [Thu, 10 Nov 2016 16:29:22 +0000 (16:29 +0000)]
Force animateFirstValue to false
This CL forces both animateFirstValue and animateLayoutChanges to false
in themes when running layoutlib. This helps with the rendering of some
widgets so they do not rely on animations.
Test: Test as part of testActivity
Change-Id: Ic9214929d3582bc3e0a196d198cc4fb36347c782
Diego Perez [Tue, 2 Aug 2016 12:48:08 +0000 (13:48 +0100)]
Avoid passing antialias when measuring scaled text
This is a workaround for a JDK bug that crashes the VM when
measuring scaled antialsed text.
This disables antialiasing when measuring scaled text in a specific
version of the VM.
Bug: http://b.android.com/211659
Change-Id: I637ed03cf827b65c993550998ac55d42869237ad
Diego Perez [Thu, 21 Jul 2016 16:54:42 +0000 (17:54 +0100)]
Catch all exceptions in NativeAllocationRegistry free
The NativeAllocationRegistry delegate free calls might run in the
context of the finalizer thread. If a crash happens during the free
call, it might bring down the finalizer thread and the VM.
Bug: http://b.android.com/213927
Change-Id: I8d4b8ab5b8d0532aad46f27d039a943894e021a0
Jerome Gaillard [Mon, 16 Jan 2017 15:16:20 +0000 (15:16 +0000)]
Delete Canvas_Delegate.nClipRegion after Change I71f9bd68
Test: layoutlib tests
Change-Id: I9c04fa258cdaf06972b205e5dd5d3b505e5bea17
Diego Perez [Mon, 21 Nov 2016 15:10:34 +0000 (15:10 +0000)]
Call layout when doing an only-measure pass
Test: Modified testScrolled to check the only-measure behaviour
Change-Id: Ie86c329e0f7d9135d53274977e24f431f5edc201
(cherry picked from commit
2d657bc344717281e470430b05adaa32fbd0af00)
Jerome Gaillard [Mon, 16 Jan 2017 14:24:51 +0000 (14:24 +0000)]
Merge "Update layoutlib following Change Id10ca97f on FontFamily"
Jerome Gaillard [Mon, 16 Jan 2017 14:24:09 +0000 (14:24 +0000)]
Merge "Add measure only call to layoutlib"
Jerome Gaillard [Mon, 16 Jan 2017 14:20:46 +0000 (14:20 +0000)]
Merge "Create a mock Display Mode"
Narayan Kamath [Mon, 16 Jan 2017 13:28:44 +0000 (13:28 +0000)]
Merge "PackageParser: Disable package cache on "eng" builds."
Esteban Talavera [Thu, 15 Dec 2016 08:51:45 +0000 (08:51 +0000)]
Make device wide DO features available if all users affiliated
Currently, those features are available on single user devices only
(since they collect privacy sensitive data device wide). Now making
them available as long as all users are affiliated.
It'll take a certain amount of time between user creation and the DPC
of that new user setting the appropriate affiliation ids. The DO won't
be able to access the logs during that time (and won't get any "logs
ready" callback). Once the affiliation ids are set, if they match,
logs become available again - this includes logs collected while the
user was being setup. Some logs might be lost though if the amount of
data exceeds the internal limit.
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services
Test: cts-tradefed run cts -a armeabi-v7a --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest
Bug:
32326223
Change-Id: Idfe881dd6497d3ad2bead10addfd37b98b8a6e2b
Hugo Benichi [Mon, 16 Jan 2017 08:28:43 +0000 (08:28 +0000)]
Merge "IP connectivity metrics: fix tests"
Hugo Benichi [Tue, 20 Dec 2016 00:57:43 +0000 (09:57 +0900)]
Stricter NetworkNotificationManagerTest
This patch changes NetworkNotificationManagerTest to populate extraInfo
of NetworkInfo in order to catch regressions in malformed format Strings
of log statements in NetworkNotificationManager.
Test: verified that the test fails when reintroducing the format String
bug.
Bug:
33737715
(cherry picked from commit
a865790a5b30a2d5e29e3d443e7b02a5d8aa01a4)
Change-Id: Ic2f23e860a17cb83b90edcfd2ba365134cacfe36
Hugo Benichi [Mon, 16 Jan 2017 05:42:56 +0000 (14:42 +0900)]
IP connectivity metrics: fix tests
Change
4e89a026292338761838b33fc83b250f3519819c did not update the unit
tests checking serialization of ipconnectivity.proto protobufs.
This patch updates the tests expectations to make them pass again
Test: $ runtest frameworks-net
Bug:
34232829
Change-Id: Iccc4e1a7714c9ce1eba995dc47a2961216efc87d
TreeHugger Robot [Mon, 16 Jan 2017 03:38:56 +0000 (03:38 +0000)]
Merge "GNSS O Features according to go/o-gps-hal"
Tadashi G. Takaoka [Wed, 11 Jan 2017 06:51:44 +0000 (15:51 +0900)]
Add supportsDismissingSelfWindow attribute of IME
When a virtual keyboard is shown on some configurations (e.g. Phone),
the System UI may change the back navigation button to a different UI
element in order to dismiss the virtual keyboard. Such UI modification
is unnecessary when the virtual keyboard has a dismissing button on
its own window. This new attribute hints the System UI that the
virtual keyboard may have a UI element to dismiss itself. This will be
also useful for Tablet System UI which may not show a navigation bar
when a virtual keyboard is shown.
Bug:
34133139
Test: Add unit test InputMethodInfoTest
Change-Id: I0f6b130a7df57557e40b52a7b7ac00be965a17c3
gomo [Wed, 11 Jan 2017 21:20:13 +0000 (13:20 -0800)]
GNSS O Features according to go/o-gps-hal
Added "Tow Known" as a possible gnss measurement state. As well added Automatic Gain Control (AGC)
to allow jammer detection. Also added the GNSS carrier frequeny to SV status. Also added vertical
GPS position uncertainty, speed uncertainty and bearing uncertainty. Also propagate locaton new
fields to geofence engine.
Test: Existing unit tests still pass.
Change-Id: I472b2fd2516cb7614877dea4bb054a34f50844dc
Jesse Hall [Mon, 12 Dec 2016 20:53:02 +0000 (12:53 -0800)]
Create GraphicsEnvironment for communicating with driver loaders
The GraphicsEnvironment class is given information during application
start, and makes it available to EGL/GLES/Vulkan loaders that don't
have easy access to the VM or to the application Context. Currently
only the driver path is handled, but the existing support for setting
library paths (for Vulkan extensions) and cache directory information
should move here.
Bug:
33531483
Test: various apps w/ and w/o driver package installed
Change-Id: I5820d3d1301d5461e10706f551b268c54d4f8926
Jean-Michel Trivi [Sat, 14 Jan 2017 23:39:08 +0000 (23:39 +0000)]
Merge "AudioPlaybackConfiguration has a player control interface"
TreeHugger Robot [Sat, 14 Jan 2017 17:12:53 +0000 (17:12 +0000)]
Merge "Send EXTRA_USER with DevicePolicy lock broadcasts"
Bartosz Fabianowski [Sat, 14 Jan 2017 12:58:16 +0000 (12:58 +0000)]
Merge "Add install reason"
TreeHugger Robot [Sat, 14 Jan 2017 08:30:18 +0000 (08:30 +0000)]
Merge "Update bluetooth device type icon color"
TreeHugger Robot [Sat, 14 Jan 2017 04:47:03 +0000 (04:47 +0000)]
Merge "Treble GNSS - Removing FlpHardwareProvider"
TreeHugger Robot [Sat, 14 Jan 2017 04:07:18 +0000 (04:07 +0000)]
Merge "Also scale down thumbnail in app transitions for grid recents"
Android Build Merger (Role) [Sat, 14 Jan 2017 03:58:21 +0000 (03:58 +0000)]
Merge "Add WearCellularMediatorService to the system server. am:
d741f3de81 am:
e0d2c77a50" into nyc-mr2-dev-plus-aosp
TreeHugger Robot [Sat, 14 Jan 2017 03:57:05 +0000 (03:57 +0000)]
Merge "2D Recents: Make sure thumbnail fills task view in all orientations"
Wei Liu [Sat, 14 Jan 2017 03:57:00 +0000 (03:57 +0000)]
Add WearCellularMediatorService to the system server. am:
d741f3de81
am:
e0d2c77a50
Change-Id: I586eec797d0d6f5cf5b893c7cacb8028b0b511fa
Wei Liu [Sat, 14 Jan 2017 03:56:52 +0000 (03:56 +0000)]
Add WearCellularMediatorService to the system server. am:
d741f3de81
am:
6760890c38
Change-Id: I30d792533da4051300d15ee0567e4c09da68e21e
Wei Liu [Sat, 14 Jan 2017 03:51:58 +0000 (03:51 +0000)]
Add WearCellularMediatorService to the system server.
am:
d741f3de81
Change-Id: I6f3f0e2ea19f995f81816689c80b0bc865cc991e
Wei Liu [Sat, 14 Jan 2017 03:51:52 +0000 (03:51 +0000)]
Add WearCellularMediatorService to the system server.
am:
d741f3de81
Change-Id: Ica3d90c3748d79b28bf9cad1b3b5468f919e7299
TreeHugger Robot [Sat, 14 Jan 2017 02:35:53 +0000 (02:35 +0000)]
Merge "Stop preloading EGL/GLES in Zygote"
Wei Liu [Tue, 13 Dec 2016 23:44:55 +0000 (15:44 -0800)]
Add WearCellularMediatorService to the system server.
Bug:
33589216
Change-Id: Icfee08b27c03567ed45e136fc407b51c768515c2
Kang Li [Fri, 6 Jan 2017 21:33:24 +0000 (13:33 -0800)]
Adds annotations to Intent, and enables ChooserActivity to rank apps
according to annotations.
Test: Unit tests and manul tests. More unit tests to be added.
Change-Id: I3cbfd0cc10007290585fa3e7e3c92e1731f1f7b8
Aurimas Liutikas [Sat, 14 Jan 2017 01:23:06 +0000 (01:23 +0000)]
Merge "Remove unused classes from com.android.internal.widget"
Roozbeh Pournader [Sat, 14 Jan 2017 01:16:43 +0000 (01:16 +0000)]
Merge "Treat Latin American locales specially" into nyc-mr2-dev am:
0e099a283e
am:
bdb68feffd
Change-Id: Ic51c4a45b77e227ace457b9665050be99af56ffc
Roozbeh Pournader [Sat, 14 Jan 2017 01:15:30 +0000 (01:15 +0000)]
Treat Latin American locales specially am:
cf246af30d
am:
4115c64313
Change-Id: I3f6bb444b185df0998b3dc4e4aaa8e8db2db79cf
Roozbeh Pournader [Sat, 14 Jan 2017 01:10:30 +0000 (01:10 +0000)]
Merge "Treat Latin American locales specially" into nyc-mr2-dev
am:
0e099a283e
Change-Id: I2af561b25f9023bc7970d653386b6ca94430be73
Yifan Hong [Sat, 14 Jan 2017 01:10:29 +0000 (01:10 +0000)]
Merge "BBinder -> BHwBinder." am:
fe4d257887 am:
051b14106f am:
24b33094f6
am:
1bc9d241f6
Change-Id: I872c4f18f1a9c8fa8247f9c2b0f40107c1b51daa
Roozbeh Pournader [Sat, 14 Jan 2017 01:10:25 +0000 (01:10 +0000)]
Treat Latin American locales specially
am:
cf246af30d
Change-Id: I98ff3b1774e6cc3511fcd296d9cec5ccfce03c40
Yifan Hong [Sat, 14 Jan 2017 01:05:04 +0000 (01:05 +0000)]
Merge "BBinder -> BHwBinder." am:
fe4d257887 am:
051b14106f
am:
24b33094f6
Change-Id: I4781adad935ca77148226e0ed7df5f0b5b953daa
TreeHugger Robot [Sat, 14 Jan 2017 01:02:43 +0000 (01:02 +0000)]
Merge "Treat Latin American locales specially" into nyc-mr2-dev
Yifan Hong [Sat, 14 Jan 2017 01:00:31 +0000 (01:00 +0000)]
Merge "BBinder -> BHwBinder." am:
fe4d257887
am:
051b14106f
Change-Id: I148771849faf22aabdcd3861e867913408d84c11
Yifan Hong [Sat, 14 Jan 2017 00:55:55 +0000 (00:55 +0000)]
Merge "BBinder -> BHwBinder."
am:
fe4d257887
Change-Id: Iefe63e614d5c90f33d807aba8fac3f2095972ae8
Yifan Hong [Sat, 14 Jan 2017 00:49:22 +0000 (00:49 +0000)]
Merge "BBinder -> BHwBinder."
Sudheer Shanka [Sat, 14 Jan 2017 00:40:09 +0000 (00:40 +0000)]
Merge "Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell" into nyc-mr2-dev am:
bdd0a2b14a
am:
3102b3c37f
Change-Id: Ia069a59715a6057aba0c742a806cf73fe85489f9
bohu [Sat, 14 Jan 2017 00:38:57 +0000 (00:38 +0000)]
Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell am:
d91dd06591
am:
906a21ba08
Change-Id: I592165bf4b159a93c388bc55b0a930667fdc1377
Muyuan Li [Sat, 14 Jan 2017 00:38:04 +0000 (00:38 +0000)]
Merge "update navbar assets for sw900dp device." into nyc-mr2-dev am:
659a650141
am:
8139b9f0dd
Change-Id: Ib0b87365a5dff779ff103b76f20aea559153c21a
Muyuan Li [Sat, 14 Jan 2017 00:37:01 +0000 (00:37 +0000)]
update navbar assets for sw900dp device. am:
b3152ab966
am:
dd804d6b3a
Change-Id: Ia6a13f26bee3341482bad0606afd670ca89d0cc3
Chris Craik [Sat, 14 Jan 2017 00:36:02 +0000 (00:36 +0000)]
Merge "Support shadows and reordering in ViewOverlay" into nyc-mr2-dev am:
4638ef17d5
am:
f56832a949
Change-Id: I0dd2a5226276dc74addf01d683d2a64cb55fa9a4
Chris Craik [Sat, 14 Jan 2017 00:35:02 +0000 (00:35 +0000)]
Support shadows and reordering in ViewOverlay am:
36d9a6dfba
am:
2369a6d753
Change-Id: I1f6574a4b9a1d24ccd4fc78cbc7e3368d815f8f5
Andrew Scull [Sat, 14 Jan 2017 00:33:43 +0000 (00:33 +0000)]
Merge "Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd am:
eadd29ffa6" into nyc-mr2-dev-plus-aosp
am:
e688b70eb2
Change-Id: I48bfc9548432bdf41021d956617b1b37cc3c46ff
Andrew Scull [Sat, 14 Jan 2017 00:33:31 +0000 (00:33 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd am:
eadd29ffa6
am:
833bed16ba
Change-Id: I67c391cd59f53682267b98a4db961cc9f9cf08fa
Andrew Scull [Sat, 14 Jan 2017 00:31:59 +0000 (00:31 +0000)]
Merge "resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1 am:
9af145dcc4" into nyc-mr2-dev-plus-aosp
am:
6d85c8a833
Change-Id: I39820d0ae4d6f7b9c04451bb0969976004e6f133
Andrew Scull [Sat, 14 Jan 2017 00:31:51 +0000 (00:31 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1 am:
9af145dcc4
am:
4c349b67aa
Change-Id: I4718d7e2c73a5f84ca43789a09db5f3ab9a6b5d6
Andrew Scull [Sat, 14 Jan 2017 00:30:22 +0000 (00:30 +0000)]
Merge "Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd am:
32992b4049" into nyc-mr2-dev-plus-aosp
am:
c697ffe98b
Change-Id: I79d4ec95100e09eb6225cbfe900bceb357ee6b71
Andrew Scull [Sat, 14 Jan 2017 00:30:15 +0000 (00:30 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c am:
b2db3761cd am:
32992b4049
am:
bc94427593
Change-Id: I7e3cc5845ddafa4299f3bec1c2d40c05a66ffa99
Andrew Scull [Sat, 14 Jan 2017 00:28:46 +0000 (00:28 +0000)]
Merge "resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1 am:
3c9b36482f" into nyc-mr2-dev-plus-aosp
am:
0877a45f02
Change-Id: I8b4a708f5204346e791f5450bfaa4501afa3704b
Andrew Scull [Sat, 14 Jan 2017 00:28:39 +0000 (00:28 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969 am:
3aac3ebee1 am:
3c9b36482f
am:
8203155664 -s ours
Change-Id: I920c10e52faef95e0d3d55e075fdc85610b358c0
Sudheer Shanka [Sat, 14 Jan 2017 00:17:40 +0000 (00:17 +0000)]
Merge "Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell" into nyc-mr2-dev
am:
bdd0a2b14a
Change-Id: I4697f24ecef7cc439c94352ba2aaf98cf34bbe61
bohu [Sat, 14 Jan 2017 00:17:33 +0000 (00:17 +0000)]
Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell
am:
d91dd06591
Change-Id: Ie178b790e11eb081857cd67c7f9af7fa95914868
Sudheer Shanka [Sat, 14 Jan 2017 00:10:05 +0000 (00:10 +0000)]
Merge "Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell" into nyc-mr2-dev
Jean-Michel Trivi [Fri, 6 Jan 2017 02:06:03 +0000 (18:06 -0800)]
AudioPlaybackConfiguration has a player control interface
An AudioPlaybackConfiguration contains an IPlayer
interface for system control of a player. It is not
exposed to non-system signature components.
AudioService, through PlaybackActivityMonitor, is monitoring
the death of the IPlayer so the matching player can get
unregistered in case it meets its maker.
Test: use vendor/google_toolbox/team/audio/cmds/ClPlaybackActivity
Bug:
30258418
Change-Id: Ibf3bceba91882ff16bffbf1219c55a1f89ccb13f
Jesse Hall [Mon, 12 Dec 2016 05:22:16 +0000 (21:22 -0800)]
Stop preloading EGL/GLES in Zygote
It's not clear this actually makes much difference on modern
devices/drivers. With updatable graphics drivers, we'd have to be able
to unload the preloaded driver from processes that don't use the
system driver, which is additional complexity and risk.
On bullhead and sailfish, meminfo actually showed slightly more memory
available while sitting at launcher just after boot with this change
than previously. Looking at detailed stats, the differences appeared
to mostly within run-to-run variation, but there wasn't evidence of a
regression.
Bug:
33531483
Test: boot through lockscreen/launcher
Change-Id: I1892302c1750cdbeaf5b9979f8da4dc6bd7b3e75
Zak Cohen [Fri, 13 Jan 2017 23:14:57 +0000 (23:14 +0000)]
Merge changes from topic 'vrmode'
* changes:
Set ui mode in UiModeManagerService to vrheadset when VR mode is enabled.
Introduce new UI_MODE_TYPE_VR_HEADSET and qualifier.
Fan Zhang [Fri, 13 Jan 2017 22:40:36 +0000 (14:40 -0800)]
Update bluetooth device type icon color
Bug:
34205154
Test: visual
Change-Id: If694ab12fa23c2b8db9c8659549021d82146f36a
Manu Cornet [Fri, 13 Jan 2017 22:23:23 +0000 (14:23 -0800)]
2D Recents: Make sure thumbnail fills task view in all orientations
This is a manual cherrypick of change
1775039 because automerging had
conflicts.
Bug:
32101881
Test: Checked layout in various situations when switching orientation
Change-Id: I26eb92320e381504daf5c1f54dddd15ea4601ac9
Muyuan Li [Fri, 13 Jan 2017 22:11:19 +0000 (22:11 +0000)]
Merge "update navbar assets for sw900dp device." into nyc-mr2-dev
am:
659a650141
Change-Id: I9712d15884ab9bcf25bd8cf98e7881dc5d9871d4
Muyuan Li [Fri, 13 Jan 2017 22:11:14 +0000 (22:11 +0000)]
update navbar assets for sw900dp device.
am:
b3152ab966
Change-Id: I79b810a896ae17423b5fa36cac27a1933f2e758b
Chris Craik [Fri, 13 Jan 2017 22:07:52 +0000 (22:07 +0000)]
Merge "Support shadows and reordering in ViewOverlay" into nyc-mr2-dev
am:
4638ef17d5
Change-Id: I240d4b7397d06d3994fd17f4e3694ceef58c16f3
Chris Craik [Fri, 13 Jan 2017 22:07:43 +0000 (22:07 +0000)]
Support shadows and reordering in ViewOverlay
am:
36d9a6dfba
Change-Id: I1e7c33d68b5e2350b8b0ac589c46fdc250424b1a
Roger Xue [Fri, 13 Jan 2017 21:59:13 +0000 (21:59 +0000)]
Merge "move PreferenceController into settingLib/core"
Muyuan Li [Fri, 13 Jan 2017 21:49:51 +0000 (21:49 +0000)]
Merge "update navbar assets for sw900dp device." into nyc-mr2-dev
Chris Craik [Fri, 13 Jan 2017 21:46:51 +0000 (21:46 +0000)]
Merge "Support shadows and reordering in ViewOverlay" into nyc-mr2-dev
Philip P. Moltmann [Fri, 13 Jan 2017 21:45:55 +0000 (21:45 +0000)]
Merge changes from topic 'am-
72bbc108e9a84456ab88db3270cbb4e9' into nyc-mr2-dev-plus-aosp
am:
7dfd0b9843
Change-Id: I8a7ab11326864e25a993c4e4daecc3c280adf1a2
Philip P. Moltmann [Fri, 13 Jan 2017 21:45:49 +0000 (21:45 +0000)]
Do not write if apply() did not change the file. am:
1f99f81bdc am:
331a4bb8d4 am:
0dfa7b58b8
am:
af5875d1be
Change-Id: Ia85f754316e9f003dfffdfb17efa8622d49068f2
Philip P. Moltmann [Fri, 13 Jan 2017 21:44:50 +0000 (21:44 +0000)]
Only persist last Shared Preferences state am:
d15c4f1da5 am:
889a420a9e -s ours am:
2288ee6b01
am:
44ee186c79
Change-Id: I81498bb620cd0a2c3bfac8654d5536ed38ba4d4b
Manu Cornet [Fri, 13 Jan 2017 21:44:07 +0000 (13:44 -0800)]
Also scale down thumbnail in app transitions for grid recents
This is a manual cherrypick of change
1779235 since automerging had
conflicts.
Bug:
32101881
Test: Checked the effect on app -> recents transition on local sw600dp device
Change-Id: I3dec10b2293ceb50bf02db2432766e5d34f91736
Joachim Sauer [Fri, 13 Jan 2017 21:41:52 +0000 (21:41 +0000)]
Merge "Add java.time APIs." am:
0938b22c0a am:
d05e19954b am:
88002e8e38
am:
b26cc7f971
Change-Id: Ib52d788a1787fa3689c14135673de044e2a7c989
Erik Kline [Fri, 13 Jan 2017 21:40:47 +0000 (21:40 +0000)]
Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" am:
caf62d305e am:
a94e66868c am:
21a148550d
am:
c8c42637d9
Change-Id: Ia6a834e00d3f681dd7558d096f157f1c8f279bea
Erik Kline [Fri, 13 Jan 2017 21:39:45 +0000 (21:39 +0000)]
Move explicit mobile request handling into UpstreamNetworkMonitor am:
fdd4111ef6 am:
7340e272c3 am:
ca6d265bbe
am:
930ff60ca8
Change-Id: I307f0c83c09dd5962bd4b6e929083aff9f6f6f05
Chen Xu [Fri, 13 Jan 2017 21:38:45 +0000 (21:38 +0000)]
Merge "Default Carrier app for traffic mitigation" am:
4533b1ccdd am:
1d0877f59e am:
c90dc2072c
am:
10839091d9
Change-Id: I2a09577e0912c1d6ff324f0471b4a2012656749a
Philip P. Moltmann [Fri, 13 Jan 2017 21:37:36 +0000 (21:37 +0000)]
Do not write if apply() did not change the file. am:
1f99f81bdc am:
331a4bb8d4 am:
764a7901e6
am:
1156bf1dc1
Change-Id: I4559bb240589f523ab035c42b09be2bf17fbe599
Philip P. Moltmann [Fri, 13 Jan 2017 21:36:33 +0000 (21:36 +0000)]
Only persist last Shared Preferences state am:
d15c4f1da5 am:
889a420a9e am:
0aa5138861 -s ours
am:
6a1dcd17e4
Change-Id: Iffc426e95d47559bf1a01e0cf4b9c5c0f160d33b
Justin Klaassen [Fri, 13 Jan 2017 21:34:59 +0000 (21:34 +0000)]
Merge "Add support for carrier demo mode" into nyc-mr2-dev am:
482ba6b831
am:
84d0b9ea6b
Change-Id: I52df2e1fd79db3b324406215c4d6b32dc832f2cd
Justin Klaassen [Fri, 13 Jan 2017 21:33:45 +0000 (21:33 +0000)]
Add support for carrier demo mode am:
b632c55469
am:
b4be8c8df1 -s ours
Change-Id: Ief253b88502ec5bd2092e4d20956a3098202cec6
Rob Carr [Fri, 13 Jan 2017 21:29:07 +0000 (21:29 +0000)]
Merge "Expose SurfaceControl method to screenshot to GraphicBuffer."
OSDN Git Service
