191137 Commits

Author SHA1 Message Date
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
2015-05-05 01:06:38 +00:00
Fabrice Di Meglio
44b60be189 Merge "Add user selectable Default Browser feature - part 5" into mnc-dev 2015-05-05 00:11:06 +00:00
Fabrice Di Meglio
7d1a9d0562 Add user selectable Default Browser feature - part 5
- check and clear default Browser if its package is no more available

See bug #20144393

Change-Id: I60a1b8f11058f3a4f9dc80440027ab72fe7cce2e
2015-05-04 17:06:33 -07:00
Adam Lesinski
5b1516900a Merge "AAPT2: Add option to generate static library" into mnc-dev 2015-05-04 23:58:27 +00:00
Adam Lesinski
f713aa2f10 Merge "AAPT2: Include package name of attributes in styleable from another package" into mnc-dev 2015-05-04 23:57:22 +00:00
Adam Lesinski
247bc95cb3 Merge "AAPT2: Record public status in a more robust way" into mnc-dev 2015-05-04 23:56:24 +00:00
Adam Lesinski
2f519532ee Merge "Add namespace handling in attribute values" into mnc-dev 2015-05-04 23:54:15 +00:00
Jorim Jaggi
f31a700364 Merge "Update emergency call button label when language changes" into mnc-dev 2015-05-04 23:51:21 +00:00
Robert Shih
5eac1da3bb Merge "MediaPlayer: setSubtitleAnchor on a HandlerThread" into mnc-dev 2015-05-04 23:50:07 +00:00
Jorim Jaggi
76511c75e6 Update emergency call button label when language changes
Bug: 17987231
Change-Id: I74fe6942f4ff965537803d61f3446d5f28a60f9e
2015-05-04 23:46:56 +00:00
Jorim Jaggi
9f74303eb8 Track unlock attempts per user.
Bug: 19330825
Change-Id: I3e09f676b945dbeee16dc0fb3cb126cb884a6934
2015-05-04 23:44:15 +00:00
Adam Lesinski
6d8e4c48f9 AAPT2: Add option to generate static library
Difference between normal app and static library is that
the R file uses non-final fields, and the extra chunks added
by AAPT2 remain in the final APK.

Change-Id: I61416387ca9bb3c21857ff7cfab5847ac3edf57a
2015-05-04 16:43:24 -07:00
Adam Lesinski
838a68705b AAPT2: Include package name of attributes in styleable from another package
Change-Id: I44f902e297238e7ee4ae27c02aaaf9e148652d2a
2015-05-04 16:43:24 -07:00
Adam Lesinski
6ff19664f9 AAPT2: Record public status in a more robust way
This allows us to store the source and comments of a resource's
public declaration and avoids issues where there is no default
configuration for a publicly declared resource (like with drawables
of various densities) and AAPT2 mistakenly took this as an error.

Change-Id: I07a2fe9f551daefcce842f205fb219d2fa453ebc
2015-05-04 16:43:24 -07:00
Adam Lesinski
24aad163bc Add namespace handling in attribute values
Previously, you could only reference namespace prefixes in attribute names:

<View xmlns:appcompat="http://schemas.android.com/apk/res/android.support.v7.appcompat"
      appcompat:name="hey"
      ...

Now you can also reference them in resource names within an attribute value:

      ...
      android:text="@appcompat:string/confirm"
      ...

Which will be treated as "@android.support.v7.appcompat:string/confirm".

Change-Id: Ib076e867a990c80cf877a704eb77cd1ef0b23b52
2015-05-04 16:43:24 -07:00
Robert Shih
98b6842e30 MediaPlayer: setSubtitleAnchor on a HandlerThread
This ensures that we wouldn't run into the error `Can't create handler
inside thread that has not called Looper.prepare` no matter on which
thread we attempt to set the SubtitleController internally.

Bug: 20821869
Change-Id: Ie53d60b58f5382428e7b7a01deccfa516b61b25f
2015-05-04 16:38:30 -07:00
Andre Eisenbach
ab2581398c BluetoothSap class should not be public
Bug: 20823932
Change-Id: I87dfa10b994f7a14c123bb384925c08b34bfbe67
2015-05-04 23:20:28 +00:00
Wei Jia
73b4a3303e Merge "MediaSync: clean up configureAudioTrack and configureSurface." into mnc-dev 2015-05-04 23:14:17 +00:00
Wei Jia
d80d6f6b05 MediaSync: clean up configureAudioTrack and configureSurface.
Bug: 19666434

Change-Id: I8b112843d430c0730a879abc9aa25f143bdcf09d
2015-05-04 15:59:20 -07:00
Joe Fernandez
2dc05e22bd am 722b509d: am a246d2dd: am 9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs
* commit '722b509df505c156c71e95336b8059b8afcd8621':
  docs: Android Developer Dashboard update - May 2015
2015-05-04 22:19:56 +00:00
Rich Slogar
3b7af8c9b4 am 0d133125: am d3de33e9: am 2b46b70d: am a541020a: am e7bfe5b3: docs: sdk 24.2.0 revisions
* commit '0d13312552030dce0499fd9201c8e17b92aa8a4d':
2015-05-04 22:19:46 +00:00
Dirk Dougherty
41ef6ba4ce am fd92db9c: am 35219b7d: am b42c5f80: Update N6 device art port image to remove shadow.
* commit 'fd92db9c843042ab66f76d11a733493819d8c2c9':
  Update N6 device art port image to remove shadow.
2015-05-04 22:19:39 +00:00
Rich Slogar
d5aa39cc0a am 5bf92cba: am ffac3c82: am 67a05f0c: am e7bfe5b3: docs: sdk 24.2.0 revisions
* commit '5bf92cbab9e6df7fb918c925fd506737a9e25c4e':
  docs: sdk 24.2.0 revisions
2015-05-04 22:19:33 +00:00
Joe Fernandez
ed4331d29a am 419aff0f: am ddb65560: Merge "docs: M Preview mini site skeleton" into mnc-preview-docs
* commit '419aff0fd39c565d52c21a845e346c691f3ec4fb':
  docs: M Preview mini site skeleton
2015-05-04 22:19:23 +00:00
George Mount
57436d3f7e Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev 2015-05-04 22:08:03 +00:00
George Mount
f586c925d5 Fix potential NPE in internal isValidTarget method.
Bug 19805383

Change-Id: Ib22d86cca5e1225b12ed39ac988824eeb9c58bbd
2015-05-04 15:01:55 -07:00
Andre Eisenbach
f455986a45 Add documentation for BluetoothSocket.getConnectionType()
Bug: 20824264
Change-Id: I58aa8f5bbe08ddb252f01f4ad187ae8741963f0b
2015-05-04 21:56:17 +00:00
George Mount
c81af1ca78 Merge "When returning, transition only existing shared elements." into mnc-dev 2015-05-04 21:48:56 +00:00
George Mount
8de1de1f04 When returning, transition only existing shared elements.
Previously all shared element names were delivered when
returning from an Activity, even if no shared elements
existed in the exiting Activity. That prevented the calling
Activity from showing a shared element that it delivered,
but will not be receiving back again until shared elements
are transfered. That leaves a weird hole in the UI.

Now only the shared elements mapped in the returning view
hierarchy are delivered to the calling Activity.

Change-Id: I481a8bc7a771d7e819871f424d22313314c9ee8b
2015-05-04 14:12:40 -07:00
Chris Wren
0425de31cf Merge "eliminate notification clicker garbage." into mnc-dev 2015-05-04 21:06:17 +00:00
Chris Wren
42d5dd4690 eliminate notification clicker garbage.
Bug: 9739772
Change-Id: If05079cb0f956e03f26c7780c318452f73c3e849
2015-05-04 17:03:48 -04:00
Sanket Padawe
5c33a2e3ec Merge "Adding "Connected, no Internet" string in Wifi nw summary." into mnc-dev 2015-05-04 20:44:52 +00:00
George Mount
61bab469a1 Merge "Fix Visibility not changing until Animator ends." into mnc-dev 2015-05-04 20:26:48 +00:00
Alan Viverette
394f9360c9 Merge "More documentation for handling RippleDrawable mask at run time" into mnc-dev 2015-05-04 20:10:20 +00:00
Fabrice Di Meglio
8ef631de47 Merge "Add user selectable Default Browser feature - part 4" into mnc-dev 2015-05-04 19:59:35 +00:00
Alan Viverette
d21be49975 More documentation for handling RippleDrawable mask at run time
The docs are now really explicit about the layer's ID and how to set
or update the mask layer from code.

Bug: 20493831
Change-Id: I801f10cd08fd1b4bb226c63a1bdf3271229928ea
2015-05-04 12:51:54 -07:00
Alan Viverette
d38d3574d0 Merge "Always force constructors accessible during inflation" into mnc-dev 2015-05-04 19:38:57 +00:00
John Spurlock
ad2399f3be Merge "Zen: Implement calendar event system condition provider." into mnc-dev 2015-05-04 19:07:36 +00:00
Jeff Sharkey
5f809e3fff Merge "Avoid NPE when fsUuid is null." into mnc-dev 2015-05-04 19:06:39 +00:00
Jeff Sharkey
c840681dbd Avoid NPE when fsUuid is null.
Bug: 20822962
Change-Id: I6340b70dba5a4f94a0f08ddfbda0190db97746f1
2015-05-04 12:04:09 -07:00
George Mount
fcfe531e74 Fix Visibility not changing until Animator ends.
Sometimes an animator will be interrupted before it starts
during a transition and the onAnimatorEnd will not be called.
In this case, we must set the final state in the onTransitionEnd.

Bug 20416564

Change-Id: I388895215ba2b1c500de3a5afcae8db1fea288f7
2015-05-04 11:37:27 -07:00
John Spurlock
2f096ed766 Zen: Implement calendar event system condition provider.
- Wire up basic implementation for the system provider that
   handles event-based DND subscriptions.
 - Backed by the standard system calendar content provider.
 - Move shared time utils to base class, clean up logging.

Bug: 20064962
Change-Id: I070b6baa580c592c2ab4101c6b44a254787f9dd7
2015-05-04 14:29:41 -04:00
John Reck
e678b41cdb Merge "Fix setName use-after-free" into mnc-dev 2015-05-04 17:35:33 +00:00
Alan Viverette
904de2ec93 Always force constructors accessible during inflation
We now correctly throw an IllegalAccessException for non-public accesses,
but we were relying on the old incorrect behavior during inflation. This
CL forces constructors to be accessible so that we emulate the old
behavior and don't crash.

Where we were already doing this, the CL moves the setAccessible() call
immediately after the getConstructor() call, since there's no point in
calling it multiple times.

Bug: 20810495
Change-Id: I63dfcb857e445f688080eea05e86ef22760ed49f
2015-05-04 10:32:57 -07:00
Joe Fernandez
722b509df5 am a246d2dd: am 9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs
* commit 'a246d2dd4bf8fd6e00561e234f4d2bd41f2f3b68':
  docs: Android Developer Dashboard update - May 2015
2015-05-04 17:19:32 +00:00
Joe Fernandez
a246d2dd4b am 9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs
* commit '9dabc784ee3fe1fd16bb9bc00eb8d3bafce2b078':
  docs: Android Developer Dashboard update - May 2015
2015-05-04 17:08:12 +00:00
Joe Fernandez
9dabc784ee Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs 2015-05-04 16:57:42 +00:00
Joe Fernandez
1407c19de2 docs: Android Developer Dashboard update - May 2015
Change-Id: Ia4cfae39c0ccb744f9489615b6dd36f455a652c0
2015-05-04 09:56:13 -07:00
John Reck
a15eedd266 Fix setName use-after-free
Bug: 20764439
Change-Id: I7a0f85bb82629b1302db02015fa493dc09eb31f7
2015-05-04 09:44:28 -07:00
Jose Lima
5551aca2b8 Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev 2015-05-04 16:29:30 +00:00