Commit Graph

64627 Commits

Author SHA1 Message Date
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
4c6eeb67a2 Merge "Respect add focusables flags" into nyc-dev 2016-05-12 23:19:22 +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
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
Philip Cuadra
0513394f85 Merge "Pinner service for pinning files into memory" into nyc-dev
am: b41088b4df

* commit 'b41088b4dfa8b077541cd3be69c51bd4bba4e938':
  Pinner service for pinning files into memory

Change-Id: I6dc3f40dbbb5e327976f665de1451eb1d416ee2a
2016-05-12 22:04:26 +00:00
Philip Cuadra
b41088b4df Merge "Pinner service for pinning files into memory" into nyc-dev 2016-05-12 21:55:29 +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
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
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
11c8f5315b Merge "DPM control for remote input when locked" into nyc-dev 2016-05-12 20:52:26 +00:00
Philip Cuadra
7bd0fdd639 Pinner service for pinning files into memory
Pin key files into memory to prevent having to fetch from flash
after boot.  Improves system performance by preventing page cache
thrash.  Retrieves files from a device-specific overlay to allow
specialization.

bug 28251566

Change-Id: I8532f52bd70271794dd7576976d13a524849ce7b
2016-05-12 13:12:20 -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
Chad Brubaker
d58e7b2d15 Merge "Support TrustedCertificateStore.findAllIssuers" 2016-05-12 19:18:47 +00:00
Chad Brubaker
d4b6c696e1 Support TrustedCertificateStore.findAllIssuers
(cherry-picked from commit aa6c3c3e25)
Change-Id: I176ec42c9907e50ee218e4fb352b530ca797be46
2016-05-12 11:15:47 -07:00
Tingting Wang
2fc6bf3936 Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev
am: 752129929f

* commit '752129929fcbe8d7740d25014f7878e835d4f4ef':
  Rename CONTACT_METADATA_SYNC GService Flag.

Change-Id: Ibef9e072b3ff5216de1802558d93e66661bd7764
2016-05-12 17:16:17 +00:00
Tingting Wang
752129929f Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev 2016-05-12 17:11:44 +00:00
Makoto Onuki
82c64a485a Merge "Remove ShortcutManager" into nyc-dev
am: 26edcba2c9

* commit '26edcba2c950701ff2dd8794687552bc37e4dfc8':
  Remove ShortcutManager

Change-Id: I4b99a5fe6d73400070ba5829573255283c7b7a5c
2016-05-12 16:36:06 +00:00
Makoto Onuki
26edcba2c9 Merge "Remove ShortcutManager" into nyc-dev 2016-05-12 16:32:56 +00:00
Alan Viverette
a6c89dd6a0 Merge "Remove extra logging in DatePicker" into nyc-dev
am: c952b035b2

* commit 'c952b035b27c858a8d0c794282146f5dd31020e9':
  Remove extra logging in DatePicker

Change-Id: I419291c2c4d4b04e4b508c244b5a5e57c2f57ce5
2016-05-12 15:02:39 +00:00
Alan Viverette
c952b035b2 Merge "Remove extra logging in DatePicker" into nyc-dev 2016-05-12 14:57:58 +00:00
Chris Wren
08eb83f8b0 Merge "document the return type of getImportance" into nyc-dev
am: 3041d49d88

* commit '3041d49d888cf0732c8aafb88d1d931b696b1d41':
  document the return type of getImportance

Change-Id: I03bb7490b62e749e16a417297a672769283aebdd
2016-05-12 13:00:50 +00:00
Chris Wren
3041d49d88 Merge "document the return type of getImportance" into nyc-dev 2016-05-12 12:53:51 +00:00
Dimitry Ivanov
0997908c95 Move Vulkan layer path setup to ApplicationLoaders
ThreadedRenderer was never the right place for this anyway, and
ApplicationLoaders can provide both the full library search path (not
just the extracted native library dir) as well as the application loader
namespace.

Bug: 28213888
Change-Id: Ibcc0a9178da4dba6f3f3105932fdac1a1d0261af
2016-05-11 22:59:10 -07:00
Jorim Jaggi
3381482586 Merge "Fix smallest width configuration calculation" into nyc-dev
am: 63c09fd6cd

* commit '63c09fd6cd5db31180c3db119d097fb3c5a0e505':
  Fix smallest width configuration calculation

Change-Id: Id753dcb396d31c8bb250581889fb190e396ecf6d
2016-05-12 01:55:14 +00:00
Jorim Jaggi
63c09fd6cd Merge "Fix smallest width configuration calculation" into nyc-dev 2016-05-12 01:50:05 +00:00
Jorim Jaggi
8563943bd3 Fix smallest width configuration calculation
For calculating the smallest width, we need to iterate through all possible
orientations, snap the task bounds to a valid snap target and then use the
smallest width across all orientations.

In addition to that, when flinging the divider handle to the bottom of the
screen, we need to pass in fullscreen task bounds to avoid that this new
logic applies so the maximizing app only receives one configuration change.

Change-Id: I37aa9a40938517dfaf26770eb41327d76aec7c62
Fixes: 28469673
2016-05-11 18:33:01 -07:00
Adam Lesinski
04d676b3ae Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
am: 3723194dc8

* commit '3723194dc831f4734d465602b2e21449d9357c2e':
  BluetoothManager: Make requestControllerActivityInfo one call

Change-Id: I0b86c2bd861a7de788917c6bae7bccf02dc97b31
2016-05-12 01:11:21 +00:00
Adam Lesinski
3723194dc8 Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev 2016-05-12 00:59:29 +00:00
Dianne Hackborn
fc101121f2 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev
am: b3edcd78d2

* commit 'b3edcd78d25372a2a1e7520b63da1d5d38fbe59f':
  Fix issue #28400000: Settings memory UI still showing z-ram...

Change-Id: I1eda5e59bdd122dd35a8025b35b63b216ca9e60d
2016-05-12 00:50:42 +00:00
Dianne Hackborn
b3edcd78d2 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev 2016-05-12 00:40:18 +00:00
Aurimas Liutikas
69abd9bac2 Merge "Stop saving ActionMenuItemView state." into nyc-dev
am: b9bb8e88c6

* commit 'b9bb8e88c66a80ca43e5aabad94348fdaf0fef1d':
  Stop saving ActionMenuItemView state.

Change-Id: Ic8ee0f6d55cae78dd6da72ea8ea269b1ad735753
2016-05-12 00:39:19 +00:00
Jim Miller
3c1e640d83 Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev
am: 254d9e4f41

* commit '254d9e4f410f63ed1ba3f917e207731c5d9d6538':
  Fix KeyguardManager.isSecure() to observe work profile

Change-Id: Iaa814af0752a90ec53eed44b4d31b6bfdc13bfc3
2016-05-12 00:39:02 +00:00
TreeHugger Robot
b9bb8e88c6 Merge "Stop saving ActionMenuItemView state." into nyc-dev 2016-05-11 23:54:41 +00:00
Jim Miller
254d9e4f41 Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev 2016-05-11 23:45:09 +00:00
Yigit Boyar
c8777a833a Merge changes I6e3f4da2,I8acfbd1a into nyc-dev
am: 1a97cbd4ca

* commit '1a97cbd4ca9670cacfd04fb9a4d42348d22cc98c':
  Fully detach unused scrap views
  Remove detached headers

Change-Id: I30a02773e4cfb05e3e6ee224d829b4c380eb00f0
2016-05-11 22:42:06 +00:00
Yigit Boyar
1a97cbd4ca Merge changes I6e3f4da2,I8acfbd1a into nyc-dev
* changes:
  Fully detach unused scrap views
  Remove detached headers
2016-05-11 22:32:05 +00:00
Aurimas Liutikas
9c661a40c1 Stop saving ActionMenuItemView state.
There is no useful state to be saved for these views.
This fixes a crash where we try to restore the state of an
ActionView (that shares the same ID as ActionMenuItemView).

Framework version of ag/1020805

Bug: 28110832
Change-Id: I4a09786a1c08bef1765fd8be3affb21dce296272
2016-05-11 14:46:47 -07:00
Adam Powell
3b981d026c Merge "Less lazy child FragmentManager creation" into nyc-dev
am: 6437dac3d9

* commit '6437dac3d929297450d1ac937800eb35a5e51ef2':
  Less lazy child FragmentManager creation

Change-Id: Ic5917acbe07f67a577ce693680c132d07519d34a
2016-05-11 21:41:50 +00:00
Adam Powell
6437dac3d9 Merge "Less lazy child FragmentManager creation" into nyc-dev 2016-05-11 21:32:57 +00:00
Makoto Onuki
538c440c33 Remove ShortcutManager
Bug 28704708

Change-Id: If7b739adeec38d81d554fc1cf34c81194f5d67b9
2016-05-11 14:25:55 -07:00
Dianne Hackborn
ef0a402f58 Fix issue #28400000: Settings memory UI still showing z-ram...
...but probably shouldn't.

Keep track of whether zram is being included in per-process pss and,
if so, don't add it on separately.

Change-Id: Ic945fc3deca8412272bb6019fe1be4b878cb763a
2016-05-11 14:21:07 -07:00
Alan Viverette
efb8e576a9 Remove extra logging in DatePicker
Issue seems to be fixed now, don't need the extra logging.

Bug: 27310206
Change-Id: Ibf53d056e9c5144729dae02c72050aebd90e4343
2016-05-11 17:10:13 -04:00
Adam Powell
467cc6f0e1 Less lazy child FragmentManager creation
Framework edition

Fix a bug where child FragmentManagers moving too lazily into the
CREATED state and beyond caused child fragments to not be
attached/created when expected.

Bug 25019275

Change-Id: I04ff0d3bcb693178a6ee3057da591392defdbcf8
2016-05-11 13:45:33 -07:00
Adrian Roos
7f06eed7f5 DPM control for remote input when locked
Bug: 26981262
Change-Id: I84f26ebe807e89fd56ffc3bbc7fc20f12e2f7391
2016-05-11 19:54:09 +00:00