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
Amanda Kassay
4be59f0ae3 Revert "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." 
am: c68d8768c8

* commit 'c68d8768c84dd045d3db3f685a95963eb315be8c':
  Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section."

Change-Id: I40fa99170770712c4d844eab0d1e3d6fa9373d90
 2016-05-25 21:28:01 +00:00
Andrii Kulian
0be2cfec46 Fix exception when trying to update config of detached stack 
There is an NullPointerException which can be reproduced with following steps
on angler:
1. In split-screen open activities from the same app.
   Make sure to launch them from launcher.
2. Rotate device to landscape.
3. Force-stop the app using adb command.

After killing the app it will try to open launcher, which is fixed in
portrait mode on that device. This will update the configuration for all the
stacks, including already detached.

Bug: 28786255
Change-Id: Ia326c09cff9f1a3fb43cca5b48db29718553346a
 2016-05-25 14:27:39 -07:00
Eric Schmidt
5548a7c59c Merge "docs: Instant Apps broken link, wonky video thumbnail" into mnc-io-docs 2016-05-25 21:27:35 +00:00
Zach Kuznia
5bcd9cf1c5 Merge "Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev am: a5e6601ad1 am: d865a2ba6a" into nyc-mr1-dev-plus-aosp 
am: 94dd543957

* commit '94dd54395760f94d6f2d80e0c016fab6c285ac12':

Change-Id: Ib5d820c874d65a112f85bff468f67e1f2f4793e6
 2016-05-25 21:26:31 +00:00
Zachary Kuznia
11636fba1a Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev am: a5e6601ad1 am: 48d08caa30 
am: f4285e92d7

* commit 'f4285e92d794081c15edbce8032bd663984f5158':
  Ensure MotionEvent.split() won't be given an invalid value.

Change-Id: I4259820aacdf10d62d6cf7d81163f29de5be287c
 2016-05-25 21:26:25 +00:00
Zach Kuznia
c9eb2c47b1 Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev am: a5e6601ad1 
am: c8a35d64c6

* commit 'c8a35d64c68386a3be9ecd49f8a7cb6463a80182':
  Left and right margins for watch preferences.

Change-Id: Ib7888054d18139e7bbb1903242c16a69f25daf88
 2016-05-25 21:21:18 +00:00
Robin Lee
30c63961dd Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev 
am: 48b18f4fa9

* commit '48b18f4fa994e201e3eb4cca1e7c823b198359c5':
  Return legacy VPN info regardless of lockdown mode

Change-Id: I89c0784d5edae3c7ef9f8ec1c6ee4f823dbbae02
 2016-05-25 21:20:43 +00:00
Robin Lee
ef7e644fc5 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev 
am: 48b18f4fa9

* commit '48b18f4fa994e201e3eb4cca1e7c823b198359c5':
  Return legacy VPN info regardless of lockdown mode

Change-Id: I202f19946246aa52d37c3c6bb7665cc58ddf8572
 2016-05-25 21:19:08 +00:00
Alan Viverette
29c01336db Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev 2016-05-25 21:17:53 +00:00
Amanda Kassay
c68d8768c8 Revert "Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section." 
This reverts commit 85b7df2697.

Change-Id: I5c0256cbdc0f3c3588f10eb5accef8cf68642bbb
 2016-05-25 17:14:08 -04:00
Android Build Merger (Role)
94dd543957 Merge "Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev am: a5e6601ad1 am: d865a2ba6a" into nyc-mr1-dev-plus-aosp 2016-05-25 21:14:02 +00:00
Zach Kuznia
5716bc77c7 Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev am: a5e6601ad1 
am: d865a2ba6a

* commit 'd865a2ba6a86f6a28214a23fc31732defa3f9c46':
  Ensure MotionEvent.split() won't be given an invalid value.

Change-Id: If51510d977e080291c4815a1924e615f8fdf25c9
 2016-05-25 21:13:33 +00:00
Zach Kuznia
f4285e92d7 Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev am: a5e6601ad1 
am: 48d08caa30

* commit '48d08caa30c04ced21f11149ba2e117635c5db5d':
  Ensure MotionEvent.split() won't be given an invalid value.

Change-Id: Id83890a9d8bbcf7f6cde4e44fad493f863c5b0ea
 2016-05-25 21:13:22 +00:00
Alan Viverette
0d203354b9 Fix borderless colored button text color 
Bug: 28962396
Change-Id: I8cd8d24c778e2174d268da7ad40e43a4cfc142eb
 2016-05-25 17:10:33 -04:00
Danny Epstein
c8a35d64c6 Merge "Left and right margins for watch preferences." into nyc-mr1-dev 2016-05-25 21:09:21 +00:00
Chris Wren
698b1706be add metrics for notification and group expansion 
Bug: 28146482
Change-Id: Id7f71873ba33f85c1a1f2c48b47f78d40df46c0d
 2016-05-25 17:08:17 -04:00
Android Build Merger (Role)
8df75ef27f Merge "Merge "API council feedback: hide and document." into nyc-dev am: dfe232c763 am: 55a83354bf am: 3a5a6e239a" 2016-05-25 21:07:33 +00:00
Android Build Merger (Role)
f3297ca919 Merge "Merge "API council feedback: hide and document." into nyc-dev am: dfe232c763 am: 19e2f49181 am: e2c9ed48ba" 2016-05-25 21:07:25 +00:00
Android Build Merger (Role)
96a4e0bbfb Merge "Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev am: 6f84a27a75 am: 2034a76a6e" 2016-05-25 21:07:17 +00:00
Jeff Sharkey
309bc0f8ac Merge "API council feedback: hide and document." into nyc-dev am: dfe232c763 am: 55a83354bf 
am: 3a5a6e239a

* commit '3a5a6e239a81b1a835ba5d24b52c1a5a7a5a219a':

Change-Id: I55eea1304d724b43850ceb1bbebc3545a3c5d389
 2016-05-25 21:06:47 +00:00
Jeff Sharkey
e3f4aaf57f Merge "API council feedback: hide and document." into nyc-dev am: dfe232c763 am: 19e2f49181 
am: e2c9ed48ba

* commit 'e2c9ed48ba5eed95c7fdf45744e7fbeb4597cbd1':
  API council feedback: hide and document.

Change-Id: I002236f584ddc7a5f479b8936e4b5f5ed61759eb
 2016-05-25 21:06:41 +00:00
Sunny Goyal
9a82574d0b Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev am: 6f84a27a75 
am: 2034a76a6e

* commit '2034a76a6e0d00d1e72ebae4c0fdd0feb5b345bd':
  Maintaining diff for all widget operations instead of just the Views update

Change-Id: I7df336ac8079b42dbe34be0e970aa6c9ced99da9
 2016-05-25 21:06:31 +00:00
Zachary Kuznia
d865a2ba6a Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev 
am: a5e6601ad1

* commit 'a5e6601ad1db77563038946ed1316134f7e55ee6':
  Ensure MotionEvent.split() won't be given an invalid value.

Change-Id: Ide2f549e62750f39cecee18a71e0f35d4724d1f3
 2016-05-25 21:06:19 +00:00
Zachary Kuznia
48d08caa30 Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev 
am: a5e6601ad1

* commit 'a5e6601ad1db77563038946ed1316134f7e55ee6':
  Ensure MotionEvent.split() won't be given an invalid value.

Change-Id: I1264c964316d385cf155ca3db702734ef69d1f1f
 2016-05-25 21:06:13 +00:00
Robin Lee
48b18f4fa9 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev 2016-05-25 21:05:55 +00:00
Ben Lin
b81fa7eafd Merge "Fixing some tests for Phone form-factor." 2016-05-25 21:04:53 +00:00
Jeff Sharkey
3a5a6e239a Merge "API council feedback: hide and document." into nyc-dev am: dfe232c763 
am: 55a83354bf

* commit '55a83354bf36c057dfb26bf5aca075f112afea69':

Change-Id: I6ffe0cc7ade34b0b87c37749b387d1810770adce
 2016-05-25 21:01:32 +00:00
Zach Kuznia
a5e6601ad1 Merge "Ensure MotionEvent.split() won't be given an invalid value." into nyc-dev 2016-05-25 20:57:25 +00:00
Jeff Sharkey
e2c9ed48ba Merge "API council feedback: hide and document." into nyc-dev am: dfe232c763 
am: 19e2f49181

* commit '19e2f49181b209d790f551b374d6d24002de7c9b':
  API council feedback: hide and document.

Change-Id: I3715fc6e824f2a55517788299afe36145db597d7
 2016-05-25 20:54:18 +00:00
Sunny Goyal
2034a76a6e Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev 
am: 6f84a27a75

* commit '6f84a27a7597a3bc34316baf2af2bda30a2d75de':
  Maintaining diff for all widget operations instead of just the Views update

Change-Id: Iae3f2a6fc040d4484788ba203e0e0b6a66ed5c48
 2016-05-25 20:54:11 +00:00
Jeff Sharkey
19e2f49181 Merge "API council feedback: hide and document." into nyc-dev 
am: dfe232c763

* commit 'dfe232c7636d16379191442bdb2bac59d7a60f5c':
  API council feedback: hide and document.

Change-Id: Icfcb4e2a9892ecc5dab61cb78598e48fa7714a26
 2016-05-25 20:51:07 +00:00
Jeff Sharkey
55a83354bf Merge "API council feedback: hide and document." into nyc-dev 
am: dfe232c763

* commit 'dfe232c7636d16379191442bdb2bac59d7a60f5c':
  API council feedback: hide and document.

Change-Id: I180f504fe21f6f90179d359e8808ffff006e4538
 2016-05-25 20:51:03 +00:00
Mady Mellor
d23b617086 Merge "Merge "Fix clipping not being activated on children in groups" into nyc-dev am: b6f640607b am: 680f73bf46" into nyc-mr1-dev-plus-aosp 
am: 021650bd8a

* commit '021650bd8a4edccc114fae2fdfb0a09dda44d64d':

Change-Id: I89e1c019a94e6616477d632e6e8a396d32a85196
 2016-05-25 20:46:44 +00:00
Mady Mellor
a7b2004560 Merge "Fix clipping not being activated on children in groups" into nyc-dev am: b6f640607b am: d20923ba8a 
am: 3f06d9ee97

* commit '3f06d9ee979e1f2e50dccb0d5c3bf7ef1e60a231':
  Fix clipping not being activated on children in groups

Change-Id: Ic56548aeb469f9a58518b969675f3e0add5cb6e0
 2016-05-25 20:46:24 +00:00
Chris Wren
7e431621c4 boost starred people to at least high importance 
Bug: 28949659
Change-Id: If604062a282db5db463642315a8fa5f7cd6e597c
 2016-05-25 16:45:54 -04:00
Sunny Goyal
6f84a27a75 Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev 2016-05-25 20:45:44 +00:00
TreeHugger Robot
dfe232c763 Merge "API council feedback: hide and document." into nyc-dev 2016-05-25 20:43:56 +00:00
Android Build Merger (Role)
021650bd8a Merge "Merge "Fix clipping not being activated on children in groups" into nyc-dev am: b6f640607b am: 680f73bf46" into nyc-mr1-dev-plus-aosp 2016-05-25 20:41:03 +00:00
Mady Mellor
20b7e8aa10 Merge "Fix clipping not being activated on children in groups" into nyc-dev am: b6f640607b 
am: 680f73bf46

* commit '680f73bf4643f57d3e1cc8791b186944a65ab9d9':
  Fix clipping not being activated on children in groups

Change-Id: I65a3ae33c0cb4934ed4a52d6e94194705fdac44c
 2016-05-25 20:40:30 +00:00
Mady Mellor
3f06d9ee97 Merge "Fix clipping not being activated on children in groups" into nyc-dev am: b6f640607b 
am: d20923ba8a

* commit 'd20923ba8a1553a51f9a152cbd6fba9e5e5a2bca':
  Fix clipping not being activated on children in groups

Change-Id: Ie7e1640034d4bdb5111e533f7ed2b54139ef1b18
 2016-05-25 20:40:22 +00:00
Mady Mellor
d20923ba8a Merge "Fix clipping not being activated on children in groups" into nyc-dev 
am: b6f640607b

* commit 'b6f640607b5b8124b1a1c216ea4264511b145774':
  Fix clipping not being activated on children in groups

Change-Id: Icf5c68956bb3c261ce27b195426ebd3aefe8b83b
 2016-05-25 20:35:51 +00:00
Mady Mellor
680f73bf46 Merge "Fix clipping not being activated on children in groups" into nyc-dev 
am: b6f640607b

* commit 'b6f640607b5b8124b1a1c216ea4264511b145774':
  Fix clipping not being activated on children in groups

Change-Id: I9bb55c13928be62641884d1381baf984c43acac6
 2016-05-25 20:35:45 +00:00
Michael Kwan
6b0351251e Update EditText break strategy for Theme.Micro. 
Change-Id: I59847023fc06447232377ebd4998175070b31737
 2016-05-25 13:29:38 -07:00
Mady Mellor
b6f640607b Merge "Fix clipping not being activated on children in groups" into nyc-dev 2016-05-25 20:22:42 +00:00
Phil Weaver
2a7e4442bf Improve accessibility window title behavior 
Suppress the default, unlocalized strings from being read as title.

Bug: 28744278
Change-Id: Iea0f7d8fed3d6428ada725cf3ffa077ba974b74a
 2016-05-25 12:48:13 -07:00
Zachary Kuznia
ec1783828e Ensure MotionEvent.split() won't be given an invalid value. 
b/27496784

Change-Id: I28bb4ac5bb8a705e7af9b22b2b56cd4061aa06a0
 2016-05-25 12:38:58 -07:00
Robert Carr
8b75c4d8de Merge "Merge "Force pending transactions to flush before screenshot." into nyc-dev am: 39e8022a75 am: e1b1fb1740" into nyc-mr1-dev-plus-aosp 
am: 69decb497f

* commit '69decb497f15e2cf713f73e31578c4edef9924ce':

Change-Id: I317593471c9557e6f713cebb63ab477cda46f226
 2016-05-25 19:34:23 +00:00
Robert Carr
75a8a36c52 Merge "Force pending transactions to flush before screenshot." into nyc-dev am: 39e8022a75 am: 1d4f1cda2d 
am: e19176832f

* commit 'e19176832f6685d0ec60321079860440dbb47d3f':
  Force pending transactions to flush before screenshot.

Change-Id: I6df85677fad4666bcdb84cd4ae8d023f70f0a8e3
 2016-05-25 19:34:18 +00:00
Android Build Merger (Role)
69decb497f Merge "Merge "Force pending transactions to flush before screenshot." into nyc-dev am: 39e8022a75 am: e1b1fb1740" into nyc-mr1-dev-plus-aosp 2016-05-25 19:27:28 +00:00
Robert Carr
14b7bb0fbf Merge "Force pending transactions to flush before screenshot." into nyc-dev am: 39e8022a75 
am: e1b1fb1740

* commit 'e1b1fb1740b75174141693744d312bacc2539bbd':
  Force pending transactions to flush before screenshot.

Change-Id: I55f20d3c2c900f635f079dd85721c0028f9ae255
 2016-05-25 19:27:03 +00:00