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

241099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Albert
073fffa477 Remove an obsolete paragraph. am: e2ff842 am: e57e4b3 
am: e81002b

* commit 'e81002bb424eb3b51b9db90e5849a8f56055160d':
  Remove an obsolete paragraph.

Change-Id: I489f93c5e902900bdcaa25f971bf9c49973800fc
 2016-04-27 02:14:14 +00:00
Dan Albert
8fae304343 Remove an out of date detail. am: 931a0a4 am: ff0d46f 
am: 1a6768d

* commit '1a6768d192ac5f211d4a8d79d5a12dbb694c17b6':
  Remove an out of date detail.

Change-Id: I11e9d2d0686c42c6a83c273cf331349fa86d8acf
 2016-04-27 02:12:14 +00:00
Dan Albert
b8470a34f8 Fix case of libc++. am: 3e94f7e am: cbd6ce1 
am: b67649e

* commit 'b67649e56fbf347f12d93f2b0e8fa69dabe00e17':
  Fix case of libc++.

Change-Id: I0f56561c8714daff7894017572dd3b8f1ee96d43
 2016-04-27 02:10:21 +00:00
Dan Albert
bb82b9069e Merge "Fix typo." into mnc-mr-docs am: ad5d64b am: dbfb0c6 
am: 4b0dce4

* commit '4b0dce46af8bf1890d180fa2282ee36d25c4e03a':
  Fix typo.

Change-Id: I0e04ff1cadf5ffd2f548609fa96fd8b0d2e8d336
 2016-04-27 02:08:26 +00:00
Cheryl Potter
ad51d974a1 Merge "docs: Remove obsolete deep link term from AS 2.0 Code Tools page b/28075206" into mnc-docs am: b93a913 am: 33f241d am: d67e559 
am: 3e59527

* commit '3e59527525368dd4906a698becc6221dcd5c4005':
  docs: Remove obsolete deep link term from AS 2.0 Code Tools page b/28075206

Change-Id: I04c386d2033c0acdc200c9c812f092689422663d
 2016-04-27 02:06:02 +00:00
Adarsh Fernando
25e8a02a9d Merge "Docs: minor AS 2.0 related fixes" into mnc-mr-docs am: a598807 am: 9d9cea5 
am: 583d485

* commit '583d485dd23e8ed3edf5ac88a95b28059f9bcf28':
  Docs: minor AS 2.0 related fixes

Change-Id: Ie4623b65b070c5a0cc62f75bb329cf05642cdc0c
 2016-04-27 02:04:34 +00:00
Cheryl Potter
7cb029ef69 Merge "docs: Document test artifact preference setting b/24810371" into mnc-docs am: 53ae576 -s ours am: 0c615f4 am: bb93651 
am: 2269a11

* commit '2269a11cc07e040afc6aed3d8c3f8f79c5dd835c':
  docs: Document test artifact preference setting b/24810371

Change-Id: I2f17096102a7acfee696367043b36f118f31ac89
 2016-04-27 02:02:10 +00:00
Adarsh Fernando
7d07dd051d Merge "Docs: Minor fixes to Background Optimizations and Doze docs" into mnc-mr-docs am: 6bd5c3d am: a572a3a 
am: d7f4b76

* commit 'd7f4b7662eb9c032c861585741da68d7defbadb2':
  Docs: Minor fixes to Background Optimizations and Doze docs

Change-Id: Ib95e44982e3a8a7f7f86ccdeecb174038e9c1ed3
 2016-04-27 02:00:49 +00:00
smain@google.com
2172034e9f URLs are hard, Mr. Eason. am: 9938f2b am: 6c5079b 
am: d4a4f43

* commit 'd4a4f43c72e4a48d25ecd9e4e464964711fe2548':
  URLs are hard, Mr. Eason.

Change-Id: I1c081b62d766e6a7cd2b7a82150d87e038a1adfe
 2016-04-27 01:58:14 +00:00
smain@google.com
fb74266a6e add studio 2.0 blog post to the "latest" feed for studio landing page am: 2e4bcfd am: 78fab38 
am: 03a2876

* commit '03a2876c45f736832aef1ff08e682847d79c655e':
  add studio 2.0 blog post to the "latest" feed for studio landing page

Change-Id: I48751b3864b47e3c0b3b14c93c46c7b0f9eeb607
 2016-04-27 01:56:46 +00:00
smain@google.com
0b23ca93b6 delete irrelevant manifest documentation am: 3c8d502 am: 1800bef 
am: 19319de

* commit '19319de2a4cb99df98a9183ae573fa60f012ea54':
  delete irrelevant manifest documentation

Change-Id: I6effa389d9c1d5ac655700d86945bf1d79128ea0
 2016-04-27 01:54:16 +00:00
smain@google.com
0c97cb3674 Merge "make hero header and image link to download studio" into mnc-mr-docs am: 2890c65 am: f6783df 
am: 07868c9

* commit '07868c9853207c89b4ce5ab1ac5abc93a48f3b2d':
  make hero header and image link to download studio

Change-Id: Iff3a06d702e8c20cf39365e3a8cb476c3d717ed3
 2016-04-27 01:52:53 +00:00
Adarsh Fernando
552cb8c2df Merge "Docs: Added image for CTL config" into mnc-mr-docs am: 78bad64 am: df51dd1 
am: d20b4cb

* commit 'd20b4cb528d9485cbbfdb6316fc045b89b1d7cfc':
  Docs: Added image for CTL config

Change-Id: I47a7767afcf41e76d14d7a990d8fbe0e9acb0e02
 2016-04-27 01:50:21 +00:00
smain@google.com
4e805fd5d0 add notice about compatiblity with N Preview (bug:27830549) improve linux 32-bit library information (bug:27962189), add a note about JDK 8 compatibility on Mac, and a few other edits to installation guide and system reqs. am: d69b727 am: 1b30208 
am: 663ad9c

* commit '663ad9cbf4d362a8dd6b7324f6769edf4c1c6126':
  add notice about compatiblity with N Preview (bug:27830549) improve linux 32-bit library information (bug:27962189), add a note about JDK 8 compatibility on Mac, and a few other edits to installation guide and system reqs.

Change-Id: Ib171b19828b3c9b985c5299668a1a22d8bb5f395
 2016-04-27 01:48:59 +00:00
Adarsh Fernando
da375cb6f4 Merge "Docs: Added release notes for SDK Tools 25.0.0" into mnc-mr-docs am: ffb094d am: 16c507d 
am: c4870e5

* commit 'c4870e5bb53a6b5099f1b7b28da54d44c3594703':
  Docs: Added release notes for SDK Tools 25.0.0

Change-Id: I9db7f0235750bc0ed54ee7ecf9b5a6e746876c34
 2016-04-27 01:46:20 +00:00
smain@google.com
e7b3fd38f9 Merge "Add 2.0 download file names, sizes, sums" into mnc-mr-docs am: 8a7a91d am: 3443287 
am: 572c804

* commit '572c804f02d5957f6cbcbea982996907f1e908dd':
  Add 2.0 download file names, sizes, sums

Change-Id: Iaac6e29199848a46c29d64a0a37571344b530dd9
 2016-04-27 01:43:58 +00:00
Andrew Solovay
62e4dd414b Merge "docs: Updated support library release notes for 23.3.0" into mnc-mr-docs am: 3db9afa am: a37dd29 
am: 4aff1c1

* commit '4aff1c1dbffd15580841d1e64be9877c5da8b624':
  docs: Updated support library release notes for 23.3.0

Change-Id: Id225c98b4877fa721328f7a1eceb9ebf011f6116
 2016-04-27 01:42:13 +00:00
smain@google.com
5ab5711f31 Merge "add instructions to change Android SDK location when using N Preview bug: 28017690" into mnc-mr-docs am: e5cbba2 am: 414150f 
am: 4b63685

* commit '4b636857fbd1cdc2f817b32dcf5eb7345918d8b9':
  add instructions to change Android SDK location when using N Preview bug: 28017690

Change-Id: Ib52d4ecc8947f238074bfb1e991218aeee193767
 2016-04-27 01:39:42 +00:00
Adarsh Fernando
214f81dcf5 Merge "Docs: Added AS 2.0 Release Notes" into mnc-mr-docs am: a49d235 am: ecb082f 
am: 453e69c

* commit '453e69c1dd1914f026e8d55bf28582d4167cf560':
  Docs: Added AS 2.0 Release Notes

Change-Id: If044b4cd47ff2072e067fe43b2319ec92dbe37cd
 2016-04-27 01:38:21 +00:00
Cheryl Potter
64607b17a6 Merge "docs: Data Binding 2.0 updates b/26892478" into mnc-docs am: 2ebdbd2 am: a9b10e3 am: e10717c 
am: e493677

* commit 'e493677b21d78b273767e422c701a95e82a214ac':
  docs: Data Binding 2.0 updates b/26892478

Change-Id: I9c4db095849d39e86f01f6640fcc68f2e9cfcef4
 2016-04-27 01:35:45 +00:00
TreeHugger Robot
e597323939 Merge "Terminate DocumentsUI opened for the specific root." into nyc-dev 2016-04-27 01:18:44 +00:00
Scott Main
2d22afc3a1 Merge "resolve merge conflicts of 886bbdb to nyc-dev" into nyc-dev 2016-04-27 01:11:20 +00:00
Tomasz Mikolajewski
b56bc29657 Merge "Exclude virtual files from ACTION_SEND." into nyc-dev 2016-04-27 01:11:04 +00:00
smain@google.com
fce137748a resolve merge conflicts of 886bbdb to nyc-dev 
Change-Id: Ib6a009d086ff9f4c3a568124170cd6203f1b385b
 2016-04-26 18:09:06 -07:00
Chong Zhang
08eb8a1aa2 Merge "Finish immediately if the resumed activity is already visible" into nyc-dev 2016-04-27 01:08:17 +00:00
TreeHugger Robot
97ef0e77af Merge "Don't override pre-release target sdk" into nyc-dev 2016-04-27 00:53:19 +00:00
Rob Carr
69a6fe321c Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev 2016-04-27 00:47:59 +00:00
Android Build Merger (Role)
7f17d27e89 Merge "Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am: e60e315 am: f2a8f83 am: 86eb9f3" into nyc-dev 2016-04-27 00:43:24 +00:00
Adarsh Fernando
52c591d1b7 Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am: e60e315 am: f2a8f83 
am: 86eb9f3

* commit '86eb9f3770faf3fbae439d583db31a5055a06625':
  Docs: Minor edit to IR docs to mention longer intial/clean builds

Change-Id: I52767d1d4a5b0421611056747f0f8bb41c548ae7
 2016-04-27 00:40:09 +00:00
TreeHugger Robot
fc5f6e6c80 Merge "Fix two multi-user bugs in package upgrade." into nyc-dev 2016-04-27 00:39:42 +00:00
TreeHugger Robot
e542e0cb9b Merge "Set installed flag of all users if system app is installed later" into nyc-dev 2016-04-27 00:32:41 +00:00
Tomasz Mikolajewski
52036c743c Merge "Fix index computation for quick viewing." into nyc-dev 2016-04-27 00:30:46 +00:00
Rob Carr
4f40766360 Merge "Touch region fixes for dialogs and overlapping tasks." into nyc-dev 2016-04-27 00:29:59 +00:00
smain@google.com
49d7803f04 resolve merge conflicts of 946609b to nyc-dev 
Change-Id: Ic96e9e78d16255bfd2fc43df5180c2b1a766ea2d
 2016-04-26 17:25:09 -07:00
Jeff Sharkey
ee6d8be53e Merge "Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."" into nyc-dev 2016-04-27 00:04:02 +00:00
Chong Zhang
b60a830f8b Merge "Request a wallpaper update pass when wallpaper target is set to visible" into nyc-dev 2016-04-26 23:29:40 +00:00
Chong Zhang
83c4135a3a Merge "Do not set waitForDebugger if the process to be debugged already started" into nyc-dev 2016-04-26 23:28:06 +00:00
Erik Kline
844ee77b6a Merge "Move IPv4 address setting to IpManager" into nyc-dev 2016-04-26 23:27:48 +00:00
Todd Kennedy
b107271813 Don't override pre-release target sdk 
If a package targets a pre-release SDK [eg a letter version] it should not
be allowed to be upgraded by a release SDK [eg a number version]. If one
absolutely must upgrade to a release SDK, use the "--force-sdk" option
during install.

Bug: 28345311
Change-Id: Ic9fb209968e7c5da2c80c5ca4c0f44f5125f610a
 2016-04-26 16:25:43 -07:00
Chong Zhang
efd9a5ba01 Finish immediately if the resumed activity is already visible 
When in FINISH_AFTER_VISIBLE mode, we need to check visibility of
both the current activity, and the activity to be resumed. If the
resumed activity is already visible, we should finish immediately.
We can't put it into stopping state and wait because there won't be
a window visible callback from the next activity.

bug: 28378359

Change-Id: Ib1fb44acfec33616da76f48102cc00b453e41914
 2016-04-26 16:24:24 -07:00
Jeff Sharkey
e75c0b9873 Fix two multi-user bugs in package upgrade. 
When upgrading a package, we need to fill in the "origUsers" field
so that we can clone the installed state correctly.  This was done
for child package, but never set for the parent package.

Also fix a bug where a secondary user requested a package to be
moved.  Because that move was pushed onto a Handler, the calling
userId appeared to be the device owner instead of the user that
actually requested the move.  (Later in the upgrade flow there is
code that force-installs the package for the requesting user.)

Bug: 26729822
Change-Id: I2d2a007c73558f29a3f8c1408ec373fce6e87761
 2016-04-26 17:01:42 -06:00
Oren Blasberg
c71b6302fe Merge "Show cascading popup menus if screen is big enough." into nyc-dev 2016-04-26 22:43:39 +00:00
Chen Xu
73efde04ef Merge "Add CarrierConfig for metered roaming" into nyc-dev 2016-04-26 22:42:18 +00:00
Oren Blasberg
a86d1e0b59 Merge "Accommodate NaN in new context menu methods." into nyc-dev 2016-04-26 22:41:01 +00:00
Oren Blasberg
0967da3989 Merge "Don't show icons for top level menus unless forced." into nyc-dev 2016-04-26 22:38:58 +00:00
Shreyas Basarge
8fcf6a6922 Merge "Account info on job wakelocks" into nyc-dev 2016-04-26 22:36:47 +00:00
Ruben Brunk
f84b3e0e2f Merge "Add manifest attribute for VR activities." into nyc-dev 2016-04-26 22:05:30 +00:00
Android Build Merger (Role)
5475c951bc Merge "Merge "docs: URL and App Indexing API updates for AS 2.0 support b/26642964" into mnc-docs am: cffbbc8 am: 8af8d4d am: 13308fc2 am: 39579d7" into nyc-dev 2016-04-26 21:58:53 +00:00
Android Build Merger (Role)
359b10d739 Merge "Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am: b9709f6 am: c4ec690 am: 73b5cc9" into nyc-dev 2016-04-26 21:58:43 +00:00
Android Build Merger (Role)
3b934467d4 Merge "change Mac JDK requirement to 6 am: 611a2f4 am: 3b1f66c am: 0619ef2" into nyc-dev 2016-04-26 21:58:33 +00:00