OSDN Git Service
Bill Yi [Thu, 27 Oct 2016 05:19:57 +0000 (05:19 +0000)]
Import translations. DO NOT MERGE am:
fc0224f880 -s ours
am:
5eb8d7f3f3 -s ours
Change-Id: I3435809c9e16599e99d62ec7a40aa16b0254c8d0
Bill Yi [Thu, 27 Oct 2016 05:19:07 +0000 (05:19 +0000)]
Import translations. DO NOT MERGE am:
c541a19fba -s ours am:
18608133d8 -s ours am:
1653bfafc4 -s ours
am:
4cb84a4c59 -s ours
Change-Id: I9c64e2069eff1f3f24bcc5d1d29b5f767ab71e5e
Bill Yi [Thu, 27 Oct 2016 05:07:56 +0000 (05:07 +0000)]
Import translations. DO NOT MERGE
am:
fc0224f880 -s ours
Change-Id: Ia6ca469ec75244202c5cf49605e05ab364bd0274
Bill Yi [Thu, 27 Oct 2016 05:07:03 +0000 (05:07 +0000)]
Import translations. DO NOT MERGE am:
c541a19fba -s ours am:
18608133d8 -s ours
am:
1653bfafc4 -s ours
Change-Id: I4793a3d04fc08897fdab2f11f4fa194076219b49
Bill Yi [Thu, 27 Oct 2016 05:04:11 +0000 (05:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
a2b301d0e1 -s ours
am:
68d6955b45 -s ours
Change-Id: I2b21eda80569335e44cf39c087e6dc4590d69d69
Bill Yi [Thu, 27 Oct 2016 05:03:06 +0000 (05:03 +0000)]
Import translations. DO NOT MERGE am:
aad661f874 -s ours
am:
f21106b0e8 -s ours
Change-Id: I8b4225b3c88971f17fa97c9bedb0481f78260c23
TreeHugger Robot [Thu, 27 Oct 2016 04:59:28 +0000 (04:59 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 27 Oct 2016 04:58:59 +0000 (04:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 27 Oct 2016 04:59:00 +0000 (04:59 +0000)]
Import translations. DO NOT MERGE am:
c541a19fba -s ours
am:
18608133d8 -s ours
Change-Id: I56489534a775a003ca0e5863bedafe2201e38c28
TreeHugger Robot [Thu, 27 Oct 2016 04:57:42 +0000 (04:57 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 27 Oct 2016 04:54:38 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
a2b301d0e1 -s ours
Change-Id: I33dcb6841acdee235a66dcf4f0900ee6cc041090
Bill Yi [Thu, 27 Oct 2016 04:54:34 +0000 (04:54 +0000)]
Import translations. DO NOT MERGE
am:
aad661f874 -s ours
Change-Id: I8196b80e5f5ce6ac932e7556fc4727ee4047c6ba
Bill Yi [Thu, 27 Oct 2016 04:54:31 +0000 (04:54 +0000)]
Import translations. DO NOT MERGE
am:
c541a19fba -s ours
Change-Id: I8540ec656b922d2a56b8ddcb58c719e52a1bb5c6
TreeHugger Robot [Thu, 27 Oct 2016 04:50:39 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 27 Oct 2016 04:50:09 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 27 Oct 2016 04:31:02 +0000 (04:31 +0000)]
Merge "AAPT2: Rename to match new style"
Bill Yi [Thu, 27 Oct 2016 03:18:34 +0000 (20:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I01dfed1e6db0d4fe5cff72df3cec234400085fde
Auto-generated-cl: translation import
Bill Yi [Thu, 27 Oct 2016 03:12:01 +0000 (20:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I637b457c6e9a20345cd5dbe599c4dce15ca9040c
Auto-generated-cl: translation import
Bill Yi [Thu, 27 Oct 2016 02:59:45 +0000 (19:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f32e71b1e47beacb5e11d77bb7939fd2b2f5eb7
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 27 Oct 2016 02:50:23 +0000 (02:50 +0000)]
Merge "resolve merge conflicts of
1238daf to master"
TreeHugger Robot [Thu, 27 Oct 2016 02:48:07 +0000 (02:48 +0000)]
Merge "Adding option to swipe to dismiss."
Adam Lesinski [Sat, 22 Oct 2016 00:56:45 +0000 (17:56 -0700)]
AAPT2: Rename to match new style
Use Google3 naming style to match new
projects' and open source google projects' style.
Preferred to do this in a massive CL so as to avoid
style inconsistencies that plague legacy code bases.
This is a relatively NEW code base, may as well keep
it up to date.
Test: name/style refactor - existing tests pass
Change-Id: Ie80ecb78d46ec53efdfca2336bb57d96cbb7fb87
TreeHugger Robot [Thu, 27 Oct 2016 02:09:45 +0000 (02:09 +0000)]
Merge "Removed temporary workaround for multi-window assist crash."
TreeHugger Robot [Thu, 27 Oct 2016 01:01:12 +0000 (01:01 +0000)]
Merge "Remove unneeded libraries from libmedia_jni"
Marie Janssen [Thu, 27 Oct 2016 00:57:22 +0000 (17:57 -0700)]
resolve merge conflicts of
1238daf to master
Change-Id: Icc70d291379d4f4816881e46704197513e6d548e
Tomasz Mikolajewski [Thu, 27 Oct 2016 00:56:28 +0000 (00:56 +0000)]
Merge "Remove no longer used FLAG_ARCHIVE."
Marie Janssen [Thu, 27 Oct 2016 00:29:51 +0000 (00:29 +0000)]
Bluetooth: prevent enabling BLE in airplane mode am:
a80d745c65 am:
6affbde556
am:
73bfd25356
Change-Id: Ieb424a2d68058d4171e6c9bd04f8a42cc1f3d7e9
Marie Janssen [Thu, 27 Oct 2016 00:24:48 +0000 (00:24 +0000)]
Bluetooth: prevent enabling BLE in airplane mode am:
a80d745c65
am:
6affbde556
Change-Id: I4b67a584fc9db12431d4552387abe9c456dee4d2
Marie Janssen [Thu, 27 Oct 2016 00:20:17 +0000 (00:20 +0000)]
Bluetooth: prevent enabling BLE in airplane mode
am:
a80d745c65
Change-Id: I05a57fa747abedab24e0509c1fb7ab8737b2256a
Bill Yi [Wed, 26 Oct 2016 23:50:38 +0000 (16:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6bbb28b633130252b0dd3f6036cf4e8812814ce7
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 26 Oct 2016 23:45:19 +0000 (23:45 +0000)]
Merge "No recents items can be dismissed by tap or swipe"
Bill Yi [Wed, 26 Oct 2016 23:07:06 +0000 (16:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id8fd7be4130e852b023392635da7fecc39ebfd74
Auto-generated-cl: translation import
Peter Qiu [Wed, 26 Oct 2016 23:03:08 +0000 (23:03 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" am:
ef0cc62058 am:
bb8f3a3bbf am:
e6effcd7a6
am:
a01e6667d9
Change-Id: I555251fc739284af57179dfac48a4fb46c5a2a59
Peter Qiu [Wed, 26 Oct 2016 23:01:21 +0000 (23:01 +0000)]
Merge changes I69c1931b,I6b08f52d am:
1a5da2b533 am:
fe4f473fb8 am:
f300e2f8ff
am:
0af8599174
Change-Id: I79b24ea210d490be3f2926c515446625a0e3625e
Peter Qiu [Wed, 26 Oct 2016 22:59:46 +0000 (22:59 +0000)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string am:
bae4becf69 am:
2fb7775d2a am:
90e40ee843
am:
e07f54e0b1
Change-Id: I381912a511089fd55f010806f75915c5989a66f7
Peter Qiu [Wed, 26 Oct 2016 22:58:22 +0000 (22:58 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration am:
e557c35d95 am:
6f426e3b17 am:
47047555bc
am:
a465821df8
Change-Id: I97ec6baa738f65ea3fa55e4d80b2008da7ac308a
Peter Qiu [Wed, 26 Oct 2016 22:54:15 +0000 (22:54 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" am:
ef0cc62058 am:
bb8f3a3bbf
am:
e6effcd7a6
Change-Id: Id9358a0d3f821c201563ea072cc6784125fac591
Peter Qiu [Wed, 26 Oct 2016 22:52:36 +0000 (22:52 +0000)]
Merge changes I69c1931b,I6b08f52d am:
1a5da2b533 am:
fe4f473fb8
am:
f300e2f8ff
Change-Id: I51abbd1d96aaf2ed5d99737cdd452de3c34fbe35
Peter Qiu [Wed, 26 Oct 2016 22:50:53 +0000 (22:50 +0000)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string am:
bae4becf69 am:
2fb7775d2a
am:
90e40ee843
Change-Id: I45b4b70582252d680648a996b5e95e998f41afe2
Peter Qiu [Wed, 26 Oct 2016 22:49:43 +0000 (22:49 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration am:
e557c35d95 am:
6f426e3b17
am:
47047555bc
Change-Id: I381096b9e6243b10e0e4cea4f31ef058c07054fb
Peter Qiu [Wed, 26 Oct 2016 22:44:44 +0000 (22:44 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" am:
ef0cc62058
am:
bb8f3a3bbf
Change-Id: I935c4b34c1f40e2bba1983161f7900ec9511f8da
Peter Qiu [Wed, 26 Oct 2016 22:43:23 +0000 (22:43 +0000)]
Merge changes I69c1931b,I6b08f52d am:
1a5da2b533
am:
fe4f473fb8
Change-Id: I54e73a4e4f336fc8d4fc5eae55d138a46aee9626
Peter Qiu [Wed, 26 Oct 2016 22:41:48 +0000 (22:41 +0000)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string am:
bae4becf69
am:
2fb7775d2a
Change-Id: Ie6cc6911d6ec49a55f467cfe5e59f218df18455b
Peter Qiu [Wed, 26 Oct 2016 22:40:43 +0000 (22:40 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration am:
e557c35d95
am:
6f426e3b17
Change-Id: Icb7497670a7137810ed4def6e6b087c56f1c6de9
Winson Chung [Mon, 24 Oct 2016 18:50:44 +0000 (11:50 -0700)]
Adding option to swipe to dismiss.
- Adding tuner settings for PIP
Test: Manual, open PIP and swipe offscreen to dismiss
Change-Id: I62f8e4c4b96984b9f266dde5efc3c511cf37f7dd
Bill Yi [Wed, 26 Oct 2016 22:32:51 +0000 (15:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I70b27a620d3a173b02b0fa67242e0ac6fd894466
Auto-generated-cl: translation import
Peter Qiu [Wed, 26 Oct 2016 22:30:37 +0000 (22:30 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
am:
ef0cc62058
Change-Id: Id5b7771a25905d8e8e074b62c6ef70363c459d08
Peter Qiu [Wed, 26 Oct 2016 22:29:01 +0000 (22:29 +0000)]
Merge changes I69c1931b,I6b08f52d
am:
1a5da2b533
Change-Id: I43b0ddd456cfd9d3988c504266e868a637bb43c4
Peter Qiu [Wed, 26 Oct 2016 22:28:55 +0000 (22:28 +0000)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
am:
bae4becf69
Change-Id: I2b8510cc8dc6fad443f0507a86f960ce1ae9a0d6
Peter Qiu [Wed, 26 Oct 2016 22:27:56 +0000 (22:27 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration
am:
e557c35d95
Change-Id: I0ece2aef3408de46c2c92b311c78e711c09c99b9
TreeHugger Robot [Wed, 26 Oct 2016 22:14:44 +0000 (22:14 +0000)]
Merge "CarrierConfig: add persist_lpp_mode_bool"
Treehugger Robot [Wed, 26 Oct 2016 22:14:15 +0000 (22:14 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
Treehugger Robot [Wed, 26 Oct 2016 22:13:57 +0000 (22:13 +0000)]
Merge changes I69c1931b,I6b08f52d
* changes:
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
wifi: hotspot2: initial implementation of PasspointConfiguration
Alain Vongsouvanh [Wed, 26 Oct 2016 22:10:47 +0000 (22:10 +0000)]
Merge "Properly set the center of the circular mask." into cw-f-dev am:
7aa48283b0 am:
db82c3fc46
am:
9c66337d85
Change-Id: I441284c9b8dca04d5526edd9bbbae779322b9dea
Alain Vongsouvanh [Wed, 26 Oct 2016 22:09:46 +0000 (22:09 +0000)]
Properly set the center of the circular mask. am:
63d2e41d1b am:
285cf2d765
am:
bac23b4fda -s ours
Change-Id: I9725217b2367be6876e1f91deea5762f6148c8ba
Bill Yi [Wed, 26 Oct 2016 22:04:04 +0000 (15:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2a25a518308b117cc8aef63638984b0d00ebb48b
Auto-generated-cl: translation import
Marie Janssen [Tue, 25 Oct 2016 17:47:51 +0000 (10:47 -0700)]
Bluetooth: prevent enabling BLE in airplane mode
Enabling BLE in airplane mode puts BluetoothManagerService in an
unexpected state which causes Bluetooth to be on when airplane mode
is disabled.
Also fixes a bug where a crash of a BLE client would trigger a restart
into ON mode.
Test: SL4A BleBackgroundScanTest:test_airplane_mode_disables_ble
Bug:
32140251
Bug:
32140271
Bug:
32369494
Change-Id: Ie65157e65c3a1ca914f567a7a0c631175d1e5835
(cherry picked from commit
bd93b7b3dc6141cef6236cf0ca7dcc5acf5bfeed)
TreeHugger Robot [Wed, 26 Oct 2016 21:48:06 +0000 (21:48 +0000)]
Merge changes I2d9f1a2d,I01fd8ba6
* changes:
Ensure PIP retains bounds on device rotation.
Fix wrong bounds being used in landscape.
Alain Vongsouvanh [Wed, 26 Oct 2016 21:34:40 +0000 (21:34 +0000)]
Merge "Properly set the center of the circular mask." into cw-f-dev am:
7aa48283b0
am:
db82c3fc46
Change-Id: I2f50ee1a68da4501e29bca9848d60abce11ea7e7
Alain Vongsouvanh [Wed, 26 Oct 2016 21:33:44 +0000 (21:33 +0000)]
Properly set the center of the circular mask. am:
63d2e41d1b
am:
285cf2d765
Change-Id: I7ebd39225bff8740d486d38f4668eeb8fd83da56
Alain Vongsouvanh [Wed, 26 Oct 2016 21:29:19 +0000 (21:29 +0000)]
Merge "Properly set the center of the circular mask." into cw-f-dev
am:
7aa48283b0
Change-Id: Ie54889ebded4a26ee20807f06d5832851eb941f0
Alain Vongsouvanh [Wed, 26 Oct 2016 21:29:15 +0000 (21:29 +0000)]
Properly set the center of the circular mask.
am:
63d2e41d1b
Change-Id: If638998c5012b5ebb68cca77b257a991b09827a9
Matthew Ng [Fri, 21 Oct 2016 21:53:18 +0000 (14:53 -0700)]
No recents items can be dismissed by tap or swipe
When there are no recents items shown, any tap or swipe will dismiss it
and go back to the launcher.
Bug:
31464845
Fixes:
31464845
Test: manual - overview with no recents and tap the screen to dismiss
Change-Id: I98987daf4d064e3f65141f790e68018fcf445c26
Marco Nelissen [Wed, 26 Oct 2016 21:17:38 +0000 (14:17 -0700)]
Remove unneeded libraries from libmedia_jni
Test: built and booted
Change-Id: I9bd8dd0001688eabc0d58563b652eb11a69efba8
TreeHugger Robot [Wed, 26 Oct 2016 21:20:20 +0000 (21:20 +0000)]
Merge "Properly set the center of the circular mask." into cw-f-dev
Svetoslav Ganov [Wed, 26 Oct 2016 20:53:51 +0000 (20:53 +0000)]
Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev am:
e9db00e39f am:
5ac13dcb25 am:
69a039eb78
am:
3494413b99 -s ours
Change-Id: If807066cabe2fee34fe1e2bcc5d76a4a1106fe3b
Svetoslav Ganov [Wed, 26 Oct 2016 20:53:04 +0000 (20:53 +0000)]
[DO NOT MERGE] Don't accidentally delete renamed packages am:
e2c85890ac am:
2a81b4c908 am:
c893565d24
am:
bc3d8e8673 -s ours
Change-Id: I9b6cff17aa4e62c17d25ebb747891a83a3e2c67a
Svetoslav Ganov [Wed, 26 Oct 2016 20:46:04 +0000 (20:46 +0000)]
Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev am:
e9db00e39f am:
5ac13dcb25
am:
69a039eb78
Change-Id: Id11cb6af6a7e7d9512a3b56efae4832ccfb2f928
Svetoslav Ganov [Wed, 26 Oct 2016 20:45:07 +0000 (20:45 +0000)]
[DO NOT MERGE] Don't accidentally delete renamed packages am:
e2c85890ac am:
2a81b4c908
am:
c893565d24
Change-Id: I3b0abcfcc23b114b38204c0c957acb1316698845
Svetoslav Ganov [Wed, 26 Oct 2016 20:37:24 +0000 (20:37 +0000)]
Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev am:
e9db00e39f
am:
5ac13dcb25
Change-Id: Ic2950d36ac4f7a32d45e06741e80963f7e1cf583
Svetoslav Ganov [Wed, 26 Oct 2016 20:36:35 +0000 (20:36 +0000)]
[DO NOT MERGE] Don't accidentally delete renamed packages am:
e2c85890ac
am:
2a81b4c908
Change-Id: If6495a817d87c41998cbc148fce7bbb39c4da5a4
Dimitry Ivanov [Wed, 26 Oct 2016 20:36:08 +0000 (20:36 +0000)]
Merge "Always call into native loader when load a native library" am:
e266c37559 am:
808bd1765f am:
54501b0dee
am:
897d5cf56e
Change-Id: I1087ac78beffa747475306318313ceb84fcd51c7
Dimitry Ivanov [Wed, 26 Oct 2016 20:34:35 +0000 (20:34 +0000)]
Always call into native loader when load a native library am:
569834d861 am:
3512d092dd am:
35207ba655
am:
17e1e9d837
Change-Id: If348b1e0ce03ef072e5e7bfe5bbf09c37bfb8f6d
Svetoslav Ganov [Wed, 26 Oct 2016 20:28:33 +0000 (20:28 +0000)]
Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev
am:
e9db00e39f
Change-Id: I4141899231b1d48bb8217fe071a4146202e10ab8
Svetoslav Ganov [Wed, 26 Oct 2016 20:28:30 +0000 (20:28 +0000)]
[DO NOT MERGE] Don't accidentally delete renamed packages
am:
e2c85890ac
Change-Id: Icbd85ddfc76e50553414bd47860370cdc442b796
Dimitry Ivanov [Wed, 26 Oct 2016 20:27:23 +0000 (20:27 +0000)]
Merge "Always call into native loader when load a native library" am:
e266c37559 am:
808bd1765f
am:
54501b0dee
Change-Id: Ia07db4ba7b893a577b7d411eaa7fa230b8eb784f
Dimitry Ivanov [Wed, 26 Oct 2016 20:25:47 +0000 (20:25 +0000)]
Always call into native loader when load a native library am:
569834d861 am:
3512d092dd
am:
35207ba655
Change-Id: I56fa597e50da763027aba74d678c40f2b2496b69
Jordan Liu [Wed, 26 Oct 2016 20:24:40 +0000 (20:24 +0000)]
resolve merge conflicts of
ab00546 to stage-aosp-master am:
bc2af49c21 am:
ff13cc20fe
am:
ab3c24ceda -s ours
Change-Id: I73530234f4ec9aa9146dcd0e5790beb7dd545aa5
TreeHugger Robot [Wed, 26 Oct 2016 20:22:49 +0000 (20:22 +0000)]
Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev
Dimitry Ivanov [Wed, 26 Oct 2016 20:18:08 +0000 (20:18 +0000)]
Merge "Always call into native loader when load a native library" am:
e266c37559
am:
808bd1765f
Change-Id: I63495e45a1eafe2dd92c30f315289f5ca2d17070
Jordan Liu [Wed, 26 Oct 2016 20:16:42 +0000 (20:16 +0000)]
resolve merge conflicts of
ab00546 to stage-aosp-master am:
bc2af49c21
am:
ff13cc20fe
Change-Id: I5aea360d11a44b35c781ae32822a559900be34e5
Dimitry Ivanov [Wed, 26 Oct 2016 20:16:38 +0000 (20:16 +0000)]
Always call into native loader when load a native library am:
569834d861
am:
3512d092dd
Change-Id: I73a52349387cad474da6cb0d6c664cfb0879e2a6
Jordan Liu [Wed, 26 Oct 2016 20:12:56 +0000 (20:12 +0000)]
resolve merge conflicts of
ab00546 to stage-aosp-master
am:
bc2af49c21
Change-Id: I95cfcd3907105ef1969f02bf1229ba0c5eb9b8c7
Dimitry Ivanov [Wed, 26 Oct 2016 20:11:33 +0000 (20:11 +0000)]
Merge "Always call into native loader when load a native library"
am:
e266c37559
Change-Id: I4d220cde19ac85b16396070f493395227a85d82c
Dimitry Ivanov [Wed, 26 Oct 2016 20:11:01 +0000 (20:11 +0000)]
Always call into native loader when load a native library
am:
569834d861
Change-Id: I35ce58423aefceb541542e0ef9408e0b7ef9b104
TreeHugger Robot [Wed, 26 Oct 2016 20:07:43 +0000 (20:07 +0000)]
Merge "Fix bug in which some Views were not executing enter transition."
Alain Vongsouvanh [Wed, 26 Oct 2016 20:01:49 +0000 (13:01 -0700)]
Properly set the center of the circular mask.
The new circular mask did not take into account devices with a chin,
setting the center of the circular mask higher than it should be.
BUG:
32418552
Change-Id: Ia45e197492a57341ad7db620b1d3fcc4820eabf0
Winson Chung [Wed, 26 Oct 2016 16:44:43 +0000 (09:44 -0700)]
Ensure PIP retains bounds on device rotation.
- When device rotates, ensure that the PIP continues to show in the
same aspect ratio, snapped to the same logical snap point.
- Move common snapping code to policy so that it can be shared between
SystemUI and the framework.
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testPinnedStackInBoundsAfterRotation
Change-Id: I2d9f1a2dc077a55c39acc1ccba982c255e2ff3a4
Winson Chung [Tue, 25 Oct 2016 00:12:49 +0000 (17:12 -0700)]
Fix wrong bounds being used in landscape.
- Ensure we use the right display size when calculating PIP bounds.
- Also update interface to take the display id.
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testPinnedStackDefaultBounds
Test: #testPinnedStackMovementBounds
Change-Id: I01fd8ba6dee212c29a9a092673ee8f7843e41af6
TreeHugger Robot [Wed, 26 Oct 2016 19:40:40 +0000 (19:40 +0000)]
Merge "Import android.hardware.thermal@1.0 constants into HardwarePropertiesManager."
TreeHugger Robot [Wed, 26 Oct 2016 19:40:07 +0000 (19:40 +0000)]
Merge "Show up button in select printer activity"
Jordan Liu [Wed, 26 Oct 2016 18:24:54 +0000 (11:24 -0700)]
resolve merge conflicts of
ab00546 to stage-aosp-master
Change-Id: Ief51ceeeae7a11e26dd2c53411ce67e6d0e6bd49
Peter Qiu [Tue, 18 Oct 2016 19:04:23 +0000 (12:04 -0700)]
wifi: hotspot2: omadm: add parsing support for PPS MO tree
This parser will convert a PPS MO (PerProviderSubscription Management Object)
tree XML string to a PasspointConfiguration parcelable object.
Bug:
32129686
Change-Id: Ia80b6d73828436ded57a3817f5eca7b79c618de4
Test: frameworks/base/wifi/tests/runtests.sh
Peter Qiu [Fri, 14 Oct 2016 21:26:46 +0000 (14:26 -0700)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
The XML parser will parse an XML string into a tree-like structure
represented by XMLNode, which will be used by an object specific parser
(e.g. PerProviderSubscription Management Object tree parser) for further
processing.
Bug:
32129686
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I69c1931b2e8a6f3551e4eba5cffa3d2d0877872a
Ecco Park [Mon, 24 Oct 2016 20:04:52 +0000 (13:04 -0700)]
CarrierConfig: add persist_lpp_mode_bool
Removing carrier specific function from
GnssLocationProvider.java
This property is used for persisting the current
lpp_mode of carrier even after sim is removed
Instead, we will use the property of carrier config
Bug:
32250938
Change-Id: Ibc69883723392cb0fbfcd8dbf3e866860db9dd5d
Signed-off-by: Ecco Park <eccopark@google.com>
Dimitry Ivanov [Wed, 26 Oct 2016 18:27:37 +0000 (18:27 +0000)]
Merge "Always call into native loader when load a native library"
Svetoslav Ganov [Wed, 26 Oct 2016 03:47:15 +0000 (20:47 -0700)]
[DO NOT MERGE] Don't accidentally delete renamed packages
Apps on the system image can change their package by declaring
their old one in the manifest. If a package is renamed it is
internally referred by its old name.
The reconciliation code was using the new package name for
renamed packages and was concluding the apk is orphaned thus
deleting it. This puts the package in a bad state where the app
is gone and the version on the system partition is disabled.
Also Play was showing an update for a renamed system app as
an install while it is an update because of the same reason,
it was using the new package name while the app is internally
referred by the old one.
The fix for both above is to internally normalize the package
name by using the old one if the package was renamed or the
package name as is.
Test: With the fix put the old calculator on the system image
and booted, then put the renamed calculator and booted, updated
calculator from play and rebooted - calculator keeps working.
Also did the above steps without the patch to put calculator
in a bad state and flashed the system with the patch which
fixed the broken calculator app.
bug:
32321269
Change-Id: I98bfc05c399edfc9854ebcce44182fefa55ceeff
TreeHugger Robot [Wed, 26 Oct 2016 18:03:52 +0000 (18:03 +0000)]
Merge "A little more padding in PrintActivity."
Jordan Liu [Wed, 26 Oct 2016 17:50:44 +0000 (17:50 +0000)]
Merge "Add key to CarrierConfigManager"
Jorim Jaggi [Wed, 26 Oct 2016 17:49:57 +0000 (17:49 +0000)]
Merge "Fix animation sequence for upload tasks" am:
7f2676a3d9 am:
b5fed003cc am:
bb139c5633
am:
eb7aa4267c
Change-Id: I289ad240e4b78b0705904c2d180821a2e19fd517