Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
249,922 Commits 3 Branches 0 Tags
6501ac3bf9cfd8d940d2c36ab2df72bda1cab52e
Commit Graph

249922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
413c1828c8 Merge "Fix transition for forced resizable exit" into nyc-dev 
am: 6cb8a2cfd2

* commit '6cb8a2cfd2060301942b2a71f22ef62e9f39ffca':
  Fix transition for forced resizable exit

Change-Id: Ifcfee88a136d777aa3b87873fbe55cf7e587a30e
 2016-05-13 21:27:01 +00:00
Sid Soundararajan
a02fbe1ea0 Merge "Remove task based on object rather than position" into nyc-dev 
am: e1293b7d07

* commit 'e1293b7d07f5854337fef35a2e3b4338df90866e':
  Remove task based on object rather than position

Change-Id: I74d2dec60c6e7173d818d92ac166143a6b292f40
 2016-05-13 21:26:57 +00:00
Jorim Jaggi
c38966194b Don\'t allow any app to specify rotation unless in home task 
am: 0f6a6c4bc1

* commit '0f6a6c4bc15fee726ef9aeb0d99b1204767f431d':
  Don't allow any app to specify rotation unless in home task

Change-Id: Id53a86c7c4878e90021d0d82172a1fbb49cc13fe
 2016-05-13 21:26:52 +00:00
Jorim Jaggi
6cb8a2cfd2 Merge "Fix transition for forced resizable exit" into nyc-dev 2016-05-13 21:22:02 +00:00
Sid Soundararajan
e1293b7d07 Merge "Remove task based on object rather than position" into nyc-dev 2016-05-13 21:19:24 +00:00
Jorim Jaggi
e6d157b936 Fix transition for forced resizable exit 
Since the transition is picked from layout params from the activity
below, we need to manually override it.

Bug: 28750938
Change-Id: I7351c7d8bd14a393cba51d6afb1e644204217440
 2016-05-13 21:18:52 +00:00
Jorim Jaggi
0f6a6c4bc1 Don't allow any app to specify rotation unless in home task 
The previous logic was racy/buggy in a sense so that the non-home app
could still force the orientation when the divider was still minimized.
The logic is cleaned up so only the home task can force the orientation
in multi-window.

Change-Id: I9eccf86d9fa442375d6eca400cb6ac0815c9fa10
Fixes: 28675152
 2016-05-13 21:17:53 +00:00
Chong Zhang
03da19d43a Merge "Update stack bounds for fullscreen if rotated after updateDisplayInfo" into nyc-dev 
am: 918084e9ae

* commit '918084e9ae9620c745e4d6212f6648771051e706':
  Update stack bounds for fullscreen if rotated after updateDisplayInfo

Change-Id: Id63563c3c8ea8233e3e4d5204d3eb7ca33cf5db5
 2016-05-13 20:54:39 +00:00
Wale Ogunwale
c33568f1f8 Merge "Fixed some issues with fullscreen dimming" into nyc-dev 
am: e208bd4cbe

* commit 'e208bd4cbea7468c989d25ef582e5a9ed7ecabf1':
  Fixed some issues with fullscreen dimming

Change-Id: Ib215528bf25972ef0bac0217029a67721fd69fde
 2016-05-13 20:52:01 +00:00
Chong Zhang
918084e9ae Merge "Update stack bounds for fullscreen if rotated after updateDisplayInfo" into nyc-dev 2016-05-13 20:48:32 +00:00
TreeHugger Robot
e208bd4cbe Merge "Fixed some issues with fullscreen dimming" into nyc-dev 2016-05-13 20:42:21 +00:00
Adam Powell
e30299f990 Add Fragment#onAttachFragment for parent fragments 
Framework edition

Add a matching onAttachFragment method to Fragment to match the
fragment host version.

Bug 28760393

Change-Id: I5f50b3446449cae7110da6b4e468ee80f413e1e5
 2016-05-13 13:38:45 -07:00
Andrew Solovay
4d93a21980 docs: Updates to multi-window and related docs. 
Clarified behavior when activity is resized or put in fullscreen
mode, per b/28580007 . Also (per email from o-o) removed misleading
statement about when onStop() might or might not be called.

Both changes can go live now (multiwindow update applies to DP1 & 2,
and onStop() clarification applies to all versions of API), so I'll
submit as soon as this is approved.

See first comment for doc stage location.

bug: 28580007
Change-Id: Ib008f24e5796ec7810b67c91e512e679680d4afd
 2016-05-13 13:33:55 -07:00
Adrian Roos
fbddd2c39c Fix broken MessagingStyle 
Messages with a "null" sender indicating a message from
the local user did not correctly unparcel.

Change-Id: I7d42d5dc407ebd8d1e3b5451f72f52cc1543a32d
Fixes: 28763122
 2016-05-13 12:57:34 -07:00
Bert McMeen
c0780f1d52 docs: Complications guide for Wear Preview 
Bug: 28425614
Change-Id: Ic1d5ce1a962b39a395c447c1f4d3bfadd6114246
 2016-05-13 12:30:17 -07:00
Alan Viverette
fdb54bda75 Give the AM/PM buttons slightly more content area 
Bug: 28506707
Change-Id: I7dbe472dfa6a5122ca4b80c55a6a3bcf729988f4
 2016-05-13 14:42:41 -04:00
Wei Wang
cde5d3db24 Properly handle registration timeout in BLE. 
am: 02bc008607

* commit '02bc0086071b5faff260566b4d3713861703eee3':
  Properly handle registration timeout in BLE.

Change-Id: I1cfeb8c7a84b667854871d7f6eafd0bb6a918d50
 2016-05-13 18:35:08 +00:00
Wei Wang
02bc008607 Properly handle registration timeout in BLE. 
Bug:25384098
Change-Id: I7877f6368c4982fcd91e68810c4da0ab7b5fc6b7
 2016-05-13 18:32:15 +00:00
Abodunrinwa Toki
cb66406d33 Ensure that ViewGroup.getChildVisibleRect(...) is recursive. 
This change fixes the issue where
getChildVisibleRect(View, Rect, Point, boolean) call isn't recursive.
The method was introduced in I49550ed4082bcbdcfe4643b962b50f3308092525

Bug: 28514727
Change-Id: Ib6b0fb67ca6c700b44f645319c23b1213a2742d4
 2016-05-13 19:26:03 +01:00
Dirk Dougherty
71c9171312 Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am: 3a263cec30 am: 6d3ca9aaa9 am: 0e4b51ebc6 
am: b72bf5cfdd

* commit 'b72bf5cfdd35b72f3335b29165d9f7b01474b30a':
  Correct the DP2 status beta -> alpha.

Change-Id: Ic6e6d753a59f4676ebcb1b7246ed2eab420866e9
 2016-05-13 18:19:20 +00:00
Joe Fernandez
07e7c3cc97 Merge "docs: change preview landing page top ribbon color" into mnc-io-docs am: a138ad92b2 am: 3357a67905 
am: cfe2e7e1a9

* commit 'cfe2e7e1a9950df852a06e5363f4c0bd9b59b8e5':
  docs: change preview landing page top ribbon color

Change-Id: I496860c13370ba64608b800bd7d826e03285effa
 2016-05-13 18:16:38 +00:00
Dirk Dougherty
b72bf5cfdd Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am: 3a263cec30 am: 6d3ca9aaa9 
am: 0e4b51ebc6

* commit '0e4b51ebc6b86a535a9f7757e8b64f70a10aaa30':
  Correct the DP2 status beta -> alpha.

Change-Id: I9fded988b946d669f9560716563771f8e6b82351
 2016-05-13 18:16:15 +00:00
Joe Fernandez
cfe2e7e1a9 Merge "docs: change preview landing page top ribbon color" into mnc-io-docs am: a138ad92b2 
am: 3357a67905

* commit '3357a67905453d64846079e560bbe893c4c733b6':
  docs: change preview landing page top ribbon color

Change-Id: I7eede6be5a8960e7f2360656c66b136f519fb1bb
 2016-05-13 18:13:46 +00:00
Dirk Dougherty
0e4b51ebc6 Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am: 3a263cec30 
am: 6d3ca9aaa9

* commit '6d3ca9aaa91328d3664a217fee8a49c9ee46858e':
  Correct the DP2 status beta -> alpha.

Change-Id: Iecc460e2b5399bff284f8d2479d475325fc8a1df
 2016-05-13 18:13:40 +00:00
Joe Fernandez
3357a67905 Merge "docs: change preview landing page top ribbon color" into mnc-io-docs 
am: a138ad92b2

* commit 'a138ad92b299bf32a59ee5f4ba5a9e34e6998cb4':
  docs: change preview landing page top ribbon color

Change-Id: Ib7d5c3fc9a133ceb0a97f801218481a94fb15a47
 2016-05-13 18:11:15 +00:00
Dirk Dougherty
6d3ca9aaa9 Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs 
am: 3a263cec30

* commit '3a263cec302b3d1883e3cc48b068c05240506d31':
  Correct the DP2 status beta -> alpha.

Change-Id: I925a0c044e1b7b6186f348c4c8e216b8f53a13f4
 2016-05-13 18:11:11 +00:00
Chong Zhang
ccc335cfc7 Update stack bounds for fullscreen if rotated after updateDisplayInfo 
Rotation could change again after updateDisplayInfo is called. We
need to set stack bounds even for fullscreen stacks in this case.
Otherwise the bounds will be incorrect until it's rotated again.

bug: 28611814
Change-Id: I31289524a9ceacaaaa66924e9bf6cbe88fd83f99
 2016-05-13 11:07:22 -07:00
Joe Fernandez
a138ad92b2 Merge "docs: change preview landing page top ribbon color" into mnc-io-docs 2016-05-13 18:06:42 +00:00
Dirk Dougherty
3a263cec30 Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs 2016-05-13 18:03:24 +00:00
Amanda Kassay
927bc1bddb Merge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs am: 379e28db22 am: 494a4c967c am: 899981c244 
am: a63801a7c2

* commit 'a63801a7c2fa80d5815c78d6339536690803b34b':
  Clean up sdk/sdk_vars.cs file b/28744510

Change-Id: I618373eae7c09031db297ed9c894756b37420ab8
 2016-05-13 18:02:22 +00:00
Dirk Dougherty
d9ad1ca8fb Correct the DP2 status beta -> alpha. 
Bug: 28175714
Change-Id: I050c9a41961528c1d65cd9b9737d93c82d16aef2
 2016-05-13 11:01:46 -07:00
Amanda Kassay
a63801a7c2 Merge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs am: 379e28db22 am: 494a4c967c 
am: 899981c244

* commit '899981c2442807cf637b5a9280a71cfe22e45880':
  Clean up sdk/sdk_vars.cs file b/28744510

Change-Id: I3d21f2b99ead958ed064ea4d81dbea95513ce5a6
 2016-05-13 17:59:59 +00:00
Joe Fernandez
85f0641d1b docs: change preview landing page top ribbon color 
Change-Id: Iaa406a83de47df49eab54d1265629edc4dd57479
 2016-05-13 10:59:02 -07:00
xu.peng
5676ca8978 Merge "Fix "TelephonyRegistry notifies wrong data status"" am: 3b2f202599 
am: ff3a7571c7

* commit 'ff3a7571c78796b9f0ffdbb324f2a3d4895cede1':
  Fix "TelephonyRegistry notifies wrong data status"

Change-Id: I8868f7fc6eafcb710b33c84f63f602e7e71a64c3
 2016-05-13 17:57:32 +00:00
Amanda Kassay
899981c244 Merge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs am: 379e28db22 
am: 494a4c967c

* commit '494a4c967cc4bb648da3b79d777b1c089445b41f':
  Clean up sdk/sdk_vars.cs file b/28744510

Change-Id: Id6ba8a4083bc7753f5d0e6387ac0a18778cf1a27
 2016-05-13 17:57:28 +00:00
Amanda Kassay
494a4c967c Merge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs 
am: 379e28db22

* commit '379e28db228f2c0102ec41925600155c058a1ea7':
  Clean up sdk/sdk_vars.cs file b/28744510

Change-Id: I4b262eca7ca315d1ae0d51bd77ec2bcf35cadb77
 2016-05-13 17:54:57 +00:00
xu.peng
ff3a7571c7 Merge "Fix "TelephonyRegistry notifies wrong data status"" 
am: 3b2f202599

* commit '3b2f202599bca3da369667bf69ab39df9d8d894d':
  Fix "TelephonyRegistry notifies wrong data status"

Change-Id: I2d9ecd7132c8028c79b008b737b4b7d6d87211b3
 2016-05-13 17:54:56 +00:00
Amanda Kassay
379e28db22 Merge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs 2016-05-13 17:51:19 +00:00
Treehugger Robot
3b2f202599 Merge "Fix "TelephonyRegistry notifies wrong data status"" 2016-05-13 17:46:41 +00:00
Steve McKay
6fdaf2f2cf Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev 
am: fec0d188c1

* commit 'fec0d188c166e5a2c517f4494e83c1db11b31c68':
  Don't show new-window item in Downloads per Gabe.

Change-Id: Ic8d6afb5e38c1ded0ca7750be4ac4822aefbe6c1
 2016-05-13 17:31:35 +00:00
TreeHugger Robot
fec0d188c1 Merge "Don't show new-window item in Downloads per Gabe." into nyc-dev 2016-05-13 17:26:46 +00:00
Bert McMeen
3ec4cf8068 docs: Wear preview docs: Get Started, Download/Test, Program Overview 
Bug: 28317997
Change-Id: I7053f9cc336edecf91a256c31e6650a61ef4ae2d
 2016-05-13 10:26:34 -07:00
Kevin Hufnagle
48d3c19458 Merge "Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am: ec6effa1b0 am: 70f2e39008 am: e60af6b9e2" into nyc-dev 
am: 5dbbb72e71

* commit '5dbbb72e71455a676c39b3e43c2615ba4ce4d08d':
  docs: App Translation API updates

Change-Id: I21bdeeb023b4076eb1143a3a95e9afacd3123eb7
 2016-05-13 17:23:36 +00:00
Paul Jensen
919306690a Merge "Use APF program to drop non-IP non-ARP broadcasts" into nyc-dev 
am: 90ba8cf379

* commit '90ba8cf3799fa60138d212e092cc7f0a5e79374f':
  Use APF program to drop non-IP non-ARP broadcasts

Change-Id: I17fd739c51c45ab8152b1ebf1a108fb74cf85ef2
 2016-05-13 17:23:30 +00:00
Felipe Leme
e90dee0077 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev 
am: 25018d41f4

* commit '25018d41f482fe21a45eb2e739f22dc7cc937428':
  Fixed connectivity state in some power saving scenarios.

Change-Id: I7ebe3864657d2147034ffae400312e94deb5ef35
 2016-05-13 17:23:24 +00:00
Android Build Merger (Role)
5dbbb72e71 Merge "Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am: ec6effa1b0 am: 70f2e39008 am: e60af6b9e2" into nyc-dev 2016-05-13 17:21:14 +00:00
Kevin Hufnagle
90fa73b6d6 Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am: ec6effa1b0 am: 70f2e39008 
am: e60af6b9e2

* commit 'e60af6b9e2645144cda30c5e54a1267f05ac1d0d':
  docs: App Translation API updates

Change-Id: Idc2ad381a5105b6502f3c37b08ec30ebbf6568eb
 2016-05-13 17:20:42 +00:00
Joe Fernandez
e60af6b9e2 Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am: ec6effa1b0 
am: 70f2e39008

* commit '70f2e3900830f58cd8b4644319ba7e173c49f7c3':
  docs: App Translation API updates

Change-Id: Id1b10da621def8add8384011755a8a7061e06ff0
 2016-05-13 17:17:53 +00:00
Adam Powell
ac3f24fabd Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev 
am: e89dc40706

* commit 'e89dc40706f325e039de7dd6714223908dfb9b17':
  Show package icon/label for resolved package-targeted implicit intents

Change-Id: I178045e372dd962383fbc6d26fe7b99b20f6cf88
 2016-05-13 17:17:48 +00:00
Paul Jensen
90ba8cf379 Merge "Use APF program to drop non-IP non-ARP broadcasts" into nyc-dev 2016-05-13 17:14:47 +00:00