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

241396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adarsh Fernando
d91c026220 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 
am: 7f17d27

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

Change-Id: I5f7ce51899f7e462ac088629f61e06927275c1d8
 2016-04-27 00:47:51 +00:00
Jeff Sharkey
51f2e46690 Merge "Fix two multi-user bugs in package upgrade." into nyc-dev 
am: fc5f6e6

* commit 'fc5f6e6c80954c837a98d963789f6a30f3b87ad1':
  Fix two multi-user bugs in package upgrade.

Change-Id: Icf3ad9c02c50f30f40c3772bdded2fb295fade74
 2016-04-27 00:47:48 +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
Kenji Sugimoto
5747c31f26 Merge "Set installed flag of all users if system app is installed later" into nyc-dev 
am: e542e0c

* commit 'e542e0cb9b2fbde1cfa7ff36af9cd370af459a49':
  Set installed flag of all users if system app is installed later

Change-Id: I611a1df2f97537019e66d1b756ae8c4dee57171d
 2016-04-27 00:36:21 +00:00
Tomasz Mikolajewski
12898987f0 Merge "Fix index computation for quick viewing." into nyc-dev 
am: 52036c7

* commit '52036c743c1fccf004247af35e9c95e12fb0a638':
  Fix index computation for quick viewing.

Change-Id: Ief946fe886f8a172cd9e75c0e59904293f0335e2
 2016-04-27 00:36:19 +00:00
Robert Carr
2cdecc377f Merge "Touch region fixes for dialogs and overlapping tasks." into nyc-dev 
am: 4f40766

* commit '4f40766360fd9f2459e9fc4d30119bec95c2cf48':
  Touch region fixes for dialogs and overlapping tasks.

Change-Id: Id9f08ac6bd213317ddfa229fd2d3a3bf105976c9
 2016-04-27 00:36:18 +00:00
Cheryl Potter
b49856af5a resolve merge conflicts of 946609b to nyc-dev 
am: 49d7803

* commit '49d7803f046e8e71a473ff1a096ab1e1d6969bcc':
  docs: AVD Manager docs for AS 2.0 b/26907919

Change-Id: Ib5c2b342783ec9ab91e61cb60aa5fc979a9a0425
 2016-04-27 00:36:16 +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
Tomasz Mikolajewski
7c82c92051 Merge "Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."" into nyc-dev 
am: ee6d8be

* commit 'ee6d8be53e1dabf7669150e7e7e39daa58cac542':
  Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."

Change-Id: I94fd56620c42796eb0c8c206d96ddfb1f5a8a436
 2016-04-27 00:08:25 +00: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
e46060a835 Merge "Request a wallpaper update pass when wallpaper target is set to visible" into nyc-dev 
am: b60a830

* commit 'b60a830f8b192eadb6c94bdef99967cc2cddafff':
  Request a wallpaper update pass when wallpaper target is set to visible

Change-Id: I5ce250fe1a7e054cd9f522b82a55d6e408807cd4
 2016-04-26 23:37:03 +00:00
Chong Zhang
2f54479f77 Merge "Do not set waitForDebugger if the process to be debugged already started" into nyc-dev 
am: 83c4135

* commit '83c4135a3a50c50890c52d9f2d98c7d2c8661fef':
  Do not set waitForDebugger if the process to be debugged already started

Change-Id: I9a4de5653a003f5ec12416d0bf95d6423713c7bd
 2016-04-26 23:37:02 +00:00
Erik Kline
3c2977cc57 Merge "Move IPv4 address setting to IpManager" into nyc-dev 
am: 844ee77

* commit '844ee77b6af93fcfa758d9530a049ae659ca34f0':
  Move IPv4 address setting to IpManager

Change-Id: Ia31075dfe5551c5ae9d63800dc535462efe3f06a
 2016-04-26 23:37:00 +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
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
6ba68207a3 Merge "Show cascading popup menus if screen is big enough." into nyc-dev 
am: c71b630

* commit 'c71b6302fe368ca2fbd4555177acf3cd157f6340':
  Show cascading popup menus if screen is big enough.

Change-Id: I253cec6780f083e915f073b501de47d1e970e8ff
 2016-04-26 22:50:16 +00:00
fionaxu
c1df936c16 Merge "Add CarrierConfig for metered roaming" into nyc-dev 
am: 73efde0

* commit '73efde04efc5d8e36cf1eb2e0fa2bb52a4a326e1':
  Add CarrierConfig for metered roaming

Change-Id: Ic3955a4a208dcf206d607cda25eee03c37e96a1e
 2016-04-26 22:50:14 +00:00
Oren Blasberg
1fab8d995e Merge "Accommodate NaN in new context menu methods." into nyc-dev 
am: a86d1e0

* commit 'a86d1e0b5938cee1d76aefcc1e8967c353ea922d':
  Accommodate NaN in new context menu methods.

Change-Id: I16e5660e880e1b88b5d2b96fc403ba4becefefec
 2016-04-26 22:50:12 +00:00
Oren Blasberg
bddf236208 Merge "Don\'t show icons for top level menus unless forced." into nyc-dev 
am: 0967da3

* commit '0967da398901dd2ac626152a4802c822ca36c63b':
  Don't show icons for top level menus unless forced.

Change-Id: I50b66d5f2a3b133300dc40e57d7acb393e0ce403
 2016-04-26 22:50:09 +00:00
Shreyas Basarge
bfd93e9d9d Merge "Account info on job wakelocks" into nyc-dev 
am: 8fcf6a6

* commit '8fcf6a692262dc182c844b35337b67aeb320021d':
  Account info on job wakelocks

Change-Id: I864e9c089e2ddcab1b3d00db85013af14ebed8fa
 2016-04-26 22:50:06 +00:00
Ruben Brunk
45d61923df Merge "Add manifest attribute for VR activities." into nyc-dev 
am: f84b3e0

* commit 'f84b3e0e2fe11c8ee1d86ad44236ba4129fc3ae1':
  Add manifest attribute for VR activities.

Change-Id: I6450e6237a9e5a2bc275d465d758a3e70a66fb23
 2016-04-26 22:50:02 +00: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
Cheryl Potter
cde0435f26 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 
am: 5475c95

* commit '5475c951bc5efff1f67ac61e2be46b0a3a18408e':
  docs: URL and App Indexing API updates for AS 2.0 support b/26642964

Change-Id: Ia502c9a7b04e908a075b3bcf5fa89015fe6a1104
 2016-04-26 22:21:21 +00:00
smain@google.com
ab120c9534 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 
am: 359b10d

* commit '359b10d73926259d3d4679d0f309b4bb47fe6455':
  update Develop tab landing page with Studio 2.0 announcement.

Change-Id: Ie3a84d6b9e3708940d5c5032a64f341acbff64b3
 2016-04-26 22:21:19 +00:00
smain@google.com
46d699409f Merge "change Mac JDK requirement to 6 am: 611a2f4 am: 3b1f66c am: 0619ef2" into nyc-dev 
am: 3b93446

* commit '3b934467d485d38533e96f927b3c7a0bda0ec871':
  change Mac JDK requirement to 6

Change-Id: Iff88ecc99b2bbb895860d2d59b76e7ae0743ac5c
 2016-04-26 22:21:14 +00:00
Adarsh Fernando
4d5833a774 Merge "Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am: 3dbc405 am: 6eed040 am: f654443" into nyc-dev 
am: c5f684f

* commit 'c5f684f6f7b70a74b6d0e818d86f5bd51ec406c1':
  Docs: Added Instant Run feature overview section

Change-Id: I438d08ecb9c9fcf54896a7ecc060b340c95b8aac
 2016-04-26 22:21:08 +00:00
Adarsh Fernando
e0d51990b0 Merge "Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am: b896cd1 am: abb5afc am: fe47b6d" into nyc-dev 
am: 7a82b58

* commit '7a82b58a8a030822c88166c62431d590918a70ee':
  Docs: Added Android Plugin for Gradle v2.0.0 Release Notes

Change-Id: I7e856920cbcb8183b9044a28f2d323f3981f0c44
 2016-04-26 22:21:01 +00:00
Adarsh Fernando
c3cdc28f61 Merge "Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am: 7961413 am: 88d1e91 am: 8776f89" into nyc-dev 
am: b14b1fd

* commit 'b14b1fd9fa73b6477a93ba38a86b0cb9675ec9aa':
  Docs: Added instructions to launch instrumented tests in AS using CTL

Change-Id: Ifd059e9982082df6b596ecd4b83eaf50a28c7bc2
 2016-04-26 22:20:52 +00:00
Dirk Dougherty
a5c1203ebc Merge "Update studio landing page and add all-new install flow docs. bug: 27850063 (update system reqs for 2.0) bug: 27725026 (update download page for 2.0) bug: 23908299 (clean up download and get started) am: 9577d31 am: fc35cf2 am: 478463a" into nyc-dev 
am: da816e8

* commit 'da816e80bc39e31224c51f50944313228d49dece':

Change-Id: I9a60fa47a2faebb6780ab79c3e444304500263b3
 2016-04-26 22:20:42 +00:00
Kevin Hufnagle
ceb47d040f Merge "Merge "docs: "Result is:" paragraph now in correct position on page." into mnc-mr-docs am: 7c909cc am: 090e5fb am: 5f6a355" into nyc-dev 
am: 5a073da

* commit '5a073da32b3f1c5eb4f4a4da036269fc413e24a6':

Change-Id: Ic2c7211f177c8a3deac8d7ded8bba6508803d5e4
 2016-04-26 22:20:28 +00:00
sreevanis
389cff3507 Merge "Merge "docs: Added new partner logos to the car brands section of auto index page." into mnc-docs am: 63f15a9 am: e7b8c79 am: 29c6f81 am: 26ed50a" into nyc-dev 
am: 239d2c2

* commit '239d2c2ea2de856a3462c9a42e7353766899118c':

Change-Id: I7cbcfbc0f3e8197089ab142c2e2f2f1c7d13debd
 2016-04-26 22:19:56 +00:00
Chad Brubaker
e1807559dc Merge "Merge "Add missing </pin-set>" into mnc-mr-docs am: 5f415c2 am: 0ed59f9 am: f1ac8fa" into nyc-dev 
am: 9dd786c

* commit '9dd786c7ee0f37c8434d3133a8234de54a0c5ef2':

Change-Id: I3cdb27b95ec0b24066e2a2a4ae4cb81fde4078d7
 2016-04-26 22:18:59 +00:00
Chad Brubaker
0400a2fba1 Merge "Merge "Fix application manifest XML" into mnc-mr-docs am: c8dcc2b am: 3fdc800 am: fc688ec" into nyc-dev 
am: c41d003

* commit 'c41d00358c3d54407dbd09dc80a2721449459337':

Change-Id: Id715a64a856413dee350a8c9935efaa7e487dd80
 2016-04-26 22:18:38 +00:00
Joe Fernandez
3f7c5f6605 Merge "Merge "docs: April 2016 Dashboard update" into mnc-mr-docs am: 4ec3749 am: 83113d6 am: 824429f" into nyc-dev 
am: 124260f

* commit '124260fe650afa6b523f67aebb63b279c4cca1b5':

Change-Id: I89c6cf841c901484edef193fd7bef55b083f1ca6
 2016-04-26 22:18:17 +00:00
Andrew Solovay
4ef5f59c33 Merge "Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs am: 242f06cd am: 0015bf0 am: bb64fe3" into nyc-dev 
am: 641fbbd

* commit '641fbbd3f3ebfceff7c21ffd02defd580156ae1a':

Change-Id: I511bb6c0d77f37c55170444595d19ef66f628bed
 2016-04-26 22:17:56 +00:00
Dirk Dougherty
cc01f7d6f5 Merge "Merge "Updates for Play." into mnc-mr-docs am: 3afd52a am: f4658e2 am: ab3721a" into nyc-dev 
am: 8b10dd2

* commit '8b10dd2054a1a39ca8a2b1bb6e7034c01cf07bf7':

Change-Id: I7368aaaf696369aaecfc753d94c207de877069e7
 2016-04-26 22:17:34 +00:00
Daniel Yu
5dc8236610 Merge "Merge "docs: Add note about missing recording functionality in Live Channels" into mnc-mr-docs am: cac018b am: 9e16ddc am: 461e731" into nyc-dev 
am: ae9e686

* commit 'ae9e686ffc9370dcdf08be2e9555dba36d7d4283':

Change-Id: Ic0ff850549d63a0bc91aca2f11aad5e3976d8d82
 2016-04-26 22:17:13 +00:00
Kevin Hufnagle
12ed73e49c Merge "Merge "docs: Fixed namespace shown in a line of style XML" into mnc-mr-docs am: 2f5a204 am: ddbf8d2c am: f63a1c4" into nyc-dev 
am: df5e147

* commit 'df5e1470aa254adf0ef1eda28264ff217574fea8':

Change-Id: Id90d4ecaefa24a5613a8d2c1b5af3a75ca89f2f7
 2016-04-26 22:16:38 +00:00
Kevin Hufnagle
6592605932 Merge "Merge "docs: Removed dead link in "create project" TOC." into mnc-mr-docs am: f380435 am: 0da507d am: 7f0d4d0" into nyc-dev 
am: d3ca191

* commit 'd3ca191a3fec53143839b5e556a9931d697e1f66':

Change-Id: Ie46cb0e7ed49a8098015fca9c57506a56b9dc792
 2016-04-26 22:15:22 +00:00