Commit Graph

244448 Commits

Author SHA1 Message Date
Selim Cinek
89374b9591 Merge "Fixed the remove animations for notification children" into nyc-dev
am: 37a4027131

* commit '37a4027131f80709c27a81be0b426b60d33dd6c7':
  Fixed the remove animations for notification children

Change-Id: I31ac58e09ac980df5008e87b46c0d268d93fabe5
2016-05-16 19:49:53 +00:00
Selim Cinek
37a4027131 Merge "Fixed the remove animations for notification children" into nyc-dev 2016-05-16 19:44:34 +00:00
Alan Viverette
f10697e17b Merge "Update docs for ColorStateList to include alpha" into nyc-dev
am: 5bcf7650b4

* commit '5bcf7650b492ca9ce5b685c5e0f535b5927af0c6':
  Update docs for ColorStateList to include alpha

Change-Id: I1dc16f964509cec422622da2ac60e5428b8203f6
2016-05-16 19:40:26 +00:00
Alan Viverette
97306713fe Merge "Use standalone capitalization for month labels" into nyc-dev
am: 895241170b

* commit '895241170b017235faf9a6a77afd22b12209bce6':
  Use standalone capitalization for month labels

Change-Id: I881afd0f2decf329e11e103c92dc54584b91ac54
2016-05-16 19:40:23 +00:00
Alan Viverette
5bcf7650b4 Merge "Update docs for ColorStateList to include alpha" into nyc-dev 2016-05-16 19:30:38 +00:00
Alan Viverette
895241170b Merge "Use standalone capitalization for month labels" into nyc-dev 2016-05-16 19:30:35 +00:00
Julia Reynolds
d1aad831ab Merge "Throw exception on rule creation failure." into nyc-dev
am: 252a6b125b

* commit '252a6b125bdaced7d928167e0fbc4dd2ba95e8a1':
  Throw exception on rule creation failure.

Change-Id: Ida05baa0dbaaefcc3738114d60173e312e7c2830
2016-05-16 18:29:11 +00:00
Julia Reynolds
252a6b125b Merge "Throw exception on rule creation failure." into nyc-dev 2016-05-16 18:22:17 +00:00
Ashley Smith
a582dd0090 Merge "Fixing a NPE in DevicePolicyManagerService" into nyc-dev
am: 6c917901cf

* commit '6c917901cf4e6f64300398f564436a7d1fc18b10':
  Fixing a NPE in DevicePolicyManagerService

Change-Id: I540f2d5e490e70c19e5e8d8926010bbcb1431048
2016-05-16 17:44:09 +00:00
Ashley Smith
6c917901cf Merge "Fixing a NPE in DevicePolicyManagerService" into nyc-dev 2016-05-16 17:40:24 +00:00
Alan Viverette
c3e5a82691 Use standalone capitalization for month labels
Bug: 28020439
Change-Id: I85169a78142a43ff2348e0b561a7aa995544a65e
2016-05-16 13:35:56 -04:00
Alan Viverette
582dcac856 Update docs for ColorStateList to include alpha
Bug: 28760030
Change-Id: I309364002220b9896f5ddf29dabde79636a722e9
2016-05-16 12:37:55 -04:00
Shubang
d73ece967a Merge "TIF: Update TvInputInfo when the input is reinstalled." into nyc-dev
am: b0d38b6d47

* commit 'b0d38b6d47a9f7e94135fc64449e81f9dc47f3eb':
  TIF: Update TvInputInfo when the input is reinstalled.

Change-Id: I9203108969432744c0e50bf7fbe8dfe95562cb58
2016-05-16 16:30:22 +00:00
Shubang Lu
b0d38b6d47 Merge "TIF: Update TvInputInfo when the input is reinstalled." into nyc-dev 2016-05-16 16:25:08 +00:00
Ashley Smith
820ae5a475 Fixing a NPE in DevicePolicyManagerService
Bug: 28786940
Change-Id: I73de8dea9221765ed0751039f3d472cf78d341af
2016-05-16 15:55:14 +00:00
Yohei Yukawa
6b078fef33 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev
am: cef3337cb5

* commit 'cef3337cb5e27d4f571fb350be055c26d339833d':
  Make IMS#clearInsetOfPreviousIme() reliable.

Change-Id: Ie654d6bccd6d4425e0dbefe2833424abdfe52a4d
2016-05-16 15:31:03 +00:00
Michael Wright
eb1ca626f0 Merge "Remove onUhandledInputEvent API." into nyc-dev
am: a1e4cbe211

* commit 'a1e4cbe2116bef9fad7c98836926317bde95d33e':
  Remove onUhandledInputEvent API.

Change-Id: I206665559c16852a6405af7081481c4e7c17cf81
2016-05-16 15:24:08 +00:00
Yohei Yukawa
cef3337cb5 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev 2016-05-16 15:22:21 +00:00
TreeHugger Robot
a1e4cbe211 Merge "Remove onUhandledInputEvent API." into nyc-dev 2016-05-16 15:18:20 +00:00
Clara Bayarri
f76e417c52 Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev
am: d34396443e

* commit 'd34396443e712a96572d26c820809a9485e57da3':
  Rename requestKeyboardShortcutsHelper

Change-Id: I6fb4ae2c7b39b24fb4b9c916552bd9fb4534f546
2016-05-16 15:08:09 +00:00
smain@google.com
c78bae6dab Merge "Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs am: b7f5631156 am: 0c5c9747a7 am: ccc6e09298" into nyc-dev
am: 8698ad8411

* commit '8698ad841187903ca562abf0ca438eab167eaca6':
  Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396

Change-Id: I1bd3f9e29583d034eff5ae3262dfe15088b7280d
2016-05-16 15:02:04 +00:00
Alan Viverette
82dca23713 Merge "Give the AM/PM buttons slightly more content area" into nyc-dev
am: bacbcba682

* commit 'bacbcba682df2d3e08e4e27f1aec3e2e0f57d7e5':
  Give the AM/PM buttons slightly more content area

Change-Id: I381d492942dc6434df222a127c3f4bf6218b9843
2016-05-16 15:02:00 +00:00
Clara Bayarri
d34396443e Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev 2016-05-16 15:01:27 +00:00
Android Build Merger (Role)
8698ad8411 Merge "Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs am: b7f5631156 am: 0c5c9747a7 am: ccc6e09298" into nyc-dev 2016-05-16 14:59:27 +00:00
smain@google.com
6d8e37f622 Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs am: b7f5631156 am: 0c5c9747a7
am: ccc6e09298

* commit 'ccc6e092989c07cd1939da33abc4e63234c6c671':
  Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396

Change-Id: I18fe568063a1516e6cb1f367b209b07b84e8729d
2016-05-16 14:59:02 +00:00
Alan Viverette
bacbcba682 Merge "Give the AM/PM buttons slightly more content area" into nyc-dev 2016-05-16 14:56:38 +00:00
Scott Main
ccc6e09298 Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs am: b7f5631156
am: 0c5c9747a7

* commit '0c5c9747a71bbb33ebf20ecc1f599a60a58238af':
  Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396

Change-Id: I408d30923a3ef12375275f5d60dc9d55bf5e6548
2016-05-16 14:55:47 +00:00
smain@google.com
0c5c9747a7 Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs
am: b7f5631156

* commit 'b7f5631156158c83d1eaa2e323267435edb66bf3':
  Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396

Change-Id: I5314afc6a3a42f43bb2f0a1484712b170773db63
2016-05-16 14:52:44 +00:00
Scott Main
b7f5631156 Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs 2016-05-16 14:47:59 +00:00
Julia Reynolds
87c4277360 Throw exception on rule creation failure.
Bug: 28775583
Change-Id: I98cf90afd86e307846970f1ede7f072eb8b70c7f
2016-05-16 09:52:17 -04:00
Michael Wright
365eaeef5f Merge "Stop emitting javadoc for @removed attributes." into nyc-dev
am: c4033e7c66

* commit 'c4033e7c668abc1e671a130f70f58f885c63b176':
  Stop emitting javadoc for @removed attributes.

Change-Id: If48d0299c6d4d7179a366d902f23ada17315e42c
2016-05-16 13:26:58 +00:00
TreeHugger Robot
c4033e7c66 Merge "Stop emitting javadoc for @removed attributes." into nyc-dev 2016-05-16 13:21:10 +00:00
Clara Bayarri
ac6f034f2a Rename requestKeyboardShortcutsHelper
Per API council feedback

Bug: 28775576
Change-Id: I1c4f98d7ec0d848f0c387aaedf8a0ed80628c64e
2016-05-16 14:15:14 +01:00
Narayan Kamath
788a8a87ef LoadedApk: Avoid unnecessary work when mIncludeCode == false.
am: 8995b00ce8

* commit '8995b00ce8f68f2a285a97c2ce711bea8c61179e':
  LoadedApk: Avoid unnecessary work when mIncludeCode == false.

Change-Id: I53ae61c1e5aed49f25ba473d33e3cbe27a475b4f
2016-05-16 10:45:22 +00:00
Narayan Kamath
8995b00ce8 LoadedApk: Avoid unnecessary work when mIncludeCode == false.
We don't need to set up JIT profiles and register usage etc when
the package context we're trying to construct doesn't request code.

This will correct accounting for packages which are only used for
resources.

bug: 28519185
Change-Id: I849675efa76c8100ae937de478b52254babe384c
2016-05-16 10:39:08 +00:00
Abodunrinwa Toki
4fc4cf6528 Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev
am: 376f9f4bd6

* commit '376f9f4bd6ba2e117f0356161c767225f47f2745':
  Ensure that ViewGroup.getChildVisibleRect(...) is recursive.

Change-Id: I84041bf0414518f747d2f1a09bd8c154f74347b9
2016-05-16 09:44:03 +00:00
Abodunrinwa Toki
376f9f4bd6 Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev 2016-05-16 09:37:56 +00:00
Martijn Coenen
a87343fbeb Merge "Address API review comments." into nyc-dev
am: 9a32929def

* commit '9a32929def3425c55a1bc96ea20346bf95357ae4':
  Address API review comments.

Change-Id: Id397091f72c9ca3d50809a3e029e8b12ee86ea26
2016-05-16 09:25:57 +00:00
Martijn Coenen
9a32929def Merge "Address API review comments." into nyc-dev 2016-05-16 09:18:36 +00:00
Joe Fernandez
8cb18342cb docs: Revert Wear Preview coming soon page and redirects am: a6443a4814 am: 0599768d37
am: 994c4b0b77

* commit '994c4b0b77c03bd7b341fff6d8544b9a76877a75':
  docs: Revert Wear Preview coming soon page and redirects

Change-Id: Idda35d8e6d8ecef24a6d8e0150e28bfebe3a45e9
2016-05-16 05:25:08 +00:00
Joe Fernandez
994c4b0b77 docs: Revert Wear Preview coming soon page and redirects am: a6443a4814
am: 0599768d37

* commit '0599768d37f65b1982a7146f4b4a6c261a83fb69':
  docs: Revert Wear Preview coming soon page and redirects

Change-Id: Ia4a02ad1a06338db1b1dcd567a5d5edee3d17f10
2016-05-16 05:22:25 +00:00
Joe Fernandez
0599768d37 docs: Revert Wear Preview coming soon page and redirects
am: a6443a4814

* commit 'a6443a48143b456947a2cf7af389d6a78cdf4f4a':
  docs: Revert Wear Preview coming soon page and redirects

Change-Id: I5e024a9412b2b0fdd73d3e4b9803626e3ecab7b1
2016-05-16 05:19:32 +00:00
Donghyun Cho
3522ec79ca Merge "CEC: Defer CEC actions until logical address is available" into nyc-dev
am: 4853d65a60

* commit '4853d65a604c253d3f2b9b5041c8cd2087e2237c':
  CEC: Defer CEC actions until logical address is available

Change-Id: I73f9dd9e1c768bb4e59298386b085de7a3b9c478
2016-05-16 04:55:27 +00:00
Donghyun Cho
4853d65a60 Merge "CEC: Defer CEC actions until logical address is available" into nyc-dev 2016-05-16 04:48:30 +00:00
Joe Fernandez
a6443a4814 docs: Revert Wear Preview coming soon page and redirects
Change-Id: I69e9291ab20e462db620c841153a76b03d7057fc
2016-05-15 21:25:45 -07:00
Joe Fernandez
fde411cf2f docs: Add "coming soon" page for Wear team am: 01afbd1481 am: 793c2171c9 am: 25919d41da
am: 123274f479

* commit '123274f479f561eebcb4f6f7b8e94efaa44bc869':
  docs: Add "coming soon" page for Wear team

Change-Id: I1105479a444dc9d0f2bc202397067db437ba49f7
2016-05-16 04:07:20 +00:00
Joe Fernandez
123274f479 docs: Add "coming soon" page for Wear team am: 01afbd1481 am: 793c2171c9
am: 25919d41da

* commit '25919d41da794e7d453742f2ddafc7cee12e6ee1':
  docs: Add "coming soon" page for Wear team

Change-Id: Ibe7d1c1c36460315bac1b2bc5ddc7fd5e456b6fd
2016-05-16 04:03:53 +00:00
Joe Fernandez
25919d41da docs: Add "coming soon" page for Wear team am: 01afbd1481
am: 793c2171c9

* commit '793c2171c905d8c006a7edf220c1f75439e6db51':
  docs: Add "coming soon" page for Wear team

Change-Id: I50f8b71e916f59e8c61a28aa7fa37f9a4de7d174
2016-05-16 04:00:26 +00:00
Joe Fernandez
793c2171c9 docs: Add "coming soon" page for Wear team
am: 01afbd1481

* commit '01afbd14814072c39b1f10668dc345512417e945':
  docs: Add "coming soon" page for Wear team

Change-Id: I3f5b90b4cdcee2d2c16f0b91d1c98cd889d76771
2016-05-16 03:57:39 +00:00
Joe Fernandez
01afbd1481 docs: Add "coming soon" page for Wear team
Change-Id: Ia5eb31fb2683c1b37188c288cf9784db22f86697
2016-05-15 20:38:52 -07:00