Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Todd Kennedy
5f5de63086 Merge "New prebuilt" into nyc-dev am: 93b34141b1 am: b724b68812 
am: 24d859ffb9

* commit '24d859ffb981fbebe3dd693830b642610fcc07c0':
  New prebuilt

Change-Id: I7b82190f2e61fa65544261e08d00a2cf310834a6
 2016-06-04 00:00:08 +00:00
Michael Wright
6063e51f7a Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev am: 44b24c9b38 am: 36481749e6 
am: 849473031b

* commit '849473031b30e0a15ae71c566dfbfae7b5fbc105':

Change-Id: Ifcc1a622b09752d314c55c1bb0258f9087b07cde
 2016-06-03 23:34:53 +00:00
Selim Cinek
a1a96e000e Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev am: 6c94972622 
am: 45735b4c53

* commit '45735b4c534f0423b02ac6401e3f3ac903e746fb':

Change-Id: I9b10857fd6021beff577b58568a207fbb2b8617e
 2016-06-03 23:31:16 +00:00
Android Build Merger (Role)
fc32a305f0 Merge "Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev am: 6c94972622 am: f7b21e1db0" into nyc-mr1-dev-plus-aosp 2016-06-03 23:28:13 +00:00
Android Build Merger (Role)
74babe679b Merge "Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev am: 3af59ef42c" into nyc-mr1-dev-plus-aosp 2016-06-03 23:28:07 +00:00
Android Build Merger (Role)
80267f2b08 Merge "Merge "am/UserController: Log system uptime at two \'boot complete\' markers." into nyc-dev am: eb47d6205f am: 440e3c7dfe" into nyc-mr1-dev-plus-aosp 2016-06-03 23:27:59 +00:00
Android Build Merger (Role)
c346a2d872 Merge "Merge "Delete account from DE and CE databases" into nyc-dev am: a087d7f4fa am: 93f4735f2f" into nyc-mr1-dev-plus-aosp 2016-06-03 23:27:53 +00:00
Android Build Merger (Role)
89a24c4b91 Merge "Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5 am: 90ee70e519" into nyc-dev am: c0b602c441 am: 422679c891" into nyc-mr1-dev-plus-aosp 2016-06-03 23:27:40 +00:00
George Mount
579a1e973f Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev 
am: 3af59ef42c

* commit '3af59ef42c83fbe4bf9e54f807597bddc6aa7ecd':
  Internal API for cross-task Activity used by assistant.

Change-Id: Idb8c49437ff7d151e186edd2112e4def8d7a7e15
 2016-06-03 23:27:31 +00:00
Android Build Merger (Role)
a19aeccee1 Merge "Merge "docs: Update N release notes for DP4" into nyc-dev am: e20c1e96fc am: 16918804a2" into nyc-mr1-dev-plus-aosp 2016-06-03 23:27:30 +00:00
James Hawkins
12a11215b2 Merge "am/UserController: Log system uptime at two \'boot complete\' markers." into nyc-dev am: eb47d6205f 
am: 440e3c7dfe

* commit '440e3c7dfed674bd56f1693e7c7a67e21cf707bb':
  am/UserController: Log system uptime at two 'boot complete' markers.

Change-Id: Idf1bc4cd1c317e230413eb48785ae78579460cb3
 2016-06-03 23:27:28 +00:00
Android Build Merger (Role)
95be083280 Merge "Merge "New prebuilt" into nyc-dev am: 93b34141b1 am: d2568ccdcc" into nyc-mr1-dev-plus-aosp 2016-06-03 23:27:15 +00:00
Selim Cinek
bd72530b14 Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev am: 6c94972622 
am: f7b21e1db0

* commit 'f7b21e1db040b211356e639b5324a4826871de69':
  Fixed a bug where talkback couldn't scroll through notifications

Change-Id: Ie1dc2e51af0acfddfcb4538dcd90e7558379524e
 2016-06-03 23:26:33 +00:00
Fyodor Kupolov
b82c3036a5 Merge "Delete account from DE and CE databases" into nyc-dev am: a087d7f4fa 
am: 93f4735f2f

* commit '93f4735f2ffd4dfc8ea29c98cc6d9079a309f883':
  Delete account from DE and CE databases

Change-Id: I9e647dcb5fa4b1acc19a61a509f73234877c75f7
 2016-06-03 23:26:31 +00:00
Billy Lamberta
d001a966f1 Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5 am: 90ee70e519" into nyc-dev am: c0b602c441 
am: 422679c891

* commit '422679c8919db6b48b54d8c4745251591b0c3c50':
  docs: Fix code sample in /work: Set up Single-Purpose Devices

Change-Id: I01977b5e0c27390f84845b3bcd5011314565a20d
 2016-06-03 23:26:28 +00:00
Andrew Solovay
8186e7acfa Merge "docs: Update N release notes for DP4" into nyc-dev am: e20c1e96fc 
am: 16918804a2

* commit '16918804a2b57f780932723c2f2eb7c59f095d23':
  docs: Update N release notes for DP4

Change-Id: I5a7873ac81c988395b4ab142f9d8aec0aba8324f
 2016-06-03 23:26:25 +00:00
Wang Xiaolei
ff05b5778f Merge "New prebuilt" into nyc-dev am: 93b34141b1 
am: d2568ccdcc

* commit 'd2568ccdcca2f974ed93c95de140f3c249888fe0':
  New prebuilt

Change-Id: I75f949e7925e2be08fd4ae57b3477974a38a7b42
 2016-06-03 23:24:11 +00:00
Selim Cinek
3eec7d66de Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev am: 6c94972622 
am: 6efad815c2

* commit '6efad815c2fc81416d17521a547407dec0528a58':
  Fixed a bug where talkback couldn't scroll through notifications

Change-Id: I4cbe2a13cd2a05dd9c550a0499e72ef5035b92c1
 2016-06-03 23:22:01 +00:00
Fyodor Kupolov
b5a46631c9 Merge "Delete account from DE and CE databases" into nyc-dev am: a087d7f4fa 
am: de5521d049

* commit 'de5521d049356b13301b7f6d27879af42224a563':
  Delete account from DE and CE databases

Change-Id: I1286a795b0f472732426690b32fe69a161552306
 2016-06-03 23:21:59 +00:00
Billy Lamberta
62c91371ce Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5 am: 90ee70e519" into nyc-dev am: c0b602c441 
am: ce13039f1d

* commit 'ce13039f1d4336d713700455ad0af388cc896d0a':
  docs: Fix code sample in /work: Set up Single-Purpose Devices

Change-Id: Ic8bd13319057fe94d98aa2c3a9a64e46728c2345
 2016-06-03 23:21:56 +00:00
Andrew Solovay
f01349d16a Merge "docs: Update N release notes for DP4" into nyc-dev am: e20c1e96fc 
am: 37286f7092

* commit '37286f7092e14184abf9f3435771d72ca1004f25':
  docs: Update N release notes for DP4

Change-Id: I41f94bc08cc6da0f8a6405c45577c519d473280d
 2016-06-03 23:21:54 +00:00
Wang Xiaolei
24d859ffb9 Merge "New prebuilt" into nyc-dev am: 93b34141b1 
am: b724b68812

* commit 'b724b68812d5ea90d2d149b2abf7af4f91816bca':
  New prebuilt

Change-Id: I6a2bf01417ada0fee5f6cc4e39bc224bf7731554
 2016-06-03 23:21:50 +00:00
Wang Xiaolei
849473031b Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev am: 44b24c9b38 
am: 36481749e6

* commit '36481749e61cf6286630a86699c16c595a13450d':

Change-Id: I058ff76e2c092fc38097c65860b33c4db35cca4c
 2016-06-03 23:00:34 +00:00
Jorim Jaggi
526505da25 Add new attributes for wallpaper info 
Adjust test wallpaper to use these attributes.

Also fix some issues where wallpaper got laid out differently in the preview
mode.

Bug: 28770685
Change-Id: I259f3884f5f2c0b723a6a5ce012d45170f64c4c7
 2016-06-03 15:50:31 -07:00
George Mount
3af59ef42c Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev 2016-06-03 22:22:53 +00:00
James Hawkins
440e3c7dfe Merge "am/UserController: Log system uptime at two \'boot complete\' markers." into nyc-dev 
am: eb47d6205f

* commit 'eb47d6205f28d89d8bb1a3e127659dc24727fa7e':
  am/UserController: Log system uptime at two 'boot complete' markers.

Change-Id: I487eaa279cc0054675c722d1c91b82598b4dd45d
 2016-06-03 22:20:14 +00:00
Selim Cinek
6efad815c2 Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev 
am: 6c94972622

* commit '6c94972622a5fa6c2f0beb16f190015e81584013':
  Fixed a bug where talkback couldn't scroll through notifications

Change-Id: I41bf71eabe7ab90cd93df33c28ac07ad5abd8354
 2016-06-03 22:18:16 +00:00
Fyodor Kupolov
de5521d049 Merge "Delete account from DE and CE databases" into nyc-dev 
am: a087d7f4fa

* commit 'a087d7f4fa6de262aef346acb336fcb826d05d23':
  Delete account from DE and CE databases

Change-Id: Id21fda0bca3c257f5ba8e68fb09a6de47f8f3374
 2016-06-03 22:18:15 +00:00
Billy Lamberta
ce13039f1d Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5 am: 90ee70e519" into nyc-dev 
am: c0b602c441

* commit 'c0b602c441337f9597959a02262de525b1793a94':
  docs: Fix code sample in /work: Set up Single-Purpose Devices

Change-Id: I18a126393bb04d0325946a980f247edd2f3788ad
 2016-06-03 22:18:13 +00:00
Andrew Solovay
37286f7092 Merge "docs: Update N release notes for DP4" into nyc-dev 
am: e20c1e96fc

* commit 'e20c1e96fc0bb85ad5fe52ec1734c2563886dab0':
  docs: Update N release notes for DP4

Change-Id: Iee292ba0b9f1f1eae2dcaadf58a06b75e4d5c8f3
 2016-06-03 22:18:11 +00:00
Todd Kennedy
b724b68812 Merge "New prebuilt" into nyc-dev 
am: 93b34141b1

* commit '93b34141b1de89a8f176884c3ceb7bc968b252d0':
  New prebuilt

Change-Id: I4a9041473718ae00499dcccb2ccf98204ccfb80a
 2016-06-03 22:17:58 +00:00
James Hawkins
45735b4c53 Merge "am/UserController: Log system uptime at two \'boot complete\' markers." into nyc-dev 
am: eb47d6205f

* commit 'eb47d6205f28d89d8bb1a3e127659dc24727fa7e':
  am/UserController: Log system uptime at two 'boot complete' markers.

Change-Id: I4846c21cb7623c5528ebd51f8bc95d55b40d8536
 2016-06-03 22:06:41 +00:00
Jeff Sharkey
9ab52ff8bb Merge "Third time is the charm?" 2016-06-03 22:06:28 +00:00
Jeff Sharkey
5fe3e5feb8 Third time is the charm? 
Change-Id: Ibd21422731aa48aaca0b6cb8d7b0aec1e5debfa0
 2016-06-03 16:04:19 -06:00
TreeHugger Robot
eb47d6205f Merge "am/UserController: Log system uptime at two 'boot complete' markers." into nyc-dev 2016-06-03 22:01:05 +00:00
Jeff Sharkey
d8b6144055 Merge "Maybe it will build this time?" 2016-06-03 21:57:32 +00:00
TreeHugger Robot
5a780c0b17 Merge "Tethering: Own WiFi tethering state and lifetime" 2016-06-03 21:57:05 +00:00
Jeff Sharkey
b56d6ec66f Maybe it will build this time? 
Change-Id: Ibcd33f2c793d21ac91eb0f8fe537f4fec14aeb61
 2016-06-03 15:42:04 -06:00
Aurimas Liutikas
bfc3cfdec5 Remove duplicate the from AppBar documentation. 
Bug:
https://code.google.com/p/android/issues/detail?id=187156

Change-Id: I5ee5e93b5e5b004f49e860047e4e2610b44e81d9
 2016-06-03 14:39:10 -07:00
Jeff Sharkey
cbb36eba7a Merge "Follow refactoring to fix build." 2016-06-03 21:28:57 +00:00
Jeff Sharkey
a3ddfd500b Follow refactoring to fix build. 
Change-Id: I763376c73388de42f3545c05983d00392c1d2629
 2016-06-03 15:26:20 -06:00
George Mount
04073dc5be Internal API for cross-task Activity used by assistant. 
29091742

A new internal API has been created for use by assistant
to launch an Activity Transition from a non-Activity.

The ActivityOptions are also passed along when using
a spring board Activity so that the shared elements
can be properly synchronized.

This also fixes TransitionManager.endTransition so
that it forces Transitions to end the animations.

Change-Id: Id18d9765bfc0c7b438e17966455aa66d3fa3aeda
 2016-06-03 14:08:06 -07:00
Jeff Sharkey
eb1419f052 Merge commit \'44b24c9b38d87dfd8bee2aca381f18a9106313dc\' into manual_merge_44b24c9 am: f5b0bf3563 
am: b8fff382c6

* commit 'b8fff382c63a51c6fc53a968226b26da8ea0c023':
  Fix build after merge.

Change-Id: Ic330f58f2582260eab566d524ad37dad995d8415
 2016-06-03 21:04:16 +00:00
Jeff Sharkey
04a2c0a02b Merge "resolve merge conflicts of 0c26c32 to master" 2016-06-03 21:02:45 +00:00
Jeff Sharkey
a0d2e12fe0 resolve merge conflicts of 0c26c32 to master 
Change-Id: I2398a72d7a3575743e5948bc16b1b8582ccf106b
 2016-06-03 15:00:10 -06:00
Selim Cinek
f7b21e1db0 Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev 
am: 6c94972622

* commit '6c94972622a5fa6c2f0beb16f190015e81584013':
  Fixed a bug where talkback couldn't scroll through notifications

Change-Id: I66de0c19d02ef87cdb183c1d3f55ca7f6451cab8
 2016-06-03 20:51:49 +00:00
Jeff Sharkey
b8fff382c6 Fix build after merge. 
am: 9351225839

* commit '935122583967643979f103030b95afd59e57ff59':
  Fix build after merge.

Change-Id: I7c92c65266e623f8b245b4dcbbd6aef85eaef74b
 2016-06-03 20:40:32 +00:00
Fyodor Kupolov
93f4735f2f Merge "Delete account from DE and CE databases" into nyc-dev 
am: a087d7f4fa

* commit 'a087d7f4fa6de262aef346acb336fcb826d05d23':
  Delete account from DE and CE databases

Change-Id: Ied3a5d614b814be094df50317db494f60b5a4727
 2016-06-03 20:40:21 +00:00
Aurimas Liutikas
c363018d1a Merge "Fix a link to CustomTabsCallback in support-library docs." 2016-06-03 20:40:18 +00:00
Selim Cinek
6c94972622 Merge "Fixed a bug where talkback couldn't scroll through notifications" into nyc-dev 2016-06-03 20:39:25 +00:00