Commit Graph

245370 Commits

Author SHA1 Message Date
Android Build Merger (Role)
41164b63a2 Merge "Merge "doc: Removed duplicate card from distribute/users page" into mnc-docs am: b515691 am: 4a5d857 am: f1a7aa6 am: 0a504d0" into nyc-dev 2016-04-27 21:27:46 +00:00
Android Build Merger (Role)
bf23dff049 Merge "Docs: Added that Method References work with earlier API levels am: 11e3f91 am: 89b9ee0 am: a6fbfaf am: 8f00192" into nyc-dev 2016-04-27 21:27:33 +00:00
Android Build Merger (Role)
877d66014a Merge "Merge "Docs: Minor fix and restructuring to Vulkan validation-layer doc to prevent devs from corrupting their NDK install." into mnc-mr-docs am: 19d1e73e41 am: 68af8d0 am: 1d52e49" into nyc-dev 2016-04-27 21:27:21 +00:00
Baligh Uddin
53f3a3c8f8 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-27 21:26:46 +00:00
Baligh Uddin
9066f06314 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-27 21:26:06 +00:00
Kevin Hufnagle
941ee58502 Merge changes If868f090,I3b7c39c4,I0c2152ed,I79796636,I6dc87bac, ... into mnc-ub-dev
am: 171a1c2

* commit '171a1c25467619af7a9268975d9b742914dc0bd6':

Change-Id: Iad7ca4e11e1fbe24b72ca74d816c83dedac4caf0
2016-04-27 21:25:28 +00:00
Kevin Hufnagle
c926fa9a1d Merge changes I4bf40d49,I8c1b82f0,I6128b520,Icf1428e3,I44704847, ... into mnc-ub-dev
am: 7659acc

* commit '7659acc0e7219cf562505ec09c1b4a31223f09ec':

Change-Id: I60f3fb7f1f4a88ff5c2bea721b2b6554decad677
2016-04-27 21:25:22 +00:00
smain@google.com
c75ce4349b typo am: de6fde7 am: 55ba523 am: aaf1d09
am: 044913e

* commit '044913ef93fb16a0a3fa3b6161bfdcf0e13a75a0':
  typo

Change-Id: I149d71c0465f44cb56dc2b3b3b3ad20e81dc713b
2016-04-27 21:25:15 +00:00
smain@google.com
c8dcf8e626 typo am: 3517069 am: 76f95c2
am: 7432ecf

* commit '7432ecf8a38f1ebfa1370cae15725f9728f26470':
  typo

Change-Id: I24d977bc7a4b4bc815212b047ddca24db62190ad
2016-04-27 21:25:00 +00:00
Adarsh Fernando
354a5aa56c Merge "Docs: Gradle 2.1.0 Release Notes" into mnc-docs am: aa53fb1 am: c49e787 am: 4defc19
am: c070811

* commit 'c07081121939e7dc8c9093c8acf5103ca0e530fa':
  Docs: Gradle 2.1.0 Release Notes

Change-Id: I7993a48c45f4f1ead36ae7350f485243d8e133a9
2016-04-27 21:24:39 +00:00
smain@google.com
d9cb1ff2ca Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771 am: 96e6abb am: 39a59d0 am: 86c6f97
am: c7984b5

* commit 'c7984b5d62b511a17f3030641d44efc2b147a776':
  Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771

Change-Id: I01396349b0ec8e88be46888f8a44f8f93c4c0f8d
2016-04-27 21:24:22 +00:00
smain@google.com
a2ae018d8b Android Studio 2.1 release notes and downloads. am: 8e48332 am: beab847 am: 6461bca
am: 7499bc7

* commit '7499bc755f1e4137ba4775498967c80807a48065':
  Android Studio 2.1 release notes and downloads.

Change-Id: I0e5d14f33d27ba4e019177833dc84f6b0fabb4c1
2016-04-27 21:24:10 +00:00
smain@google.com
2920588fce Merge "Android Studio 2.1 release notes and downloads." into mnc-mr-docs am: c939dd0 am: 19f9481
am: 88b2780

* commit '88b27807cc248607f713e97b1791186fc7e37313':
  Android Studio 2.1 release notes and downloads.

Change-Id: I55b8646648edbd6657b5bb781c6a239a828fe782
2016-04-27 21:23:59 +00:00
Dirk Dougherty
5be7f6979e Merge "Remove static _book.yaml in favor of generated version (samples_navtree_data.cs)." into mnc-mr-docs am: 2974e94 am: 1c1a85bc
am: 61a6d2f

* commit '61a6d2f359e3ae81e7f962ba9fc02e0a92ceb300':
  Remove static _book.yaml in favor of generated version (samples_navtree_data.cs).

Change-Id: I9086d484fc307a7c1e39a06c317383d7b2e9c7be
2016-04-27 21:23:49 +00:00
Kevin Hufnagle
bc0b17d7ba Merge "docs: Added entry in USB vendor ID table for HP." into mnc-docs am: b8767b7 am: 599796e am: f2f64b7
am: c78400e

* commit 'c78400e09598850ff9404933f2d3cfc887a92339':
  docs: Added entry in USB vendor ID table for HP.

Change-Id: I6d69fbd8324c77dc64bf87e0878c249a9cd099e0
2016-04-27 21:23:39 +00:00
smain@google.com
358fd7c460 Merge "Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771" into mnc-mr-docs am: f8e0d7f am: b6491aa
am: 0a33248

* commit '0a33248b1fe6a109bf33dbdf65497b00f12cba35':
  Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771

Change-Id: I91e30aadca32f5cef8f00e8cd52f6e8aa90b2dd9
2016-04-27 21:23:28 +00:00
Cheryl Potter
af00b495db docs: Update SDK Manager for 2.0 changes b/26385384 am: 5f153b5 am: 559648a am: 14f034a
am: 9bfc51e

* commit '9bfc51e3420b7c7addd842df41ad95cedc914a2c':
  docs: Update SDK Manager for 2.0 changes b/26385384

Change-Id: Ide12c014c12c970d6e6fde48e28254b94ea125c3
2016-04-27 21:23:16 +00:00
Cheryl Potter
3284252cde Merge "docs: Update SDK Manager for 2.0 changes b/26385384" into mnc-mr-docs am: 0f6ab24 am: 4363c43
am: d8e0ae4

* commit 'd8e0ae4768ec082ed979bb53fa461c0f3a4eb61f':
  docs: Update SDK Manager for 2.0 changes b/26385384

Change-Id: I60fe3068cf2216a9fc592ef3477c68bb947d9b94
2016-04-27 21:23:02 +00:00
TreeHugger Robot
04e8628eab Merge "doc: Removed duplicate card from distribute/users page" into mnc-docs am: b515691 am: 4a5d857 am: f1a7aa6
am: 0a504d0

* commit '0a504d03c10f76b7d2828a8fc2fd76a9fa57b309':
  doc: Removed duplicate card from distribute/users page

Change-Id: I0739f75675050de5b9bcb65ad31ffd63c66029ad
2016-04-27 21:22:39 +00:00
Baligh Uddin
970d613f8f Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-27 21:22:03 +00:00
Adarsh Fernando
d0c3ed61d9 Docs: Added that Method References work with earlier API levels am: 11e3f91 am: 89b9ee0 am: a6fbfaf
am: 8f00192

* commit '8f001929cdf8c4aedc544da3ec99c7c1555351de':
  Docs: Added that Method References work with earlier API levels

Change-Id: I913b328242d944be6b4718cc3c32d095dc4b386d
2016-04-27 21:21:51 +00:00
David Friedman
157772efb0 Merge "Docs: Minor fix and restructuring to Vulkan validation-layer doc to prevent devs from corrupting their NDK install." into mnc-mr-docs am: 19d1e73e41 am: 68af8d0
am: 1d52e49

* commit '1d52e49be27be077fafb16fcf700da80d7abc87b':
  Docs: Minor fix and restructuring to Vulkan validation-layer doc to prevent devs from corrupting their NDK install.

Change-Id: I6c0cb2412f8a84d90718bbcc99773328a2ca7389
2016-04-27 21:21:31 +00:00
Svetoslav Ganov
44cc663f78 Merge "Add a missing null object check" into nyc-dev 2016-04-27 21:19:07 +00:00
Svetoslav Ganov
83a1f7fe91 Add a missing null object check
We now have a null object instead of null values and
there was a place where we returned null instead of
the correct null object.

bug:28423485

Change-Id: I2626768acdf8d19fc94aa5e978eb057818450fa5
2016-04-27 14:18:05 -07:00
TreeHugger Robot
8b5e9f1bcf Merge "Update background data restrictions intent javadoc." into nyc-dev 2016-04-27 21:16:00 +00:00
Dirk Dougherty
58a252d1f0 Merge "resolve merge conflicts of 0d00d28 to nyc-dev" into nyc-dev 2016-04-27 21:07:16 +00:00
Phil Weaver
70439244ba Fix several accessibility magnification issues.
Clarifying region used for magnification as "magnificationRegion",
both in the public API and in the code. There's been significant
confusion about what "magnfifiedRegion" means. Removing
"availableRegion" from everywhere except where it's required, as
that region was identical to magnified/magnification region.

Trying to shut down magnification was a complex situation where
animations in progress and new magnification requests were tricky to
handle correctly. It was not possible to guarantee that the
magnification callbacks were unregistered consistently. There were
at least two situations that led to phone restarts:
1. If a triple tap was detected between unregistering the callbacks
and shutting down the input filter. In this case the magnification
request would go through.
2. If an animation had just started when magnification was turned
off, so the current magnification was 1.0 but the animator was
about to change it. In this case the callbacks would be unregistered,
and then the animator would start changing the magnification.

This change makes registering and unregistering magnification atomic.
It also makes MagnificationController stick around indefinitely once it
is created, registering and unregistering as needed to support
magnification gestures and services that control magnification. Services
that merely query the status of magnification no longer register for
callbacks.

One part of shutting down is turning off the animation and guaranteeing
that it won't try to make further changes. Adding a flag to
SpecAnimationBridge and a lock in that class so we can guarantee that
nothing happens when we aren't registered for magnification callbacks.

Also reconfiguring all accessibility options when a service stops to
make sure that only the features required by the current configuration
are enabled.

Bug: 27497138
Bug: 27821103
Change-Id: If697cbd34b117d82c8eee1ba7d0254089ee4241d
2016-04-27 13:57:43 -07:00
Chris Craik
8438a7297c Merge "Fix oval positioning when drawn with patheffect" into nyc-dev 2016-04-27 20:52:51 +00:00
Adam Powell
4be84bb10c Don't lose content change during rollback for loader already started
Framework edition

If a loader is already started when we try to rollback a content
change, force a new load instead of simply setting the flag to refresh
next time.

Bug 28406183

https://code.google.com/p/android/issues/detail?id=208278

Change-Id: If11d79088d30dd2dc48cf1b3d2882f3712b6cddb
2016-04-27 13:45:38 -07:00
Selim Cinek
f88c629346 Fixed a bug where the media template wasn't transforming right
Bug: 28406828
Change-Id: Ie400fd62cc0efc8f0a77cc81a40a17c54aa90e65
2016-04-27 13:44:16 -07:00
Selim Cinek
b41b2f6fc2 Fixed a crash where the overflow number wasn't initialized
Change-Id: I2df85055d5670af3a6c78a2b62bc62c9297ead78
Fixes: 28008437
2016-04-27 13:44:15 -07:00
Selim Cinek
7599878c8a Handle empty bigTexts more gracefully
We're now falling back to the normal text if the bigtext is empty

Bug: 28318145
Change-Id: I5da237780407b62d21f79f7a754736ae1e4a8785
2016-04-27 13:44:13 -07:00
Dimitry Ivanov
3088ff85a5 zygote: Remove NativeLoader initialization step
This now done by art Runtime::Start()

Bug: http://b/28320913
Change-Id: Icf9b11954b732c9f953e02bba9ae52eb91117457
(cherry picked from commit 6a850b3f11)
2016-04-27 13:40:43 -07:00
Yin-Chia Yeh
0d7bddcbde Merge "Camera: codegen doc update (dynamic black level)" into nyc-dev 2016-04-27 20:40:27 +00:00
Jeff Sharkey
2c3f2c4da9 Merge "Only log when system UID finds missing data paths." into nyc-dev 2016-04-27 20:34:19 +00:00
Ben Lin
2360aa33db Merge "Safe check so we don't move cursor beyond possible pos scope." into nyc-dev 2016-04-27 20:33:52 +00:00
Dimitry Ivanov
0c6e213dc7 Merge changes I12c9448e,I928175a3 into nyc-dev
* changes:
  Create linker namespace for the system server classloader
  Extract pathclassloader initialization to a separate class
2016-04-27 20:32:26 +00:00
Alan Viverette
fea4013499 Always account for divider height when calculating list height
List items are always positioned using the divider height, even if there
is no divider drawable, so we should account for that when calculating
list height.

Bug: 28402970
Change-Id: I14b8d3b04a369749ff4b7e6f1e6e003ac08f6b7f
2016-04-27 16:31:33 -04:00
Jorim Jaggi
af77082a22 Merge "Use FLAG_RECEIVER_FOREGROUND for lock intent" into nyc-dev 2016-04-27 20:25:26 +00:00
Jorim Jaggi
ad0ce3ab5e Use FLAG_RECEIVER_FOREGROUND for lock intent
To make we get priority for the intent.

Bug: 27391589
Change-Id: I112588116d51012dbe4d66c90b839bb88bc3f21b
2016-04-27 13:21:02 -07:00
Dianne Hackborn
62e7d26a0c Merge "Fix issue #28403313: Improve package manager query commands" into nyc-dev 2016-04-27 20:20:43 +00:00
Felipe Leme
0281a9908f Add a 1st-time dialog for Data Saver title.
BUG: 28098106
Change-Id: Ida19dcfc11ff74117af58fe1a4d43aa03e087f2b
2016-04-27 13:17:08 -07:00
Mady Mellor
1979bd7af2 Merge "Fix NPE when updating gear vertical location" into nyc-dev 2016-04-27 20:14:57 +00:00
Justin Klaassen
6183b722de Support view transformations when positioning floating CAB
Bug: 24088745

Use ViewGroup#getChildVisibleRect to transform the reported content
rect into the coordinate system of the root view. This allows the
floating CAB to be positioned correctly for views that may have a
scale (or other transforms) applied.

Change-Id: Ia6733a461b44070e7f6bab42f0b6fe2aed6870e5
2016-04-27 13:12:08 -07:00
Badhri Jagan Sridharan
68cdf1997f Add low power stats to batteryhistory
Exports SOC specific low power state info to batterystats service.
BatteryStats service queries the powerHAL module whenever and
updates the HistoryStepDetails whenever setBatteryState is called by the
BatteryService. The stats get appended to the battery history whenever
there is a change in the battery level.

Bug: 26564574
Change-Id: I02b4db00aec0c69d1558492224f3a4dc1c386fa6
2016-04-27 13:08:40 -07:00
Selim Cinek
31d37b9186 Fixed that notifications didn't fade away when brightness changed
Because nothing was drawing there with SRC one would simply see
the old buffer there.

Change-Id: Ie7a8989a4af92a05b1e9be2430fd9704c26a125d
Fixes: 27317122
2016-04-27 13:04:04 -07:00
Phil Weaver
aa86697b76 Support zero-length paths for a11y gestures.
Allows taps to be made at a single point.

Bug: 28378216
Change-Id: I398882faef77b3200aa9813c8d36c5d806521a22
2016-04-27 13:03:41 -07:00
Bill Yi
bd0f1fcd67 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-27 20:00:40 +00:00
Bill Yi
58a1a07470 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-27 20:00:03 +00:00
Robert Carr
311ecba981 Fix crash when docking.
ViewRootImpl may be null at this point if
we didn't preserve. Sorry about the churn.

Bug: 28413589
Change-Id: Iebfd819490252b52332d94ccefbddfae160087cf
2016-04-27 12:59:45 -07:00