OSDN Git Service

android-x86/frameworks-base.git
8 years agoAdd metrics for fragments in Settings.
Fan Zhang [Mon, 8 Aug 2016 21:03:53 +0000 (14:03 -0700)]
Add metrics for fragments in Settings.

Bug: 30681771
Test: compiled fine with proto changes.
Change-Id: I5b4669d13d58987c12dcc78ebdc4d7bd22916a71

8 years agoMerge "VPN network stat accounting changes."
TreeHugger Robot [Wed, 17 Aug 2016 00:19:09 +0000 (00:19 +0000)]
Merge "VPN network stat accounting changes."

8 years agoMerge "AAPT: Handle gaps in resources when building splits"
Adam Lesinski [Wed, 17 Aug 2016 00:03:35 +0000 (00:03 +0000)]
Merge "AAPT: Handle gaps in resources when building splits"

8 years agoMerge "Prevent wifi icon from disappearing"
Salvador Martinez [Tue, 16 Aug 2016 23:37:39 +0000 (23:37 +0000)]
Merge "Prevent wifi icon from disappearing"

8 years agoVPN network stat accounting changes.
Jeremy Joslin [Mon, 8 Aug 2016 23:07:37 +0000 (16:07 -0700)]
VPN network stat accounting changes.

Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.

This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.

BUG: 30557871
Change-Id: I62a75a0c0c0111e052b7903baa9f5d6d94ef57fd

8 years agoPrevent wifi icon from disappearing
Salvador Martinez [Fri, 12 Aug 2016 00:14:11 +0000 (17:14 -0700)]
Prevent wifi icon from disappearing

Made changes to AccessPointPreference to prevent
it from ever setting a empty icon to reduce the
jittering from elements all changing at once.

Bug: 29979747
Change-Id: If432aed1d55b37cf3d48074275f8b3dc0584f884

8 years agoMerge "Updating the javadoc of DevicePolicyManager#wipeData"
TreeHugger Robot [Tue, 16 Aug 2016 21:47:35 +0000 (21:47 +0000)]
Merge "Updating the javadoc of DevicePolicyManager#wipeData"

8 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 16 Aug 2016 15:32:30 +0000 (15:32 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 16 Aug 2016 15:31:02 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoSet DeviceLockedForUser state synchronously
Rubin Xu [Wed, 10 Aug 2016 09:53:24 +0000 (10:53 +0100)]
Set DeviceLockedForUser state synchronously

Setting DeviceLockedForUser on the handler thread will lead to a race
condition where an immedidate read might see a stale value.

Bug: 30728557
Change-Id: Id9d510d7ad4dbcde6344a044e45f4b2feac19257

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 16 Aug 2016 08:50:03 +0000 (01:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iba720f663afd48f3ee242b16dcc72ed056ef26ce
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 16 Aug 2016 07:00:48 +0000 (00:00 -0700)]
Import translations. DO NOT MERGE

Change-Id: I73e8ffc9d00429aeb7458250b41ddd331632e056
Auto-generated-cl: translation import

8 years agoMerge "Fix google-explicit-constructor warnings." am: ea537bf5b3 am: 9c0b881c9d am...
Chih-Hung Hsieh [Tue, 16 Aug 2016 02:48:15 +0000 (02:48 +0000)]
Merge "Fix google-explicit-constructor warnings." am: ea537bf5b3 am: 9c0b881c9d am: 1ab51f3769
am: bd070b7792

Change-Id: Ibb5f0df9e4c4119330224075bb91b3961da1ab64

8 years agoMerge "Fix google-explicit-constructor warnings." am: ea537bf5b3 am: 9c0b881c9d
Chih-Hung Hsieh [Tue, 16 Aug 2016 02:39:40 +0000 (02:39 +0000)]
Merge "Fix google-explicit-constructor warnings." am: ea537bf5b3 am: 9c0b881c9d
am: 1ab51f3769

Change-Id: Ide274953e85d1ba9e0e978a531d69c3543e7923a

8 years agoMerge "Fix google-explicit-constructor warnings." am: ea537bf5b3
Chih-Hung Hsieh [Tue, 16 Aug 2016 02:31:42 +0000 (02:31 +0000)]
Merge "Fix google-explicit-constructor warnings." am: ea537bf5b3
am: 9c0b881c9d

Change-Id: If4ec2ed4609d130e2b25dae2bf90f2209878cd4c

8 years agoMerge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Tue, 16 Aug 2016 02:23:48 +0000 (02:23 +0000)]
Merge "Fix google-explicit-constructor warnings."
am: ea537bf5b3

Change-Id: I38d1f635b7bf2c46648c852bf0caa421e67218f4

8 years agoMerge changes I082e323e,I326bf776 into nyc-mr1-dev am: c991a7ad54 am: fd1da97fc7
Rob Carr [Tue, 16 Aug 2016 02:14:33 +0000 (02:14 +0000)]
Merge changes I082e323e,I326bf776 into nyc-mr1-dev am: c991a7ad54 am: fd1da97fc7
am: 442e9a6bcf

Change-Id: Ibe99a21a1ce7b81b314aba8abf4e2ec843dedb9e

8 years agoLimit seamless rotation to TRANSFORM_INVERSE_DISPLAY children. am: aab09158e9 am...
Robert Carr [Tue, 16 Aug 2016 02:13:44 +0000 (02:13 +0000)]
Limit seamless rotation to TRANSFORM_INVERSE_DISPLAY children. am: aab09158e9 am: 878507072a
am: 25596584aa

Change-Id: Iafee88d9e01139a31c4694e963d6e674646895b4

8 years agoMerge "Fix google-explicit-constructor warnings."
Treehugger Robot [Tue, 16 Aug 2016 02:12:38 +0000 (02:12 +0000)]
Merge "Fix google-explicit-constructor warnings."

8 years agoAllow seamless rotation before mTopIsFullscreen is set. am: 1ccd42510f am: 2dcc35ab94
Robert Carr [Tue, 16 Aug 2016 02:11:59 +0000 (02:11 +0000)]
Allow seamless rotation before mTopIsFullscreen is set. am: 1ccd42510f am: 2dcc35ab94
am: 58f58f3b38

Change-Id: Id3a206921901b7ed24e43753342bcbf29d43f862

8 years agoMerge "Doc change: escape lt char in generic type in pre block." into nyc-dev am...
Dirk Dougherty [Tue, 16 Aug 2016 02:11:55 +0000 (02:11 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev am: 114c09498d am: 13a5f3515f am: fa35f82d9b
am: ced62ea3ad

Change-Id: I7f677e9907d2867fa3563d977e566f19fc9a58d2

8 years agoDoc change: escape lt char in generic type in pre block. am: 1035b25825 am: 61a7f64e1...
Dirk Dougherty [Tue, 16 Aug 2016 02:11:52 +0000 (02:11 +0000)]
Doc change: escape lt char in generic type in pre block. am: 1035b25825 am: 61a7f64e1f am: 330ee9b965
am: e48d2b2423

Change-Id: Ief3330602528638da8b25a11267bab54115e336f

8 years agoMerge changes I082e323e,I326bf776 into nyc-mr1-dev am: c991a7ad54
Rob Carr [Tue, 16 Aug 2016 02:02:24 +0000 (02:02 +0000)]
Merge changes I082e323e,I326bf776 into nyc-mr1-dev am: c991a7ad54
am: fd1da97fc7

Change-Id: I3b9d145af200f1a075dc65c334fff49c1a4adc26

8 years agoLimit seamless rotation to TRANSFORM_INVERSE_DISPLAY children. am: aab09158e9
Robert Carr [Tue, 16 Aug 2016 02:01:31 +0000 (02:01 +0000)]
Limit seamless rotation to TRANSFORM_INVERSE_DISPLAY children. am: aab09158e9
am: 878507072a

Change-Id: I7af88b8bb27dcceb624b392a536cf0ce49a8e71f

8 years agoAllow seamless rotation before mTopIsFullscreen is set. am: 1ccd42510f
Robert Carr [Tue, 16 Aug 2016 01:59:40 +0000 (01:59 +0000)]
Allow seamless rotation before mTopIsFullscreen is set. am: 1ccd42510f
am: 2dcc35ab94

Change-Id: If41b31858f38e7c9c8a400ee4d25958f2adf947b

8 years agoMerge "Doc change: escape lt char in generic type in pre block." into nyc-dev am...
Dirk Dougherty [Tue, 16 Aug 2016 01:59:35 +0000 (01:59 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev am: 114c09498d am: 13a5f3515f
am: fa35f82d9b

Change-Id: I3ad7a07d2ef6001b4632b83d7e8822a33e1190fd

8 years agoDoc change: escape lt char in generic type in pre block. am: 1035b25825 am: 61a7f64e1f
Dirk Dougherty [Tue, 16 Aug 2016 01:59:29 +0000 (01:59 +0000)]
Doc change: escape lt char in generic type in pre block. am: 1035b25825 am: 61a7f64e1f
am: 330ee9b965

Change-Id: I9bc7545b553a31e2973c6d48146f14e9f4b7be1f

8 years agoMerge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1...
Robert Carr [Tue, 16 Aug 2016 01:54:14 +0000 (01:54 +0000)]
Merge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1-dev am: b14543d9d8 am: 3cfbf180c7
am: 3781fc9519

Change-Id: Iad1b9ff2698696f946315273ea41b91a6526dc39

8 years agoIntroduce new constant for double tap gesture rotation hint. am: 57d9fbd17f am: 5f684...
Robert Carr [Tue, 16 Aug 2016 01:54:11 +0000 (01:54 +0000)]
Introduce new constant for double tap gesture rotation hint. am: 57d9fbd17f am: 5f684d92b6
am: bdbc23bebe

Change-Id: I6a9b2a55148a1c2428e871337bb300a84887adc7

8 years agoMerge changes I082e323e,I326bf776 into nyc-mr1-dev
Rob Carr [Tue, 16 Aug 2016 01:46:06 +0000 (01:46 +0000)]
Merge changes I082e323e,I326bf776 into nyc-mr1-dev
am: c991a7ad54

Change-Id: Ia26593ab5b53c34656af1095f63bffa9ebcde27f

8 years agoLimit seamless rotation to TRANSFORM_INVERSE_DISPLAY children.
Robert Carr [Tue, 16 Aug 2016 01:46:04 +0000 (01:46 +0000)]
Limit seamless rotation to TRANSFORM_INVERSE_DISPLAY children.
am: aab09158e9

Change-Id: If1c06bf70128af337d23bfa58157e16a0dea9b3b

8 years agoAAPT: Handle gaps in resources when building splits
Adam Lesinski [Tue, 16 Aug 2016 01:45:00 +0000 (18:45 -0700)]
AAPT: Handle gaps in resources when building splits

Due to public ID assignment, gaps in resource type and entry
IDs can occur. This can lead to null pointer dereferencing
if not careful. This happened in ResourceTable::getDensityVaryingResources()
which is called when building Splits.

Bug:30879690
Change-Id: I588e4dcd2e042fccfcb2e87967b5cbd0d23b4497

8 years agoAllow seamless rotation before mTopIsFullscreen is set.
Robert Carr [Tue, 16 Aug 2016 01:44:28 +0000 (01:44 +0000)]
Allow seamless rotation before mTopIsFullscreen is set.
am: 1ccd42510f

Change-Id: I52b5d288993a4fbf5b265f32e238b40a4b68f8d6

8 years agoMerge "Doc change: escape lt char in generic type in pre block." into nyc-dev am...
Dirk Dougherty [Tue, 16 Aug 2016 01:44:27 +0000 (01:44 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev am: 114c09498d am: c9107e3263
am: d66f01d381

Change-Id: Ifb64e09133d53fa9f52c92d8c4cc86e846d5f8b9

8 years agoMerge "Doc change: escape lt char in generic type in pre block." into nyc-dev am...
Dirk Dougherty [Tue, 16 Aug 2016 01:44:19 +0000 (01:44 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev am: 114c09498d
am: 13a5f3515f

Change-Id: I421a40de8a7c3aee6ea087a12c6862b8051765a9

8 years agoDoc change: escape lt char in generic type in pre block. am: 1035b25825 am: f98babb134
Dirk Dougherty [Tue, 16 Aug 2016 01:44:18 +0000 (01:44 +0000)]
Doc change: escape lt char in generic type in pre block. am: 1035b25825 am: f98babb134
am: 7d503c66a4

Change-Id: I065983d6723313eb998d26a740d98f8e343df83d

8 years agoMerge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1...
Robert Carr [Tue, 16 Aug 2016 01:44:17 +0000 (01:44 +0000)]
Merge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1-dev am: b14543d9d8
am: 3cfbf180c7

Change-Id: I2c55b6600ffd2aab5d3ada06a10bb804d256dbd2

8 years agoDoc change: escape lt char in generic type in pre block. am: 1035b25825
Dirk Dougherty [Tue, 16 Aug 2016 01:44:14 +0000 (01:44 +0000)]
Doc change: escape lt char in generic type in pre block. am: 1035b25825
am: 61a7f64e1f

Change-Id: Id086866cc0c047fb8ea88cb16c863ebd11b7f7b0

8 years agoIntroduce new constant for double tap gesture rotation hint. am: 57d9fbd17f
Robert Carr [Tue, 16 Aug 2016 01:44:07 +0000 (01:44 +0000)]
Introduce new constant for double tap gesture rotation hint. am: 57d9fbd17f
am: 5f684d92b6

Change-Id: Idf2bb8511e24732018ff59ffbf30f440cb7f9779

8 years agoMerge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1-dev
Robert Carr [Tue, 16 Aug 2016 01:36:05 +0000 (01:36 +0000)]
Merge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1-dev
am: b14543d9d8

Change-Id: I3edf4558a7cfabb40abc9cfc9393288d2a5b72b8

8 years agoIntroduce new constant for double tap gesture rotation hint.
Robert Carr [Tue, 16 Aug 2016 01:35:59 +0000 (01:35 +0000)]
Introduce new constant for double tap gesture rotation hint.
am: 57d9fbd17f

Change-Id: I994c15c692ec52160deb3d29b46396802562588a

8 years agoMerge "Doc change: escape lt char in generic type in pre block." into nyc-dev am...
Dirk Dougherty [Tue, 16 Aug 2016 01:35:39 +0000 (01:35 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev am: 114c09498d
am: c9107e3263

Change-Id: I906743944b80516ed22653c9ffbeb0f6853b21e0

8 years agoDoc change: escape lt char in generic type in pre block. am: 1035b25825
Dirk Dougherty [Tue, 16 Aug 2016 01:35:37 +0000 (01:35 +0000)]
Doc change: escape lt char in generic type in pre block. am: 1035b25825
am: f98babb134

Change-Id: I2895902daa143cb427d37d44dcd0c8957c9aa082

8 years agoMerge changes I082e323e,I326bf776 into nyc-mr1-dev
Rob Carr [Tue, 16 Aug 2016 01:31:31 +0000 (01:31 +0000)]
Merge changes I082e323e,I326bf776 into nyc-mr1-dev

* changes:
  Limit seamless rotation to TRANSFORM_INVERSE_DISPLAY children.
  Allow seamless rotation before mTopIsFullscreen is set.

8 years agoMerge "Doc change: escape lt char in generic type in pre block." into nyc-dev
Dirk Dougherty [Tue, 16 Aug 2016 01:30:07 +0000 (01:30 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
am: 114c09498d

Change-Id: Ie7f79a9236823a9066867fb52bf352523730ec3f

8 years agoDoc change: escape lt char in generic type in pre block.
Dirk Dougherty [Tue, 16 Aug 2016 01:30:04 +0000 (01:30 +0000)]
Doc change: escape lt char in generic type in pre block.
am: 1035b25825

Change-Id: I4e4c01fe612bbcf05c31c6d33da6bbbe837aa468

8 years agoMerge "Doc change: escape lt char in generic type in pre block." into nyc-dev
Dirk Dougherty [Tue, 16 Aug 2016 01:29:51 +0000 (01:29 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
am: 114c09498d

Change-Id: I436715dc13b9b9e8abc8d5c84d04e1e203269e7a

8 years agoDoc change: escape lt char in generic type in pre block.
Dirk Dougherty [Tue, 16 Aug 2016 01:29:47 +0000 (01:29 +0000)]
Doc change: escape lt char in generic type in pre block.
am: 1035b25825

Change-Id: Iecc647ac91d9d6d452091c214138a6e650babac0

8 years agoMerge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1-dev
TreeHugger Robot [Tue, 16 Aug 2016 01:21:56 +0000 (01:21 +0000)]
Merge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1-dev

8 years agoMerge "Doc change: escape lt char in generic type in pre block." into nyc-dev
Dirk Dougherty [Tue, 16 Aug 2016 01:17:31 +0000 (01:17 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev

8 years agoMerge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev am...
Suprabh Shukla [Tue, 16 Aug 2016 01:04:41 +0000 (01:04 +0000)]
Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev am: f5e51cf7a9 am: ae54fae453
am: 729b0d2d8e

Change-Id: I3ece2678948835a65303b58fbac175e284b34a7f

8 years agoChanging user inactivity and warning dialog timeouts am: cafdc2e50d am: 925a30e82b
Suprabh Shukla [Tue, 16 Aug 2016 01:04:37 +0000 (01:04 +0000)]
Changing user inactivity and warning dialog timeouts am: cafdc2e50d am: 925a30e82b
am: c32b08da9d

Change-Id: I66bf2285bc9403a7b0f2fe5b5d93d86cc08209c9

8 years agoMerge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev am...
Suprabh Shukla [Tue, 16 Aug 2016 00:56:47 +0000 (00:56 +0000)]
Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev am: f5e51cf7a9
am: ae54fae453

Change-Id: I9919c3614d5b757ab1bb84568eb836e4d7d3d0a5

8 years agoChanging user inactivity and warning dialog timeouts am: cafdc2e50d
Suprabh Shukla [Tue, 16 Aug 2016 00:56:43 +0000 (00:56 +0000)]
Changing user inactivity and warning dialog timeouts am: cafdc2e50d
am: 925a30e82b

Change-Id: Ia999e7deec13087cb0084b21b737fbff7aaf0bf4

8 years agoMerge "Count failed install as finished" into nyc-mr1-dev am: ab35493046 am: 8b85bed24b
Fyodor Kupolov [Tue, 16 Aug 2016 00:50:59 +0000 (00:50 +0000)]
Merge "Count failed install as finished" into nyc-mr1-dev am: ab35493046 am: 8b85bed24b
am: 0f513637d2

Change-Id: I9168ef3ca5527224af3ee6317f0cf98c3705fa86

8 years agoCount failed install as finished am: 4f4780f023 am: dc2963f20b
Fyodor Kupolov [Tue, 16 Aug 2016 00:50:51 +0000 (00:50 +0000)]
Count failed install as finished am: 4f4780f023 am: dc2963f20b
am: ab42c265b7

Change-Id: I324f1d559ed8e73f98d2eb45b204b18212f31c02

8 years agoMerge "Count failed install as finished" into nyc-mr1-dev am: ab35493046
Fyodor Kupolov [Tue, 16 Aug 2016 00:41:36 +0000 (00:41 +0000)]
Merge "Count failed install as finished" into nyc-mr1-dev am: ab35493046
am: 8b85bed24b

Change-Id: I918da4f2cff5ad55258ee2f4c10631887b4eb113

8 years agoCount failed install as finished am: 4f4780f023
Fyodor Kupolov [Tue, 16 Aug 2016 00:41:32 +0000 (00:41 +0000)]
Count failed install as finished am: 4f4780f023
am: dc2963f20b

Change-Id: I967f127a11d195549373c357436c3a9002f39e0d

8 years agoMerge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev
Suprabh Shukla [Tue, 16 Aug 2016 00:32:56 +0000 (00:32 +0000)]
Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev
am: f5e51cf7a9

Change-Id: Ic44c61742ba56f887cf90ab6428b8c8642e355e3

8 years agoChanging user inactivity and warning dialog timeouts
Suprabh Shukla [Tue, 16 Aug 2016 00:32:55 +0000 (00:32 +0000)]
Changing user inactivity and warning dialog timeouts
am: cafdc2e50d

Change-Id: Iba74fd833ba00cbae39e09cf404f1877efd7a4d8

8 years agoMerge "Count failed install as finished" into nyc-mr1-dev
Fyodor Kupolov [Tue, 16 Aug 2016 00:25:59 +0000 (00:25 +0000)]
Merge "Count failed install as finished" into nyc-mr1-dev
am: ab35493046

Change-Id: I5e65fd656bcad8b8de5742e01e90709954bb7102

8 years agoCount failed install as finished
Fyodor Kupolov [Tue, 16 Aug 2016 00:25:57 +0000 (00:25 +0000)]
Count failed install as finished
am: 4f4780f023

Change-Id: Ia1ddcde1b9bcb37a266589ff53ed01632e442c7b

8 years agoMerge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev
TreeHugger Robot [Tue, 16 Aug 2016 00:21:34 +0000 (00:21 +0000)]
Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev

8 years agoMerge "Fix bug where RemoteInputView didn't reopen the IME" into nyc-mr1-dev am:...
Adrian Roos [Tue, 16 Aug 2016 00:07:55 +0000 (00:07 +0000)]
Merge "Fix bug where RemoteInputView didn't reopen the IME" into nyc-mr1-dev am: 094b8b3321 am: 88dead0f19
am: 81e281caf8

Change-Id: Idac95259783c2e2edbb019db028b15e6fe311e49

8 years agoFix bug where RemoteInputView didn't reopen the IME am: 0356865dad am: 2bf73bbb43
Adrian Roos [Tue, 16 Aug 2016 00:07:51 +0000 (00:07 +0000)]
Fix bug where RemoteInputView didn't reopen the IME am: 0356865dad am: 2bf73bbb43
am: 160410a016

Change-Id: Id438e2fb6a6ce42f4264f4ca4edbbb59fa715039

8 years agoMerge "Count failed install as finished" into nyc-mr1-dev
TreeHugger Robot [Mon, 15 Aug 2016 23:58:06 +0000 (23:58 +0000)]
Merge "Count failed install as finished" into nyc-mr1-dev

8 years agoMerge "Fix bug where RemoteInputView didn't reopen the IME" into nyc-mr1-dev am:...
Adrian Roos [Mon, 15 Aug 2016 23:57:48 +0000 (23:57 +0000)]
Merge "Fix bug where RemoteInputView didn't reopen the IME" into nyc-mr1-dev am: 094b8b3321
am: 88dead0f19

Change-Id: Ib21b08a7ad50aa7262778ca1930a10e782d37aa5

8 years agoFix bug where RemoteInputView didn't reopen the IME am: 0356865dad
Adrian Roos [Mon, 15 Aug 2016 23:57:45 +0000 (23:57 +0000)]
Fix bug where RemoteInputView didn't reopen the IME am: 0356865dad
am: 2bf73bbb43

Change-Id: I5e5561ee9831946325df02f806d9c32cbb30555b

8 years agoMerge "Fix bug where RemoteInputView didn't reopen the IME" into nyc-mr1-dev
Adrian Roos [Mon, 15 Aug 2016 23:49:01 +0000 (23:49 +0000)]
Merge "Fix bug where RemoteInputView didn't reopen the IME" into nyc-mr1-dev
am: 094b8b3321

Change-Id: I308a6550ce47b0083b28a2a2cf89d82b692b2939

8 years agoFix bug where RemoteInputView didn't reopen the IME
Adrian Roos [Mon, 15 Aug 2016 23:48:58 +0000 (23:48 +0000)]
Fix bug where RemoteInputView didn't reopen the IME
am: 0356865dad

Change-Id: I983cd6d0abc35af375d95722606969f13aebb9f5

8 years agoMerge "Fix bug where RemoteInputView didn't reopen the IME" into nyc-mr1-dev
TreeHugger Robot [Mon, 15 Aug 2016 23:45:04 +0000 (23:45 +0000)]
Merge "Fix bug where RemoteInputView didn't reopen the IME" into nyc-mr1-dev

8 years agoMerge "AAPT: Fix use-after-free error" into nyc-mr1-dev am: 1031069f1d am: ae5a79ad12
Adam Lesinski [Mon, 15 Aug 2016 23:33:04 +0000 (23:33 +0000)]
Merge "AAPT: Fix use-after-free error" into nyc-mr1-dev am: 1031069f1d am: ae5a79ad12
am: 0ffd41b926

Change-Id: I0e9d98a34088078b2f2f8d1f1eb0e0acea82267b

8 years agoAAPT: Fix use-after-free error am: 193ed74c2d am: 646f2d9c33
Adam Lesinski [Mon, 15 Aug 2016 23:33:01 +0000 (23:33 +0000)]
AAPT: Fix use-after-free error am: 193ed74c2d am: 646f2d9c33
am: 9e8da4a476

Change-Id: I591fd51bf456cd42fe8c633de8924a9f2c844866

8 years agoMerge "AAPT: Fix use-after-free error" into nyc-mr1-dev am: 1031069f1d
Adam Lesinski [Mon, 15 Aug 2016 23:22:13 +0000 (23:22 +0000)]
Merge "AAPT: Fix use-after-free error" into nyc-mr1-dev am: 1031069f1d
am: ae5a79ad12

Change-Id: I8749fcefe6c98cf6609abac49b368fd2c5201eac

8 years agoAAPT: Fix use-after-free error am: 193ed74c2d
Adam Lesinski [Mon, 15 Aug 2016 23:22:04 +0000 (23:22 +0000)]
AAPT: Fix use-after-free error am: 193ed74c2d
am: 646f2d9c33

Change-Id: If9fe7a52e62ae6b2900aa187996b4b785894ab03

8 years agoMerge "AAPT: Fix use-after-free error" into nyc-mr1-dev
Adam Lesinski [Mon, 15 Aug 2016 23:11:49 +0000 (23:11 +0000)]
Merge "AAPT: Fix use-after-free error" into nyc-mr1-dev
am: 1031069f1d

Change-Id: Ic2fce0e9b9769630f9a59065f317ea34201be079

8 years agoAAPT: Fix use-after-free error
Adam Lesinski [Mon, 15 Aug 2016 23:11:37 +0000 (23:11 +0000)]
AAPT: Fix use-after-free error
am: 193ed74c2d

Change-Id: I04cd726dae52c5010ad99409f0f77a10267bdeed

8 years agoMerge "Add missing remote conference property set." into nyc-mr1-dev am: aa9b18f90a...
Tyler Gunn [Mon, 15 Aug 2016 22:59:39 +0000 (22:59 +0000)]
Merge "Add missing remote conference property set." into nyc-mr1-dev am: aa9b18f90a am: 273f01785d
am: f0cbd6244c

Change-Id: I19bdd7a0b551f545d9ed43a069170b7fa84ff4c5

8 years agoAdd missing remote conference property set. am: 04ce757860 am: 69c13eca0e
Tyler Gunn [Mon, 15 Aug 2016 22:59:35 +0000 (22:59 +0000)]
Add missing remote conference property set. am: 04ce757860 am: 69c13eca0e
am: cf81b5a886

Change-Id: I644238575fdeb52b07db1a438c42b3ef39d60dce

8 years agoMerge "AAPT: Fix use-after-free error" into nyc-mr1-dev
TreeHugger Robot [Mon, 15 Aug 2016 22:56:00 +0000 (22:56 +0000)]
Merge "AAPT: Fix use-after-free error" into nyc-mr1-dev

8 years agoMerge "Add missing remote conference property set." into nyc-mr1-dev am: aa9b18f90a
Tyler Gunn [Mon, 15 Aug 2016 22:50:34 +0000 (22:50 +0000)]
Merge "Add missing remote conference property set." into nyc-mr1-dev am: aa9b18f90a
am: 273f01785d

Change-Id: I53490a7d67d8dc909049338ec7470acdc8cf801f

8 years agoAdd missing remote conference property set. am: 04ce757860
Tyler Gunn [Mon, 15 Aug 2016 22:50:30 +0000 (22:50 +0000)]
Add missing remote conference property set. am: 04ce757860
am: 69c13eca0e

Change-Id: Ia6db6017bde649b451c82ec3280deeba4e3989b7

8 years agoChanging user inactivity and warning dialog timeouts
Suprabh Shukla [Mon, 15 Aug 2016 19:50:32 +0000 (12:50 -0700)]
Changing user inactivity and warning dialog timeouts

Increasing the inactivity timeout to 90 seconds to accomodate the longest
app. demo video for retail. Also, removing the warning dialog by setting
the countdown timeout to 0, so it can be re-enabled by overriding the value
through gservices if needed.

Bug: 30426773
Bug: 30866394
Change-Id: I6735943adfaf3d210ed9eb9163b5c7ce8dcf53ec

8 years agoMerge "Add missing remote conference property set." into nyc-mr1-dev
Tyler Gunn [Mon, 15 Aug 2016 22:42:38 +0000 (22:42 +0000)]
Merge "Add missing remote conference property set." into nyc-mr1-dev
am: aa9b18f90a

Change-Id: I1176b63a1d84829b79b9e540747a27b777e88c47

8 years agoAdd missing remote conference property set.
Tyler Gunn [Mon, 15 Aug 2016 22:42:36 +0000 (22:42 +0000)]
Add missing remote conference property set.
am: 04ce757860

Change-Id: Iba041654d136b3cd00cfc19899cefa68ebf01b76

8 years agoFixed an issue where the background could show in a wrong way am: d381bc3133 am:...
Selim Cinek [Mon, 15 Aug 2016 22:37:37 +0000 (22:37 +0000)]
Fixed an issue where the background could show in a wrong way am: d381bc3133 am: 3ff0c5b3ce
am: d59911c6a2

Change-Id: I0652e069ccd63a1ba47152a09ba7fec990b788aa

8 years agoMerge "Docs only: N is no longer a shrug." into nyc-mr1-dev am: 6af2db3824 am: 1377b38053
Dianne Hackborn [Mon, 15 Aug 2016 22:37:33 +0000 (22:37 +0000)]
Merge "Docs only: N is no longer a shrug." into nyc-mr1-dev am: 6af2db3824 am: 1377b38053
am: 80faec0d43

Change-Id: I41b7515376760eccfba146135c44cfe1ec9b4bf3

8 years agoDocs only: N is no longer a shrug. am: c1b607df71 am: 6fe27966e2
Dianne Hackborn [Mon, 15 Aug 2016 22:37:29 +0000 (22:37 +0000)]
Docs only: N is no longer a shrug. am: c1b607df71 am: 6fe27966e2
am: dbe43ee9ba

Change-Id: I8ba0795a2d4e25ede3654b9ab4dd95c5bed74ee1

8 years agoMerge "Add missing remote conference property set." into nyc-mr1-dev
Tyler Gunn [Mon, 15 Aug 2016 22:32:02 +0000 (22:32 +0000)]
Merge "Add missing remote conference property set." into nyc-mr1-dev

8 years agoCount failed install as finished
Fyodor Kupolov [Mon, 15 Aug 2016 22:29:47 +0000 (15:29 -0700)]
Count failed install as finished

Otherwise DEMO_USER_SETUP_COMPLETE will not be set.

Bug: 30445353
Change-Id: Id2a0c1b1643dd9846328a20f4c67e11e69b3bc84

8 years agoMerge "resolve merge conflicts of 28117e0 to master"
Chong Zhang [Mon, 15 Aug 2016 22:27:29 +0000 (22:27 +0000)]
Merge "resolve merge conflicts of 28117e0 to master"

8 years agoLimit seamless rotation to TRANSFORM_INVERSE_DISPLAY children.
Robert Carr [Mon, 15 Aug 2016 19:19:00 +0000 (12:19 -0700)]
Limit seamless rotation to TRANSFORM_INVERSE_DISPLAY children.

In what can only be called an unfortunate workaround we require
seamlessly rotated child windows to have the
TRANSFORM_TO_DISPLAY_INVERSE
flag. Due to limitations in the client API, there is no way for the
client to set this flag in a race free fashion. If we seamlessly rotate
a window which does not have this flag, but then it gains it,
we will have an incorrect visual result (rotated buffer contents). This
means if we want to support seamlessly rotating windows which could gain
this flag, we can't seamlessly rotate windows which don't have it. This
unfortunately limits seamless rotation in N to Camera framework users,
native code, and applications without child windows. This is unfortunate
but having the camera work was always our primary use case, and it's not
as if we are offering an API for it, it's a behind the scenes
enhancement of ROTATION_ANIMATION_JUMPCUT.

Bug: 30171992
Change-Id: I082e323ee569cfc1ff2559657cc22194c251c7ec

8 years agoFixed an issue where the background could show in a wrong way am: d381bc3133
Selim Cinek [Mon, 15 Aug 2016 22:10:54 +0000 (22:10 +0000)]
Fixed an issue where the background could show in a wrong way am: d381bc3133
am: 3ff0c5b3ce

Change-Id: I1f02f607593fbf9adcaae6cf92bb5ec559bcaa21

8 years agoFix bug where RemoteInputView didn't reopen the IME
Adrian Roos [Mon, 15 Aug 2016 22:02:46 +0000 (15:02 -0700)]
Fix bug where RemoteInputView didn't reopen the IME

Editable TextViews are implicitly selectable. Setting the selectable
property to true however causes a bug where the onTouch logic thinks
the view is not editable and thus doesn't show the IME when clicking
that view.

Change-Id: I9dd6139195bd98b26293e330290650d4e5549a6d
Fixes: 30595718

8 years agoFixed an issue where the background could show in a wrong way
Selim Cinek [Mon, 15 Aug 2016 22:02:18 +0000 (22:02 +0000)]
Fixed an issue where the background could show in a wrong way
am: d381bc3133

Change-Id: I219e4809a6a9f839353e049d4d563ece37866ca2

8 years agoFix google-explicit-constructor warnings.
Chih-Hung Hsieh [Mon, 15 Aug 2016 21:45:02 +0000 (14:45 -0700)]
Fix google-explicit-constructor warnings.

* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: I7422d703de17c4266d2a022990d0e1df40f48226

8 years agoresolve merge conflicts of 28117e0 to master
Chong Zhang [Mon, 15 Aug 2016 21:39:25 +0000 (14:39 -0700)]
resolve merge conflicts of 28117e0 to master

Change-Id: I6953ce86d9cf3a3bb9e22efd11e004ee0695d3c0

8 years agoFixed an issue where the background could show in a wrong way
Selim Cinek [Mon, 15 Aug 2016 19:40:57 +0000 (12:40 -0700)]
Fixed an issue where the background could show in a wrong way

Change-Id: Icefeb2275d6cbabc576c35990ce4441b3a41ebd9
Fixes: 30855224

8 years agoMerge "Initial commit of Java support for hardware binder."
Andreas Huber [Mon, 15 Aug 2016 21:36:41 +0000 (21:36 +0000)]
Merge "Initial commit of Java support for hardware binder."

8 years agoMerge "Docs only: N is no longer a shrug." into nyc-mr1-dev am: 6af2db3824
Dianne Hackborn [Mon, 15 Aug 2016 21:35:57 +0000 (21:35 +0000)]
Merge "Docs only: N is no longer a shrug." into nyc-mr1-dev am: 6af2db3824
am: 1377b38053

Change-Id: If3400e262cdfa9bdbf19af1dcad61bce967ba06b