OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Adjust divider when IME height is changed." into nyc-dev
Keisuke Kuroyanagi [Fri, 13 May 2016 01:53:59 +0000 (01:53 +0000)]
Merge "Adjust divider when IME height is changed." into nyc-dev
am: 36d1296cf4

* commit '36d1296cf4f074599015b424161402f9b07da8ab':
  Adjust divider when IME height is changed.

Change-Id: Ib8051875be06b0e394107c40eae79cee26917331

8 years agoMerge "Adjust divider when IME height is changed." into nyc-dev
Keisuke Kuroyanagi [Fri, 13 May 2016 01:46:09 +0000 (01:46 +0000)]
Merge "Adjust divider when IME height is changed." into nyc-dev

8 years agoMerge "Partial fix for jumping freeform windows" into nyc-dev
Vladislav Kaznacheev [Fri, 13 May 2016 01:25:52 +0000 (01:25 +0000)]
Merge "Partial fix for jumping freeform windows" into nyc-dev
am: d5c94d1af3

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

Change-Id: Ifdff3f152787fb6c8739fddf1767d0ce3e4b0e26

8 years agoMerge "Partial fix for jumping freeform windows" into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 01:21:11 +0000 (01:21 +0000)]
Merge "Partial fix for jumping freeform windows" into nyc-dev

8 years agoMerge "ContentValues: improve documentation" into nyc-dev
Steve Pomeroy [Fri, 13 May 2016 01:17:57 +0000 (01:17 +0000)]
Merge "ContentValues: improve documentation" into nyc-dev
am: 33d0ff9959

* commit '33d0ff995976533f9989cd6ec95c3de5ba9aee05':
  ContentValues: improve documentation

Change-Id: I29244d0c039abcd08139e2814bb465e2e5b9e03a

8 years agoMerge "Fix documentation bug in SQLiteDatabase" into nyc-dev
Steve Pomeroy [Fri, 13 May 2016 01:17:54 +0000 (01:17 +0000)]
Merge "Fix documentation bug in SQLiteDatabase" into nyc-dev
am: d07a3c4203

* commit 'd07a3c42034b35a0474619f9395a9d97abc83069':
  Fix documentation bug in SQLiteDatabase

Change-Id: I6df7ab83572b128672af473941c487ac20f5d077

8 years agoMerge "ContentValues: improve documentation" into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 01:12:51 +0000 (01:12 +0000)]
Merge "ContentValues: improve documentation" into nyc-dev

8 years agoMerge "Fix documentation bug in SQLiteDatabase" into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 01:08:51 +0000 (01:08 +0000)]
Merge "Fix documentation bug in SQLiteDatabase" into nyc-dev

8 years agoMerge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into...
Kevin Hufnagle [Fri, 13 May 2016 01:05:12 +0000 (01:05 +0000)]
Merge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into mnc-io-docs am: 458b991356 am: e328025835
am: 70a4bcff70

* commit '70a4bcff70ba303944869a93d1c2304a3eeed722':
  cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc

Change-Id: I9992db97b77556604ba55f035ec7c3c699215c0a

8 years agoMerge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into...
Kevin Hufnagle [Fri, 13 May 2016 01:02:36 +0000 (01:02 +0000)]
Merge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into mnc-io-docs am: 458b991356
am: e328025835

* commit 'e32802583591d10f9bb8687a6e00b6f3484ecbdd':
  cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc

Change-Id: If775ca04c0922f586b42d870fe9bc3b7c1312ca6

8 years agoMerge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into...
Kevin Hufnagle [Fri, 13 May 2016 00:59:40 +0000 (00:59 +0000)]
Merge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into mnc-io-docs
am: 458b991356

* commit '458b99135671cbb3d49f9e71e35e1cf5926b7d2c':
  cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc

Change-Id: I50b1383c264433677297023d378a2f622bd873b7

8 years agoMerge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into...
Adarsh Fernando [Fri, 13 May 2016 00:56:55 +0000 (00:56 +0000)]
Merge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028 am: ac5dc2f581" into nyc-dev
am: ff970a7644

* commit 'ff970a7644b28669e4cac8f9ee1fd49e0cd8af0b':

Change-Id: I147920b8123d428d5b484314912ad56ee0359e33

8 years agoMerge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into...
Adarsh Fernando [Fri, 13 May 2016 00:56:51 +0000 (00:56 +0000)]
Merge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028 am: ac5dc2f581" into nyc-dev
am: 16464db17c

* commit '16464db17cee130e936a176a7e9e8905afd497df':
  Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)

Change-Id: I9b266e60f60c4014dbf9e2e0f62f267a27512be5

8 years agoMerge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into...
Kevin Hufnagle [Fri, 13 May 2016 00:56:27 +0000 (00:56 +0000)]
Merge "cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc" into mnc-io-docs

8 years agoMerge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into...
Android Build Merger (Role) [Fri, 13 May 2016 00:54:18 +0000 (00:54 +0000)]
Merge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028 am: ac5dc2f581" into nyc-dev

8 years agoMerge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev
Seigo Nonaka [Fri, 13 May 2016 00:54:04 +0000 (00:54 +0000)]
Merge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev
am: 614c83d977

* commit '614c83d9777b68b304e0fac6ac19e39a4d49d016':
  Fix incorrect inheritance from TextAppearance to Widget.

Change-Id: Ifdce3f9fa8d3be08b7de6c5afb2d1a74b0437188

8 years agoMerge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc...
Adarsh Fernando [Fri, 13 May 2016 00:53:53 +0000 (00:53 +0000)]
Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028
am: ac5dc2f581

* commit 'ac5dc2f581b84affcd25a4d405cb8036b92a3797':
  Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)

Change-Id: Ia729337de141ebb48e39d54edcafff207bb9f974

8 years agoMerge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into...
Android Build Merger (Role) [Fri, 13 May 2016 00:52:14 +0000 (00:52 +0000)]
Merge "Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028 am: ac5dc2f581" into nyc-dev

8 years agoMerge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc...
Adarsh Fernando [Fri, 13 May 2016 00:51:49 +0000 (00:51 +0000)]
Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs am: d5ef1ef028
am: ac5dc2f581

* commit 'ac5dc2f581b84affcd25a4d405cb8036b92a3797':
  Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)

Change-Id: I5924aee920021fbbdb3792c87d719f393ce2a27b

8 years agoMerge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev
Seigo Nonaka [Fri, 13 May 2016 00:50:20 +0000 (00:50 +0000)]
Merge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev

8 years agoMerge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc...
Adarsh Fernando [Fri, 13 May 2016 00:49:26 +0000 (00:49 +0000)]
Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs
am: d5ef1ef028

* commit 'd5ef1ef028d5d7e529746206aa72f4cd65edd55b':
  Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)

Change-Id: Ic32c9e030b2a287bba161716f67788e740b78433

8 years agoMerge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc...
Adarsh Fernando [Fri, 13 May 2016 00:43:25 +0000 (00:43 +0000)]
Merge "Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)" into mnc-io-docs

8 years agoDocs: Added new Whitelist feature to Data Saver for DP3 (Part 2)
Adarsh Fernando [Thu, 12 May 2016 22:18:14 +0000 (15:18 -0700)]
Docs: Added new Whitelist feature to Data Saver for DP3 (Part 2)

Bug: 28447739
Change-Id: Ibdbf0bd315fc228b076c5b91061bcb8080de96d3

8 years agoPartial fix for jumping freeform windows
Vladislav Kaznacheev [Thu, 12 May 2016 19:56:31 +0000 (12:56 -0700)]
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

8 years agoMerge "Fix replacing window timeouts" into nyc-dev
Chong Zhang [Thu, 12 May 2016 23:55:47 +0000 (23:55 +0000)]
Merge "Fix replacing window timeouts" into nyc-dev
am: a63e1325b5

* commit 'a63e1325b595d84dea7d33cb2e2c149acb326204':
  Fix replacing window timeouts

Change-Id: I78463da8421ae1a039b0b22f2e44739e3199f166

8 years agoFix documentation bug in SQLiteDatabase
Steve Pomeroy [Thu, 14 Mar 2013 04:42:10 +0000 (00:42 -0400)]
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 8fc3144fa5d9fe3a6c7fb6de80cb34d5cafabc05)

Change-Id: I89e56428e612d667259744e2bc3df124e5a2aa0e

8 years agoContentValues: improve documentation
Steve Pomeroy [Tue, 9 Oct 2012 19:37:34 +0000 (15:37 -0400)]
ContentValues: improve documentation

Correct and clarify the documentation for ContentValues.

Signed-off-by: Steve Pomeroy <steve@staticfree.info>
(cherry picked from commit 1276b5f29ed6f889e9691cf296fd9911958895c1)

Change-Id: Id6f4e93dcca64dd41daeb4066d804ff173f4747b

8 years agoAdjust divider when IME height is changed.
Keisuke Kuroyanagi [Thu, 12 May 2016 23:49:02 +0000 (16:49 -0700)]
Adjust divider when IME height is changed.

Previously, divider was adjusted for IME when IME window visibility is
changed. However, IME size can be changed without changing IME window
visibility. For example, when hardware keyboard key is pressed to show
emoji layout.
This CL checks if IME height has been changed and adjust divider position
properly.

Bug: 28389933
Change-Id: I9a561bd4796a0513c8b5c493884946883f160907

8 years agoMerge "Fix replacing window timeouts" into nyc-dev
Chong Zhang [Thu, 12 May 2016 23:48:35 +0000 (23:48 +0000)]
Merge "Fix replacing window timeouts" into nyc-dev

8 years agoMerge "Workaround for empty recents, defer the enter animation." into nyc-dev
Winson [Thu, 12 May 2016 23:33:30 +0000 (23:33 +0000)]
Merge "Workaround for empty recents, defer the enter animation." into nyc-dev
am: 2b8dcdeda4

* commit '2b8dcdeda484c3ed92969420a19ba48c2f877c81':
  Workaround for empty recents, defer the enter animation.

Change-Id: Ie4b9c468c4b42a42cbbf0eb9892f074f771c6ea0

8 years agoMerge "Fixing flashing when animation the launch task." into nyc-dev
Winson [Thu, 12 May 2016 23:33:27 +0000 (23:33 +0000)]
Merge "Fixing flashing when animation the launch task." into nyc-dev
am: 723bca4f58

* commit '723bca4f58ec37fcf7dd4588835bb58f7c88857d':
  Fixing flashing when animation the launch task.

Change-Id: Ie0bc44ef777a313f653d922adb22450c7d17e63c

8 years agoMerge "Fixing issue with excluded task showing when docking." into nyc-dev
Winson [Thu, 12 May 2016 23:33:24 +0000 (23:33 +0000)]
Merge "Fixing issue with excluded task showing when docking." into nyc-dev
am: caedd41a6a

* commit 'caedd41a6ab0f5aa3f6e289311162fd2c817926c':
  Fixing issue with excluded task showing when docking.

Change-Id: I818763a9d8d5c4b0cb2e3836f2bee70f6266abb2

8 years agoMerge "Respect add focusables flags" into nyc-dev
Yigit Boyar [Thu, 12 May 2016 23:27:19 +0000 (23:27 +0000)]
Merge "Respect add focusables flags" into nyc-dev
am: 4c6eeb67a2

* commit '4c6eeb67a232fdbca43513d8414e38a55c40d75e':
  Respect add focusables flags

Change-Id: I8bb85f17fa0d85ae9d58aa026711e298c1b0f09a

8 years agoMerge "Workaround for empty recents, defer the enter animation." into nyc-dev
Winson Chung [Thu, 12 May 2016 23:23:14 +0000 (23:23 +0000)]
Merge "Workaround for empty recents, defer the enter animation." into nyc-dev

8 years agoMerge "Fixing flashing when animation the launch task." into nyc-dev
Winson Chung [Thu, 12 May 2016 23:23:06 +0000 (23:23 +0000)]
Merge "Fixing flashing when animation the launch task." into nyc-dev

8 years agoMerge "Fixing issue with excluded task showing when docking." into nyc-dev
Winson Chung [Thu, 12 May 2016 23:22:54 +0000 (23:22 +0000)]
Merge "Fixing issue with excluded task showing when docking." into nyc-dev

8 years agodocs: Add Emulator Console authentication feature am: baa20c572c -s ours am: f8ec668...
Cheryl Potter [Thu, 12 May 2016 23:20:16 +0000 (23:20 +0000)]
docs: Add Emulator Console authentication feature am: baa20c572c  -s ours am: f8ec668262 am: f0e6b1ae83 am: a32ad7464d
am: a23a2c7de6

* commit 'a23a2c7de60d12eea4a3009491289e7f5ef844c0':
  docs: Add Emulator Console authentication feature

Change-Id: I6c1cd651f3b1d9b7ef444cb133cf10544a344064

8 years agoMerge "Respect add focusables flags" into nyc-dev
Yigit Boyar [Thu, 12 May 2016 23:19:21 +0000 (23:19 +0000)]
Merge "Respect add focusables flags" into nyc-dev

8 years agodocs: Add Emulator Console authentication feature am: baa20c572c -s ours am: f8ec668...
Cheryl Potter [Thu, 12 May 2016 23:17:58 +0000 (23:17 +0000)]
docs: Add Emulator Console authentication feature am: baa20c572c  -s ours am: f8ec668262 am: f0e6b1ae83
am: a32ad7464d

* commit 'a32ad7464d85b6db2f070e7154c92facef99b4ea':
  docs: Add Emulator Console authentication feature

Change-Id: I2817d6974c0d2fc105ce787d0bbae92e147cf704

8 years agodocs: Add Emulator Console authentication feature am: baa20c572c -s ours am: f8ec668262
Cheryl Potter [Thu, 12 May 2016 23:15:36 +0000 (23:15 +0000)]
docs: Add Emulator Console authentication feature am: baa20c572c  -s ours am: f8ec668262
am: f0e6b1ae83

* commit 'f0e6b1ae83bf62b54864c9ddf63d7a76e17dc122':
  docs: Add Emulator Console authentication feature

Change-Id: I81aa710f3e502cdc9c0de211d21e338f5ca5edd7

8 years agodocs: Add Emulator Console authentication feature am: baa20c572c -s ours
Cheryl Potter [Thu, 12 May 2016 23:13:12 +0000 (23:13 +0000)]
docs: Add Emulator Console authentication feature am: baa20c572c  -s ours
am: f8ec668262

* commit 'f8ec6682627d1e1d00df60a975451412f558e787':
  docs: Add Emulator Console authentication feature

Change-Id: I326c71760e0f64d328125218f5a63f891dc66269

8 years agodocs: Add Emulator Console authentication feature
Cheryl Potter [Thu, 12 May 2016 23:10:46 +0000 (23:10 +0000)]
docs: Add Emulator Console authentication feature
am: baa20c572c  -s ours

* commit 'baa20c572cffec2b508e5d0cd4194e39303441ae':
  docs: Add Emulator Console authentication feature

Change-Id: I758620f266d31157ab304147818c3c996498402d

8 years agoMerge "disable wifi only mode from wfc setting for nyc" into nyc-dev
fionaxu [Thu, 12 May 2016 23:05:55 +0000 (23:05 +0000)]
Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev
am: 8fde916de8

* commit '8fde916de89b5f0e777f687f3290976ec124faa5':
  disable wifi only mode from wfc setting for nyc

Change-Id: Ie74e4e0017ce4d514d5d458e05c2b226164a3bb6

8 years agocherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc
Kevin Hufnagle [Thu, 12 May 2016 00:38:45 +0000 (17:38 -0700)]
cherrypick from mnc-io-docs docs: Updated APK Signature Scheme v2 doc

This CL is a continuation of CL 1025444.

Bug: 28143514
Change-Id: I43feb2fec6c9d57d6ebb35a388ecaea3a713876e
Original-Change-Id: I00164a740bcc19b5ba08b517023cca11f4373680

8 years agoFix replacing window timeouts
Chong Zhang [Thu, 12 May 2016 23:00:01 +0000 (16:00 -0700)]
Fix replacing window timeouts

Do not post app token with the timeout message, instead put the token
in a list and post empty message only.

bug: 28744782
Change-Id: If809d8ee16bcc31067f25ae5696b62d09ea4b864

8 years agoMerge "disable wifi only mode from wfc setting for nyc" into nyc-dev
Chen Xu [Thu, 12 May 2016 22:57:39 +0000 (22:57 +0000)]
Merge "disable wifi only mode from wfc setting for nyc" into nyc-dev

8 years agodocs: Add Emulator Console authentication feature
Cheryl Potter [Thu, 12 May 2016 21:27:00 +0000 (14:27 -0700)]
docs: Add Emulator Console authentication feature

Change-Id: I77c36a71a208714443e09b10caf5e35141afca95

8 years agoRespect add focusables flags
Yigit Boyar [Thu, 12 May 2016 22:11:13 +0000 (15:11 -0700)]
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

8 years agoMerge "missed another old link" into mnc-mr-docs am: 4e0de0df78 am: 9535aa73bf am...
Scott Main [Thu, 12 May 2016 22:07:28 +0000 (22:07 +0000)]
Merge "missed another old link" into mnc-mr-docs am: 4e0de0df78 am: 9535aa73bf am: e1a71fdd67
am: 647058d499

* commit '647058d49975c49123f66c8f7ea127cfc6ca7def':
  missed another old link

Change-Id: Icaf660d9992fca2d9b856f58bb3debf95b43945a

8 years agoMerge "Pinner service for pinning files into memory" into nyc-dev
Philip Cuadra [Thu, 12 May 2016 22:04:36 +0000 (22:04 +0000)]
Merge "Pinner service for pinning files into memory" into nyc-dev
am: b41088b4df

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

Change-Id: I404f6844fb5bf4a097d3d862a9294cb58484d176

8 years agoMerge "missed another old link" into mnc-mr-docs am: 4e0de0df78 am: 9535aa73bf
smain@google.com [Thu, 12 May 2016 22:04:21 +0000 (22:04 +0000)]
Merge "missed another old link" into mnc-mr-docs am: 4e0de0df78 am: 9535aa73bf
am: e1a71fdd67

* commit 'e1a71fdd67a6eb0aa370be09b0bb33a166549024':
  missed another old link

Change-Id: Ic456f5624f31cce4f3bea2d3b938c9ab4ceec87a

8 years agoMerge "missed another old link" into mnc-mr-docs am: 4e0de0df78
Scott Main [Thu, 12 May 2016 22:02:01 +0000 (22:02 +0000)]
Merge "missed another old link" into mnc-mr-docs am: 4e0de0df78
am: 9535aa73bf

* commit '9535aa73bfa0b92f5e7b1610cca98f0dc33e2894':
  missed another old link

Change-Id: Ife2b4f674610ae48e1c126c42e498ecc7f27bece

8 years agoMerge "missed another old link" into mnc-mr-docs
smain@google.com [Thu, 12 May 2016 21:59:34 +0000 (21:59 +0000)]
Merge "missed another old link" into mnc-mr-docs
am: 4e0de0df78

* commit '4e0de0df78499ea83a2c31942a31dee9226960e6':
  missed another old link

Change-Id: I382e852fed3d004ea9ea18cb00a47f0895f02b3f

8 years agoMerge "Pinner service for pinning files into memory" into nyc-dev
Philip Cuadra [Thu, 12 May 2016 21:55:28 +0000 (21:55 +0000)]
Merge "Pinner service for pinning files into memory" into nyc-dev

8 years agoMerge "missed another old link" into mnc-mr-docs
Scott Main [Thu, 12 May 2016 21:51:14 +0000 (21:51 +0000)]
Merge "missed another old link" into mnc-mr-docs

8 years agoMerge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev
Dimitry Ivanov [Thu, 12 May 2016 21:21:23 +0000 (21:21 +0000)]
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

8 years agoMerge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev
Jesse Hall [Thu, 12 May 2016 21:13:25 +0000 (21:13 +0000)]
Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev

8 years agoMerge "Add getEsn()." into nyc-mr1-dev
Youhan Wang [Thu, 12 May 2016 21:09:42 +0000 (21:09 +0000)]
Merge "Add getEsn()." into nyc-mr1-dev

8 years agoMerge "fix filter for listeners that are not the rocket" into nyc-dev
Chris Wren [Thu, 12 May 2016 21:08:51 +0000 (21:08 +0000)]
Merge "fix filter for listeners that are not the rocket" into nyc-dev
am: 2e35847a8f

* commit '2e35847a8f9557b59198fc053524eee0b965aab8':
  fix filter for listeners that are not the rocket

Change-Id: Ieb343c93c78dbafb937a14abff6a868d1f44ecc9

8 years agoMerge "fix filter for listeners that are not the rocket" into nyc-dev
TreeHugger Robot [Thu, 12 May 2016 21:05:36 +0000 (21:05 +0000)]
Merge "fix filter for listeners that are not the rocket" into nyc-dev

8 years agoMerge "DPM control for remote input when locked" into nyc-dev
Adrian Roos [Thu, 12 May 2016 20:58:53 +0000 (20:58 +0000)]
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

8 years agoMerge "DPM control for remote input when locked" into nyc-dev
Adrian Roos [Thu, 12 May 2016 20:52:24 +0000 (20:52 +0000)]
Merge "DPM control for remote input when locked" into nyc-dev

8 years agoUpdate billions page related links. am: d66be4dcd0 am: 6ad1f133e3 am: 49bc081039...
Dirk Dougherty [Thu, 12 May 2016 20:41:20 +0000 (20:41 +0000)]
Update billions page related links. am: d66be4dcd0 am: 6ad1f133e3 am: 49bc081039 am: aa50ecd967
am: 8d18eefe50

* commit '8d18eefe50ac574fdca3090ca12d94e307321a33':
  Update billions page related links.

Change-Id: Id94c74d2a7ea55f2b4b84c5a5505c80fa6e90851

8 years agodisable wifi only mode from wfc setting for nyc
fionaxu [Thu, 12 May 2016 20:40:05 +0000 (13:40 -0700)]
disable wifi only mode from wfc setting for nyc

Bug: 28691529
Change-Id: I78a5606b213628148218cb5e9db63192a15384d7

8 years agoUpdate billions page related links. am: d66be4dcd0 am: 6ad1f133e3 am: 49bc081039
Dirk Dougherty [Thu, 12 May 2016 20:38:36 +0000 (20:38 +0000)]
Update billions page related links. am: d66be4dcd0 am: 6ad1f133e3 am: 49bc081039
am: aa50ecd967

* commit 'aa50ecd9677d7f18d77c39d9e3a5220b8242323a':
  Update billions page related links.

Change-Id: I538d3883c11f4a4b6a83047c66419c18b4595c3e

8 years agoMerge commit \'20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge am: dbaf61...
Dirk Dougherty [Thu, 12 May 2016 20:38:29 +0000 (20:38 +0000)]
Merge commit \'20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge am: dbaf613dea am: 5660e4ed82 am: f6661535ab
am: 4d50987762

* commit '4d509877620aa62184ec18a482861b31b09297d6':
  docs: added "billions" doc in Distribute>Essentials

Change-Id: Ic2b4b2a157d6bf28671857a3b975485b44c02ff1

8 years agoMerge commit \'20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge am: dbaf61...
Liz Yepsen [Thu, 12 May 2016 20:36:02 +0000 (20:36 +0000)]
Merge commit \'20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge am: dbaf613dea am: 5660e4ed82
am: f6661535ab

* commit 'f6661535ab2f518932f03854992c8192bae8460d':
  docs: added "billions" doc in Distribute>Essentials

Change-Id: Ic88bb38f3867663b97d56061882b25049d10295d

8 years agoUpdate billions page related links. am: d66be4dcd0 am: 6ad1f133e3
Dirk Dougherty [Thu, 12 May 2016 20:35:57 +0000 (20:35 +0000)]
Update billions page related links. am: d66be4dcd0 am: 6ad1f133e3
am: 49bc081039

* commit '49bc081039c24d49bf1644b76bd876ad7e889050':
  Update billions page related links.

Change-Id: Ib902f3a1cf63199223138c51b9b2cd6ef26bbbfa

8 years agoMerge commit \'20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge am: dbaf613dea
Dirk Dougherty [Thu, 12 May 2016 20:33:41 +0000 (20:33 +0000)]
Merge commit \'20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge am: dbaf613dea
am: 5660e4ed82

* commit '5660e4ed82031b69165a6faf1e61b5ced48547e3':
  docs: added "billions" doc in Distribute>Essentials

Change-Id: I92aa93777cdfe722dc2fc9c6da86ff24961b1560

8 years agoUpdate billions page related links. am: d66be4dcd0
Dirk Dougherty [Thu, 12 May 2016 20:33:38 +0000 (20:33 +0000)]
Update billions page related links. am: d66be4dcd0
am: 6ad1f133e3

* commit '6ad1f133e3ad1782fcbb7be3b0536f5cedecad63':
  Update billions page related links.

Change-Id: I2a5617fcbe6d9a0d1de5a3b794f960924e835bb2

8 years agoUpdate billions page related links.
Dirk Dougherty [Thu, 12 May 2016 20:31:09 +0000 (20:31 +0000)]
Update billions page related links.
am: d66be4dcd0

* commit 'd66be4dcd02f3367d34833fb15d55b796ae24373':
  Update billions page related links.

Change-Id: I9af79689486ebfb079fcd1aad48882a1ee7217aa

8 years agoMerge commit \'20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge
Liz Yepsen [Thu, 12 May 2016 20:31:09 +0000 (20:31 +0000)]
Merge commit \'20fde769affa8ff76251814004b22efa9bb76e71\' into manualmerge
am: dbaf613dea

* commit 'dbaf613dea013caca62629bdc808ef50e4ebc7c1':
  docs: added "billions" doc in Distribute>Essentials

Change-Id: I53574e17fb29a96c074e3653a06d4ee4d6bb7677

8 years agoMerge commit '20fde769affa8ff76251814004b22efa9bb76e71' into manualmerge
Dirk Dougherty [Thu, 12 May 2016 20:25:50 +0000 (13:25 -0700)]
Merge commit '20fde769affa8ff76251814004b22efa9bb76e71' into manualmerge

Change-Id: I412660ce82c8ffd9e51899ddf0b8776d7294afaa

8 years agoPinner service for pinning files into memory
Philip Cuadra [Thu, 28 Apr 2016 22:26:49 +0000 (15:26 -0700)]
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

8 years agoMerge "Persist settings on a dedicated background thread" into nyc-dev
Svet Ganov [Thu, 12 May 2016 19:57:42 +0000 (19:57 +0000)]
Merge "Persist settings on a dedicated background thread" into nyc-dev
am: 00749aeb15

* commit '00749aeb15d52151fcc9f9051b525840c49e14ce':
  Persist settings on a dedicated background thread

Change-Id: I62d1cf9a8955ea949c420c1eb62645bff325da2a

8 years agomissed another old link
smain@google.com [Thu, 12 May 2016 19:55:51 +0000 (12:55 -0700)]
missed another old link

Change-Id: I9f618e674a566b50fa2635a6e6cd2f00e53a27dd

8 years agoMerge "Persist settings on a dedicated background thread" into nyc-dev
Svetoslav Ganov [Thu, 12 May 2016 19:51:57 +0000 (19:51 +0000)]
Merge "Persist settings on a dedicated background thread" into nyc-dev

8 years agofix studio download links am: 17aabff6e0 am: 740d47f46f am: c878bcef1f
smain@google.com [Thu, 12 May 2016 19:51:22 +0000 (19:51 +0000)]
fix studio download links am: 17aabff6e0 am: 740d47f46f am: c878bcef1f
am: f41f6a634e

* commit 'f41f6a634eef04dfad4620814c65e9683c944927':
  fix studio download links

Change-Id: Ibebd6a831f8ce81ed08378e12f75c78938751add

8 years agofix studio download links am: 17aabff6e0 am: 740d47f46f
smain@google.com [Thu, 12 May 2016 19:48:41 +0000 (19:48 +0000)]
fix studio download links am: 17aabff6e0 am: 740d47f46f
am: c878bcef1f

* commit 'c878bcef1f71c241473dcf59762155cc3e133fb4':
  fix studio download links

Change-Id: Iad2d9da633014b138e090f152bdad9b4e6546441

8 years agofix studio download links am: 17aabff6e0
smain@google.com [Thu, 12 May 2016 19:45:48 +0000 (19:45 +0000)]
fix studio download links am: 17aabff6e0
am: 740d47f46f

* commit '740d47f46f65ced23f402e4cba6ea1e80501de61':
  fix studio download links

Change-Id: I509f17ce4a0106b540a6d443d8a41d13976a094d

8 years agoMerge "Don\'t notify windows of resize during PIP animation." into nyc-dev
Robert Carr [Thu, 12 May 2016 19:42:23 +0000 (19:42 +0000)]
Merge "Don\'t notify windows of resize during PIP animation." into nyc-dev
am: 562ea5ceb5

* commit '562ea5ceb5e10a3ea4dfd3825b2d639fbc6506b0':
  Don't notify windows of resize during PIP animation.

Change-Id: I759b052e5447fe7cd703face366c20e95cdbe6bd

8 years agofix studio download links
smain@google.com [Thu, 12 May 2016 19:42:19 +0000 (19:42 +0000)]
fix studio download links
am: 17aabff6e0

* commit '17aabff6e0926415fd4e4521c88362ba97edfccb':
  fix studio download links

Change-Id: Idc4c1bf1345cb9104ee43996c89bfd458868ef85

8 years agoMerge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 am...
Scott Main [Thu, 12 May 2016 19:37:06 +0000 (19:37 +0000)]
Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 am: 55aff78cfd am: b4c50e1235
am: e8d16b29c3

* commit 'e8d16b29c3dda7535d356686383d147193dc677d':
  update banner to 2.1 and remove yellow

Change-Id: I9dde62e39329d027f6beb1e14814bd882c76b15b

8 years agoMerge "Don't notify windows of resize during PIP animation." into nyc-dev
TreeHugger Robot [Thu, 12 May 2016 19:35:24 +0000 (19:35 +0000)]
Merge "Don't notify windows of resize during PIP animation." into nyc-dev

8 years agoMerge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 am...
smain@google.com [Thu, 12 May 2016 19:34:30 +0000 (19:34 +0000)]
Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 am: 55aff78cfd
am: b4c50e1235

* commit 'b4c50e123542b268ec3ff7ef64514557a1cf3701':
  update banner to 2.1 and remove yellow

Change-Id: I10428534b0b4825e1b03818e682472525d5089a0

8 years agofix studio download links
smain@google.com [Thu, 12 May 2016 19:32:42 +0000 (12:32 -0700)]
fix studio download links

Change-Id: I22f65c704ff94de58f0b0100a614107c08fde649

8 years agoMerge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289
Scott Main [Thu, 12 May 2016 19:31:55 +0000 (19:31 +0000)]
Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289
am: 55aff78cfd

* commit '55aff78cfd2f60f938eae7f1564d3ccd5c2c9c84':
  update banner to 2.1 and remove yellow

Change-Id: I5aa38003db9207bfc40f353cda6d86070c311520

8 years agoMerge "update banner to 2.1 and remove yellow" into mnc-mr-docs
smain@google.com [Thu, 12 May 2016 19:29:20 +0000 (19:29 +0000)]
Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs
am: 7eac6f1289

* commit '7eac6f1289052a0845de2fb6cd760d0c2d9b5da0':
  update banner to 2.1 and remove yellow

Change-Id: I343bca6044cc7362d9337b7cddc3da2ab3676dc6

8 years agoMerge "update banner to 2.1 and remove yellow" into mnc-mr-docs
Scott Main [Thu, 12 May 2016 19:25:08 +0000 (19:25 +0000)]
Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs

8 years agoupdate banner to 2.1 and remove yellow
smain@google.com [Thu, 12 May 2016 19:23:20 +0000 (12:23 -0700)]
update banner to 2.1 and remove yellow

Change-Id: I27c5e046804bbfb79640fe544ff1f07d777c853d

8 years agoMerge "Fixed a crash when dumping groupmanager" into nyc-dev
Selim Cinek [Thu, 12 May 2016 19:16:57 +0000 (19:16 +0000)]
Merge "Fixed a crash when dumping groupmanager" into nyc-dev
am: 95b3120d08

* commit '95b3120d089ba4e2c8d2c7e4349ef754689ed68f':
  Fixed a crash when dumping groupmanager

Change-Id: I65eee546cb3bfc3b7f0a841eeb5e1ed333f696b5

8 years agoMerge "Fixed a crash when dumping groupmanager" into nyc-dev
Selim Cinek [Thu, 12 May 2016 19:09:58 +0000 (19:09 +0000)]
Merge "Fixed a crash when dumping groupmanager" into nyc-dev

8 years agoUpdate billions page related links.
Dirk Dougherty [Thu, 12 May 2016 19:04:14 +0000 (12:04 -0700)]
Update billions page related links.

Change-Id: I92585c1410b93000c13b567717905f3b3b24f923

8 years agoMerge "Fix surfaceInset adjustment." into nyc-dev
Robert Carr [Thu, 12 May 2016 19:01:46 +0000 (19:01 +0000)]
Merge "Fix surfaceInset adjustment." into nyc-dev
am: 663330a325

* commit '663330a325c4b324eb19cdb4f83189f342e01060':
  Fix surfaceInset adjustment.

Change-Id: I9274121cdbd8ea8ed656478b98d6cd4b740834b8

8 years agoMerge "Fix surfaceInset adjustment." into nyc-dev
TreeHugger Robot [Thu, 12 May 2016 18:57:57 +0000 (18:57 +0000)]
Merge "Fix surfaceInset adjustment." into nyc-dev

8 years agofix filter for listeners that are not the rocket
Chris Wren [Thu, 12 May 2016 17:21:08 +0000 (13:21 -0400)]
fix filter for listeners that are not the rocket

Bug: 28664037
Change-Id: Id1e4b243ed7423dbd2d4a8ead829cba9b20f30cd

8 years agoMerge "docs: Noted that custom permissions must be unique per-device" into mnc-mr...
Andrew Solovay [Thu, 12 May 2016 18:51:27 +0000 (18:51 +0000)]
Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571 am: dc4cd59183
am: 8363a70024

* commit '8363a70024a53f4934639a1e6c13aae17f4d6d0c':
  docs: Noted that custom permissions must be unique per-device

Change-Id: I4efc79802eeb2ecdc72a3cba21862313de1225df

8 years agoMerge "docs: Noted that custom permissions must be unique per-device" into mnc-mr...
Andrew Solovay [Thu, 12 May 2016 18:48:50 +0000 (18:48 +0000)]
Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571
am: dc4cd59183

* commit 'dc4cd59183fec0d5dc5661e6015f856f66d65ce9':
  docs: Noted that custom permissions must be unique per-device

Change-Id: Ieaef597484008d63ce1660f89d50c8cd1515f9ed

8 years agoMerge "docs: Noted that custom permissions must be unique per-device" into mnc-mr...
Andrew Solovay [Thu, 12 May 2016 18:46:17 +0000 (18:46 +0000)]
Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077
am: 76f95f5571

* commit '76f95f557129a583a52b8d7c896510fc3e2e02e8':
  docs: Noted that custom permissions must be unique per-device

Change-Id: I16fb362316afee6e6a4565184ef1c9798e1530be

8 years agoMerge "docs: Noted that custom permissions must be unique per-device" into mnc-mr...
Andrew Solovay [Thu, 12 May 2016 18:43:34 +0000 (18:43 +0000)]
Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs
am: 9be023f077

* commit '9be023f0772359137f7b4d933add43de2db1aaa0':
  docs: Noted that custom permissions must be unique per-device

Change-Id: I3af5d87f77b5b40c2c7dd7c099f3c62fe4649d28