drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
243,213 Commits 1 Branch 0 Tags
Commit Graph

243213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaewan Kim
174aa3346c Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev 2016-05-16 22:38:23 +00:00
TreeHugger Robot
8e30eb3a7f Merge "Fix transition delay tracking when starting activity from recents" into nyc-dev 2016-05-16 22:27:39 +00:00
Dianne Hackborn
0cb1cc74b8 Merge "Fix issue #28794831: meminfo considers cached processes to be services" into nyc-dev 2016-05-16 22:26:13 +00:00
Billy Lamberta
a0a34f6017 Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13 
am: 51ceb1bad1

* commit '51ceb1bad18c39a5281fc2cbd6d9c234c2e7f14a':
  docs: work minisite

Change-Id: Ieac1a9a571bfe6ef94663623f5715d1b205dd242
 2016-05-16 22:19:41 +00:00
TreeHugger Robot
522787f39a Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev 2016-05-16 22:17:42 +00:00
Billy Lamberta
51ceb1bad1 Merge "docs: work minisite" into mnc-io-docs 
am: 8f740bea13

* commit '8f740bea131ca0234fee9dce273f23c6f21ddf2f':
  docs: work minisite

Change-Id: Id0a4c1be427a131f1766f3452bca1b2f90365981
 2016-05-16 22:12:37 +00:00
Billy Lamberta
8f740bea13 Merge "docs: work minisite" into mnc-io-docs 2016-05-16 22:06:01 +00:00
Philip P. Moltmann
5bfaa9c128 Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev 2016-05-16 22:02:47 +00:00
TreeHugger Robot
6eb923cb64 Merge "Delay grantDefaultPermissions until user's first start" into nyc-dev 2016-05-16 22:01:15 +00:00
Philip P. Moltmann
11e215bc45 Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev 2016-05-16 21:43:13 +00:00
Jorim Jaggi
ed0e1a68a4 Don't throw away wallpaper bitmap just because we are hidden. 
TRIM_MEMORY_UI_HIDDEN > TRIM_MEMORY_RUNNING constants, so we only
need to throw away the wallpaper if we are actually running low on
memory.

Bug: 28769940
Change-Id: I8aa27d081bbcc2eff553e9420b2b9b0920f3781f
 2016-05-16 21:37:59 +00:00
Julia Reynolds
45626c448d Merge "Adjust spacing." into nyc-dev 2016-05-16 21:34:15 +00:00
Andrew Solovay
3228255e77 docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 
am: 8804495bff

* commit '8804495bffbbffa0abe8cd148ba1ea3c58e20be0':
  docs: Minor permissions phrasing tweak

Change-Id: I348ecb4cbe9301eccd78c6e2f87b1eb016627d5d
 2016-05-16 21:26:07 +00:00
Android Build Merger (Role)
a586b078b3 Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev 2016-05-16 21:23:22 +00:00
Andrew Solovay
d65f0c9eed docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b 
am: be2b224d80

* commit 'be2b224d80554906aa03c57f6096fa51afb48fdf':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: Ic6ffde061f37bd74e45a3f60de8a5bb6aa241c58
 2016-05-16 21:22:55 +00:00
TreeHugger Robot
a423ec52ac Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev 2016-05-16 21:21:58 +00:00
Jorim Jaggi
1e630c0829 Fix transition delay tracking when starting activity from recents 
- Move logic to determine app switch etc. into ActivityMetricsLogger.
- Make sure the notify the tracker in startActivityFromRecentsInner

Bug: 27295491
Change-Id: Ic68058c88917e3f37183dded2f13cb35055323ee
 2016-05-16 21:18:04 +00:00
Andrew Solovay
8804495bff docs: Minor permissions phrasing tweak am: 9acd851ee6 
am: 072b6fb839

* commit '072b6fb83928120de268a1e59ebabb7f2a5c724a':
  docs: Minor permissions phrasing tweak

Change-Id: I90d66b9c745bb6f313a074c9d4b4c94a8319dbc3
 2016-05-16 21:16:06 +00:00
Andrew Solovay
072b6fb839 docs: Minor permissions phrasing tweak 
am: 9acd851ee6

* commit '9acd851ee6071fa82a725a69d75c59bf4068a83a':
  docs: Minor permissions phrasing tweak

Change-Id: I823cc460ffbf71fce9013967046076f937af3168
 2016-05-16 21:13:13 +00:00
TreeHugger Robot
8c60dbe3ca Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev 2016-05-16 21:13:05 +00:00
Andrew Solovay
be2b224d80 docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 
am: af9dc9292b

* commit 'af9dc9292b552e189c43596658b0f09b052493af':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: Id5866a8ce27407924508703292a223a4f0399cb3
 2016-05-16 21:11:04 +00:00
Andrew Solovay
af9dc9292b docs: Removed note that GET_ACCOUNTS was deprecated 
am: cc80393d94

* commit 'cc80393d94e53bc92f70e2d306ad87a92ff83794':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: Icc2579926a473f72236837fb94a68fbf16494478
 2016-05-16 21:08:05 +00:00
Andrew Solovay
9acd851ee6 docs: Minor permissions phrasing tweak 
Meant to make this change in a preceding CL but accidentally
submitted before uploading the last patch set.

bug: 28727522
Change-Id: Iecf2e00031d98efbb2a8e2bf0e9386ac8707b48b
 2016-05-16 14:06:19 -07:00
Felipe Leme
c9c7be58a5 Documented return value of getRestrictBackgroundStatus(). 
Change-Id: I2c15a6d5e23cbc3c9b59c975196c1c04c1294471
Fixes: 28775490
 2016-05-16 13:57:19 -07:00
Dianne Hackborn
2ebd57ff94 Fix issue #28794831: meminfo considers cached processes to be services 
Uh how did this ever actually work??

Change-Id: I9823f88847ccda6984bc95227fac90b994c22462
 2016-05-16 13:55:24 -07:00
Billy Lamberta
e1277eb819 docs: work minisite 
Adds minisite at docs/html/work. Adds landing page and
Android for Work specific guides. Moves docs from
training/enterprise and add redirects. Update resource
card info and add new images. Update sitemap, _book, and
add sidebar navigation menu.

bug: 27744376
Change-Id: Ib09f7fc6352dfde7a60fc674b06488c651b196e2
 2016-05-16 13:36:55 -07:00
Fyodor Kupolov
b45d9833aa Delay grantDefaultPermissions until user's first start 
Bug: 28765487
Change-Id: I6a7b0a9fc85964def1e991aafe967977080dfdab
 2016-05-16 13:25:34 -07:00
Julia Reynolds
04132ed420 Adjust spacing. 
Bug: 27597108
Change-Id: I75db314162cf0293422bdea6ef5e931a3ee7f813
 2016-05-16 16:19:02 -04:00
Fyodor Kupolov
a7b826b08a Merge "Added scheduleWritePackageListLocked" into nyc-dev 2016-05-16 20:05:10 +00:00
Vladislav Kaznacheev
c244970220 Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc. 
Make getX/getY return view-relative position as specified in the class
JavaDoc.

Fix obvious errors in JavaDoc for getX/getY

Bug: 28793547
Change-Id: Ic2ac646189711e7466594d4fc8326408fc0348e1
 2016-05-16 12:57:15 -07:00
Svetoslav Ganov
967fcfa593 Merge "Use the correct handler when persisting the settings state." into nyc-dev 2016-05-16 19:46:31 +00:00
Selim Cinek
37a4027131 Merge "Fixed the remove animations for notification children" into nyc-dev 2016-05-16 19:44:34 +00:00
Svetoslav Ganov
9205749cfe Use the correct handler when persisting the settings state. 
bug:28784358

Change-Id: Iba9d569bae67c7ba0c3ab0a486ae14efa84a7acf
 2016-05-16 12:36:48 -07: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
Andrew Solovay
cc80393d94 docs: Removed note that GET_ACCOUNTS was deprecated 
We've decided not to deprecate GET_ACCOUNTS yet, but per emails,
we don't want to announce that it now *isn't* deprecated (because we
don't want to encourage people to use this permission); instead,
we're just going to not mention it at all.

Also cleaned up the following section on file permissions while I had
it open.

See first comment for doc stage location.

bug: 28727522
Change-Id: I27d21d186bdbf9ce905f3fb6a29027343a6daaf5
 2016-05-16 12:22:37 -07:00
Jaewan Kim
9df42a37c3 Workaround that Recents is shown again after an activity is PIPed 
Bug: 28333917
Change-Id: Ib85db2ffdb588476b7bc7cd764af95d759f518b5
 2016-05-17 04:04:26 +09:00
Sanket Padawe
232667bdda Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent. 
Bug: 24450765
Change-Id: I42c9f9b2b1c34d774c28d8431bc7c21bbf5909fd
 2016-05-16 19:02:39 +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
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 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
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
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