Commit Graph

60348 Commits

Author SHA1 Message Date
Steven Ng
335e4bdf60 Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev am: e333b2eb81
am: a62fc512da

* commit 'a62fc512dae936ec1d8573cacbd4e649ecd9be1f':
  Add a Global setting for disabling OEM unlocking setting

Change-Id: I8e0f6f00599923be663c9808ffa187bbe014121c
2016-05-13 11:38:43 +00:00
Steven Ng
a62fc512da Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev
am: e333b2eb81

* commit 'e333b2eb81958cc8d27eb687ebd84844a84919ea':
  Add a Global setting for disabling OEM unlocking setting

Change-Id: I625b51c1e257afa095dfacb3bcf481fb2068b56f
2016-05-13 11:36:20 +00:00
Steven Ng
e333b2eb81 Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev 2016-05-13 11:27:59 +00:00
Andrii Kulian
42a2e42f94 Merge "Close leaked windows when trying to preserve main one" into nyc-dev am: 4ef107bb7a am: 1c4c2caa4c
am: 49f7135fef

* commit '49f7135fef3a982edd04a292a8c46afff4d6ef86':
  Close leaked windows when trying to preserve main one

Change-Id: Ic83f1f4a07bed89bf77e96ae16a273c859624948
2016-05-13 03:35:42 +00:00
Andrii Kulian
49f7135fef Merge "Close leaked windows when trying to preserve main one" into nyc-dev am: 4ef107bb7a
am: 1c4c2caa4c

* commit '1c4c2caa4c070ae07c30e61c3864e612eea797f2':
  Close leaked windows when trying to preserve main one

Change-Id: Ie9f776dafecf4600f3e73f9bc68b9c85d2826597
2016-05-13 03:33:12 +00:00
Andrii Kulian
1c4c2caa4c Merge "Close leaked windows when trying to preserve main one" into nyc-dev
am: 4ef107bb7a

* commit '4ef107bb7ad0c1f28db710374bb118e6658d3238':
  Close leaked windows when trying to preserve main one

Change-Id: I20b5d6ab8adbb97cffca52e1daf66ed939d508b8
2016-05-13 03:30:45 +00:00
Andrii Kulian
48164fd554 Merge "Close leaked windows when trying to preserve main one" into nyc-dev
am: 4ef107bb7a

* commit '4ef107bb7ad0c1f28db710374bb118e6658d3238':
  Close leaked windows when trying to preserve main one

Change-Id: Ie98ad06c08eb4486d98327201fb7fa10456a2459
2016-05-13 03:30:41 +00:00
Andrii Kulian
4ef107bb7a Merge "Close leaked windows when trying to preserve main one" into nyc-dev 2016-05-13 03:24:34 +00:00
Vladislav Kaznacheev
89126c6a1f Merge "Partial fix for jumping freeform windows" into nyc-dev am: d5c94d1af3 am: a072db029f
am: 7f163a39a3

* commit '7f163a39a37ce2c5ef54787c7b8e6bea663a03ca':
  Partial fix for jumping freeform windows

Change-Id: Ic2f89842adbe119d59fa868bd5ea5721735a7fce
2016-05-13 01:31:30 +00:00
Vladislav Kaznacheev
7f163a39a3 Merge "Partial fix for jumping freeform windows" into nyc-dev am: d5c94d1af3
am: a072db029f

* commit 'a072db029f876e37bd0bd855c0909192d2efecec':
  Partial fix for jumping freeform windows

Change-Id: Icf2b9daf7e3688d164d0b0236bb065eabe29468f
2016-05-13 01:28:45 +00:00
Vladislav Kaznacheev
a072db029f Merge "Partial fix for jumping freeform windows" into nyc-dev
am: d5c94d1af3

* commit 'd5c94d1af3c042fa373d0864c07387a3d2125a08':
  Partial fix for jumping freeform windows

Change-Id: Icf1d177ba6b04629beb40188dcbde63a19b3dbf9
2016-05-13 01:26:01 +00:00
Vladislav Kaznacheev
9e13b1f218 Merge "Partial fix for jumping freeform windows" into nyc-dev
am: d5c94d1af3

* commit 'd5c94d1af3c042fa373d0864c07387a3d2125a08':
  Partial fix for jumping freeform windows

Change-Id: Ifdff3f152787fb6c8739fddf1767d0ce3e4b0e26
2016-05-13 01:25:52 +00:00
TreeHugger Robot
d5c94d1af3 Merge "Partial fix for jumping freeform windows" into nyc-dev 2016-05-13 01:21:12 +00:00
Steve Pomeroy
4c8c470015 Merge "ContentValues: improve documentation" into nyc-dev
am: 33d0ff9959

* commit '33d0ff995976533f9989cd6ec95c3de5ba9aee05':
  ContentValues: improve documentation

Change-Id: I29244d0c039abcd08139e2814bb465e2e5b9e03a
2016-05-13 01:17:57 +00:00
Steve Pomeroy
115f43cda7 Merge "Fix documentation bug in SQLiteDatabase" into nyc-dev
am: d07a3c4203

* commit 'd07a3c42034b35a0474619f9395a9d97abc83069':
  Fix documentation bug in SQLiteDatabase

Change-Id: I6df7ab83572b128672af473941c487ac20f5d077
2016-05-13 01:17:54 +00:00
TreeHugger Robot
33d0ff9959 Merge "ContentValues: improve documentation" into nyc-dev 2016-05-13 01:12:52 +00:00
Vladislav Kaznacheev
cb4bbd7af8 Partial fix for jumping freeform windows
Currently every focus change causes a freeform window to jump
for a few frames. The size of the jump is equal to the difference
in inset size (which is derived directly from the window elevation).

This problem goes away for most real use cases if the insets are
not allowed to decrease.

Bug: 28318973
Bug: 22668382
Change-Id: I77ca440a7d9c89cc4d45e6667bf37da94a5c8a9a
2016-05-12 23:56:32 +00:00
Steve Pomeroy
c240b607f7 Fix documentation bug in SQLiteDatabase
The documentation incorrectly states that, "[insertWithOnConflict
returns] the primary key of the existing row if the input param
'conflictAlgorithm' = CONFLICT_IGNORE". Unfortunately, SQLite does
not provide such functionality.

Close: https://code.google.com/p/android/issues/detail?id=13045

Signed-off-by: Steve Pomeroy <steve@staticfree.info>

(cherry picked from commit 8fc3144fa5)

Change-Id: I89e56428e612d667259744e2bc3df124e5a2aa0e
2016-05-12 16:53:10 -07:00
Steve Pomeroy
b31b1cc5ff ContentValues: improve documentation
Correct and clarify the documentation for ContentValues.

Signed-off-by: Steve Pomeroy <steve@staticfree.info>

(cherry picked from commit 1276b5f29e)

Change-Id: Id6f4e93dcca64dd41daeb4066d804ff173f4747b
2016-05-12 16:51:52 -07:00
TreeHugger Robot
84129e3251 Merge "Minor optimizations" 2016-05-12 23:37:56 +00:00
Yigit Boyar
310128df9f Merge "Respect add focusables flags" into nyc-dev am: 4c6eeb67a2 am: 16b53c67c1
am: 734ca44a24

* commit '734ca44a247eda1c92ba56816f5dad0ec1387316':
  Respect add focusables flags

Change-Id: I4656e9eafbcd603358c1905bb89d4c75b889bcb8
2016-05-12 23:33:01 +00:00
Yigit Boyar
734ca44a24 Merge "Respect add focusables flags" into nyc-dev am: 4c6eeb67a2
am: 16b53c67c1

* commit '16b53c67c1be40c13359612397de19995812decc':
  Respect add focusables flags

Change-Id: If08aa608fb9e77b391bf8b68be50caf438305ae9
2016-05-12 23:29:53 +00:00
Yigit Boyar
16b53c67c1 Merge "Respect add focusables flags" into nyc-dev
am: 4c6eeb67a2

* commit '4c6eeb67a232fdbca43513d8414e38a55c40d75e':
  Respect add focusables flags

Change-Id: I63af32dd31750d8af612a4c562ec1e1930129151
2016-05-12 23:27:19 +00:00
Yigit Boyar
bd6f5fc3a0 Merge "Respect add focusables flags" into nyc-dev
am: 4c6eeb67a2

* commit '4c6eeb67a232fdbca43513d8414e38a55c40d75e':
  Respect add focusables flags

Change-Id: I8bb85f17fa0d85ae9d58aa026711e298c1b0f09a
2016-05-12 23:27:19 +00:00
Yigit Boyar
4c6eeb67a2 Merge "Respect add focusables flags" into nyc-dev 2016-05-12 23:19:22 +00:00
Steve Pomeroy
061186d72a Merge "Fix documentation bug in SQLiteDatabase" am: 21d061ec2e am: b654fae4db am: 88968cc3ba
am: 54bb5dbd65

* commit '54bb5dbd65005529494b2efc81801839e4a4b40b':
  Fix documentation bug in SQLiteDatabase

Change-Id: I19fa6bca88f119da8248dcee31adc87b70a5be5e
2016-05-12 22:36:27 +00:00
Steve Pomeroy
54bb5dbd65 Merge "Fix documentation bug in SQLiteDatabase" am: 21d061ec2e am: b654fae4db
am: 88968cc3ba

* commit '88968cc3baefc453d3564ca1546ae87adbbd1f31':
  Fix documentation bug in SQLiteDatabase

Change-Id: I67d580b53b8fb34ab4c7cbe0bd6dda7e31895e51
2016-05-12 22:34:02 +00:00
Steve Pomeroy
88968cc3ba Merge "Fix documentation bug in SQLiteDatabase" am: 21d061ec2e
am: b654fae4db

* commit 'b654fae4dbff8b384ef3074ff762f0ed5b8b1034':
  Fix documentation bug in SQLiteDatabase

Change-Id: I8917758d9d0a41105be1adc596d3468cff22c739
2016-05-12 22:31:52 +00:00
Steve Pomeroy
3f0fcdb1f6 Merge "ContentValues: improve documentation" am: b44d4207c1 am: 78e5a04902 am: b6c826227d
am: d88ca0e659

* commit 'd88ca0e659d89147e62addac01ce08192beb051e':
  ContentValues: improve documentation

Change-Id: Id42ec6e2c361bd0b8a279c8e42f8ac5232f0850e
2016-05-12 22:31:49 +00:00
Steve Pomeroy
d88ca0e659 Merge "ContentValues: improve documentation" am: b44d4207c1 am: 78e5a04902
am: b6c826227d

* commit 'b6c826227dfbc1cdb565098a9df5b897dd1137f3':
  ContentValues: improve documentation

Change-Id: I6a3f730971777a19460f9afeafca1878c4fd522d
2016-05-12 22:29:25 +00:00
Steve Pomeroy
b654fae4db Merge "Fix documentation bug in SQLiteDatabase"
am: 21d061ec2e

* commit '21d061ec2e1a097b8759c55e2368ffa6024b6f92':
  Fix documentation bug in SQLiteDatabase

Change-Id: I986c5024e1c4843ec891ffb76f467e42aacb89f6
2016-05-12 22:29:22 +00:00
Steve Pomeroy
b6c826227d Merge "ContentValues: improve documentation" am: b44d4207c1
am: 78e5a04902

* commit '78e5a0490278bc12cb7e3c12225aba05639c922f':
  ContentValues: improve documentation

Change-Id: Ifce0816dc5565e6b7944de92ee814f97cb4753b6
2016-05-12 22:27:12 +00:00
Treehugger Robot
21d061ec2e Merge "Fix documentation bug in SQLiteDatabase" 2016-05-12 22:25:20 +00:00
Steve Pomeroy
78e5a04902 Merge "ContentValues: improve documentation"
am: b44d4207c1

* commit 'b44d4207c1dc2131e022ddcad74be6d121a51b5e':
  ContentValues: improve documentation

Change-Id: I6c50514fa7b3531da96364d5624e3b093b984007
2016-05-12 22:24:41 +00:00
Yigit Boyar
4c6e983000 Respect add focusables flags
This CL fixes 2 bugs in View's addFocusables implementations.

1) addFocusables(list, dir) method was always returning focusables in
touch mode even if the device is not in touch mode.

2) addFocusables(list, dir, mode) was not respecting the provided mod.

Bug: 28745577
Change-Id: I9b9e5af27f8f5b1bb3cc601584fdad7c73e54a5d
2016-05-12 15:11:13 -07:00
John Reck
41f864ec45 Minor optimizations
Don't save matrix if we just need clip saved
Early-reject the easy-to-reject cases in Canvas
before hitting JNI

Change-Id: I385ef90a31efbda31ce37837152f626aad553ee7
2016-05-12 15:07:49 -07:00
Dimitry Ivanov
e543776d59 Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev am: 7f0708390b am: 76766d29b3
am: 61820a6a63

* commit '61820a6a63e4a10fdab7f9bf7a9e33b0744be253':
  Move Vulkan layer path setup to ApplicationLoaders

Change-Id: Iee0980f34860e51e64aa6d0f9d12abf730d4343f
2016-05-12 21:26:16 +00:00
Jesse Hall
61820a6a63 Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev am: 7f0708390b
am: 76766d29b3

* commit '76766d29b33ebb059d36bc20dd2a1c364ebe2eca':
  Move Vulkan layer path setup to ApplicationLoaders

Change-Id: I251ec5b438024e7cb878bab4368881272baeb2fc
2016-05-12 21:23:51 +00:00
Dimitry Ivanov
76766d29b3 Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev
am: 7f0708390b

* commit '7f0708390b3006965fe640c72c4254eb74daca3a':
  Move Vulkan layer path setup to ApplicationLoaders

Change-Id: I406dad31babb52d601e1212c4672f1ce7cd9aa57
2016-05-12 21:21:25 +00:00
Dimitry Ivanov
69efd6c0c2 Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev
am: 7f0708390b

* commit '7f0708390b3006965fe640c72c4254eb74daca3a':
  Move Vulkan layer path setup to ApplicationLoaders

Change-Id: I1adef3e79249cea465a3043c39bccd07dbfe805a
2016-05-12 21:21:23 +00:00
Steve Pomeroy
1276b5f29e ContentValues: improve documentation
Correct and clarify the documentation for ContentValues.

Change-Id: Iddf54da093e97c32da2568eab8802b1b2715303b
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
2016-05-12 21:18:15 +00:00
Steve Pomeroy
8fc3144fa5 Fix documentation bug in SQLiteDatabase
The documentation incorrectly states that, "[insertWithOnConflict
returns] the primary key of the existing row if the input param
'conflictAlgorithm' = CONFLICT_IGNORE". Unfortunately, SQLite does
not provide such functionality.

Close: https://code.google.com/p/android/issues/detail?id=13045

Change-Id: Ife919c4dcf7bf703b692d338d1fb5844a532dd39
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
2016-05-12 21:16:55 +00:00
Jesse Hall
7f0708390b Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev 2016-05-12 21:13:26 +00:00
Adrian Roos
9240b15a1a Merge "DPM control for remote input when locked" into nyc-dev am: 11c8f5315b am: f46fdf877e
am: d5bd2b647c

* commit 'd5bd2b647c8f0acaffae72090748d346cae2351b':
  DPM control for remote input when locked

Change-Id: Ic97f9dbb0f4013709b62ee8dbf7d49c29c5fe807
2016-05-12 21:04:41 +00:00
Adrian Roos
d5bd2b647c Merge "DPM control for remote input when locked" into nyc-dev am: 11c8f5315b
am: f46fdf877e

* commit 'f46fdf877ef54adc236698635967ff79d7a0dfe2':
  DPM control for remote input when locked

Change-Id: I7eb3cdf17b4a61865bfe85ae6d9c281b113aeb9f
2016-05-12 21:01:32 +00:00
Adrian Roos
a4f8525fdc Merge "DPM control for remote input when locked" into nyc-dev
am: 11c8f5315b

* commit '11c8f5315b195d6a63f981a7ff434fa7937ba5d3':
  DPM control for remote input when locked

Change-Id: Id7074ffdc541d53d4607652cefc4bfdecaaaa335
2016-05-12 20:58:55 +00:00
Adrian Roos
f46fdf877e Merge "DPM control for remote input when locked" into nyc-dev
am: 11c8f5315b

* commit '11c8f5315b195d6a63f981a7ff434fa7937ba5d3':
  DPM control for remote input when locked

Change-Id: I330777f47f51dee00623ace614271f42b6d4fca7
2016-05-12 20:58:53 +00:00
Adrian Roos
11c8f5315b Merge "DPM control for remote input when locked" into nyc-dev 2016-05-12 20:52:26 +00:00
Andrii Kulian
eac0ea5cdf Close leaked windows when trying to preserve main one
When app has several windows and activity is relaunched + we try to preserve
main window - other windows just stayed around until removed by timeout or
replaced by app. There was a problem when one of the windows registered
broadcast receiver and set its own timer to remove it. In this case all
receivers were removed by framework because windows were considered leaked
and apps' timer caused crash when trying to remove registered receiver.

This CL removes all windows expect the main one, which we're trying to
preserve in this case.

Bug: 28337135
Change-Id: Ib8790cc8c61801f11d871ba3803bb0ebc3d3be01
2016-05-12 13:37:05 -07:00
Chad Brubaker
1e66b26c41 Merge "Support TrustedCertificateStore.findAllIssuers"
am: d58e7b2d15

* commit 'd58e7b2d15f4ca60d96bd0fa5e294c40eea76c14':
  Support TrustedCertificateStore.findAllIssuers

Change-Id: If29fab8118a025b5339b0076eaba43d99bbca04a
2016-05-12 19:26:47 +00:00