192302 Commits

Author SHA1 Message Date
Deepanshu Gupta
5987e553c2 Revert "Call dispatchFinishTemporaryDetach before returning a transient view"
This reverts commit c73a1aaa90694c66feefc59557b35f5913ef1b04. The change
causes an NPE when rendering ListViews.
2015-05-13 21:25:57 -07:00
Joe Fernandez
7779379291 docs: Add weekly subscriptions and grace period information to IAB docs
b/20351362

Change-Id: Ie1d9c928acbe3ae3846680d6fa4ff9e2fa049f84
2015-05-13 21:03:13 -07:00
Deepanshu Gupta
88b92541be Use Balanced line breaker instead of HighQuality.
Fallback to the Balanced line breaker till the time HighQuality one is
implemented.

Change-Id: I51e9882c5c733e5409f932ef740684829340ced9
2015-05-13 20:53:14 -07:00
Dan Sandler
08a04c1524 Icon support comes to Notification.
And you may ask yourself: what is that beautiful icon?
  And you may ask yourself: where does that API go to?
  And you may ask yourself: is it a resource? is it a Bitmap?
  And you may say to yourself: my god, what have I done

Bug: 18568715
Change-Id: I4377b311c538bd1cf36b3fba22326bae81af40c9
2015-05-13 23:50:43 -04:00
Dan Sandler
a22a380fbb Add Icon support to ImageView.
ImageView.setImageIcon() is remotable, so you can also call
RemoteViews.setImageViewIcon().

Bug: 18568715
Change-Id: I456cfa65102e1983d3392d822584d154a6cd761a
2015-05-13 23:50:39 -04:00
Deepanshu Gupta
139d6ff12d Update nav bar icons.
- Add a script to copy the icons from the original source.
- Update layout used for the navigation bar to be closer to the original
  layout.
- Update test image with the latest rendering.
- Add a nexus 5 landscape device config to help with testing.

Change-Id: I0b6674955e0970a6a8cce148b1b7aa61e1752ccd
2015-05-13 20:48:58 -07:00
Yorke Lee
abfcfdc044 Make Conferenceable an abstract class
Bug: 21066017
Change-Id: Ibcbccfc7b1380e417b464aed9b968cbc0a6a1cc2
2015-05-13 20:48:19 -07:00
Geoff Mendal
ae597c33dc Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-14 03:48:14 +00:00
Geoff Mendal
18d9823ef4 Import translations. DO NOT MERGE
Change-Id: Ie70f9077c3e51b08528ca37c3614b065ab44c68b
Auto-generated-cl: translation import
2015-05-13 20:47:17 -07:00
Vinit Deshpande
a3b9a2240e Merge "fix null pointer crash" into mnc-dev 2015-05-14 03:40:04 +00:00
Lorenzo Colitti
c9be9f4d5b Merge "Only activate the wifi alternate reality hack for KK and lower" into mnc-dev 2015-05-14 03:25:22 +00:00
Jean-Michel Trivi
f578953ead Merge "AudioTrack in SoundPool uses audio_attributes_t parameter" into mnc-dev 2015-05-14 03:21:55 +00:00
Jeff Brown
0d3b6dbc4c Merge "DO NOT MERGE - Overlay display now support multiple modes." into mnc-dev 2015-05-14 02:52:09 +00:00
Sanket Padawe
402be0628c Merge "Hotspot 2.0 UI." into mnc-dev 2015-05-14 02:40:44 +00:00
Jean-Michel Trivi
6c307879b7 AudioTrack in SoundPool uses audio_attributes_t parameter
Bug 20731155

Change-Id: I62ce9d5c5a88aaf534cfd1861378215f9253248d
2015-05-13 19:26:12 -07:00
Andy Hung
2bdd69c4a2 Merge "Add getChannelIndexMasks API to AudioDeviceInfo" into mnc-dev 2015-05-14 02:18:02 +00:00
Pierre Vandwalle
20903b392b fix null pointer crash
(cherry-picked from mirror-m-wireless-internal-release
216d8c3 fix null pointer crash)

Bug: 20232584

Change-Id: I7c46e372bc8f3a54b0428ef56c034eb2c79133ea
2015-05-13 19:16:09 -07:00
Jaesung Chung
f5edb20ae9 Merge "TIF: Add DVB device handling to TvInputManagerService" into mnc-dev 2015-05-14 02:14:37 +00:00
Santos Cordon
e9ea718f30 Merge "Improve javadoc for PRESENTATION_ constants." into mnc-dev 2015-05-14 02:10:34 +00:00
Santos Cordon
ed769ae5d2 Improve javadoc for PRESENTATION_ constants.
Bug: 21089678
Change-Id: I045fd71a30c75c213dd5c0c64ded983ea5e5d866
2015-05-13 19:09:47 -07:00
Santos Cordon
d9e1fe3cd4 Merge "[1/4] Use new Icon class in PhoneAccount." into mnc-dev 2015-05-14 02:07:58 +00:00
Yorke Lee
ad0bfe3ae2 Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-dev 2015-05-14 02:06:54 +00:00
Svetoslav
857c3019ba Merge "Do not allow opting out from the new permission model." into mnc-dev 2015-05-14 02:04:30 +00:00
Jaesung Chung
58739e7584 TIF: Add DVB device handling to TvInputManagerService
Added an API to pass an open file descriptor of DVB devices and
addressed the security issue of setting the permissions on DVB devices
to 0666.

Bug: 20436120
Change-Id: I4649e76084f3356ec22b7e776fb87c6a8fdc00d6
2015-05-14 02:00:06 +00:00
Svetoslav
d965370398 Do not allow opting out from the new permission model.
bug:20525775

Change-Id: I84cd4587db5adb96f6f29148adb242905f53f2dc
2015-05-13 18:54:57 -07:00
Wale Ogunwale
8a2978c9ab Merge "Don't stop animation when starting windows app token changes" into mnc-dev 2015-05-14 01:51:50 +00:00
Wale Ogunwale
8ebc82a63f Don't stop animation when starting windows app token changes
If another activity is starting while we are still animating
the starting window of the previous activity to start, we
transfer the starting window of the old activity to the one that
is currently starting so we don't have to create another starting
window and also to reduce jank from the starting window animation
appearing to restart.

However, there were several conditions that led to the starting
window animation stopping when the transfers app tokens

1. Starting window animator not been removed from the previous
app token animator causing it to finish/remove the starting window
prematurily.
2. Starting window animator not been properly added to the new
app token animator causing the animation not be be picked up.
3. WMS.mSkipAppTransitionAnimation been set to false regardless of if
an app transition was actually prepared in WMS.prepareAppTransition()
4. WMS.mSkipAppTransitionAnimation not been set to true in all cases
where the starting window transfers tokens even though we don't want the
new app to do any transition animation is the starting window is
animating.
5. New app not setting its animation to dummy animation when the next
transition should be skipped due to starting window still animating.
6. Starting window animation been cleared for the new app in
WMS.handleAppTransitionReadyLocked() even for cases where we transferred
the animation from the previous app.

Also, cleaned up some code.

Bug: 20953232
Change-Id: I714d6bdfcdaeeaac29f9d464bab9f3e9c192e937
2015-05-13 18:45:36 -07:00
Mikhail Naganov
822f1aaf2b Merge "Update the new error reporting API in android.webkit" into mnc-dev 2015-05-14 01:43:48 +00:00
Mikhail Naganov
8d4f07f8d3 Update the new error reporting API in android.webkit
- minor changes in WebResourceError;
 - prepare to remove WebResourceResponseBase;
 - add immutable mode to WebResourceResponse.

Bug: 21063767

Change-Id: Iaf5f92e3850732c7a888453468e108809b3b782a
2015-05-13 18:40:20 -07:00
Andy Hung
bece0c7a1d Add getChannelIndexMasks API to AudioDeviceInfo
Fix some javadoc as well.

Bug: 21129531
Change-Id: I82e5b66f254f6acdcd93638eeed878b4c5b5be34
2015-05-13 18:33:28 -07:00
Amith Yamasani
3d32a1c04d Merge "Allow settings to change app inactive state" into mnc-dev 2015-05-14 01:24:29 +00:00
Fabrice Di Meglio
aef477a65e Merge "Add IntentFilter auto verification - part 11" into mnc-dev 2015-05-14 01:21:57 +00:00
Amith Yamasani
901e924392 Allow settings to change app inactive state
Change-Id: I57efb4b5fa69c9a268025fb1ef83de36c4cc83ca
2015-05-13 18:21:33 -07:00
Yorke Lee
e01f93557d Merge "Rename AudioState to CallAudioState" into mnc-dev 2015-05-14 01:21:16 +00:00
Fabrice Di Meglio
b371c7b6e2 Add IntentFilter auto verification - part 11
- tune Intent resolution candidates filtering: add also the undefinedList
  into the results at first so that when you install an App which is not
  verified (after installing a verified App) you will still have the
  Disambiguation Dialog prompted to the User.

See bug #19628271

Change-Id: I611fff4c1c7f60db22312d7948c8d5120719fbd0
2015-05-13 18:17:12 -07:00
Deepanshu Gupta
eca056926a Load ICU data in LayoutLib
Also return the correct version numbers for ICU data.

Change-Id: I7de973b5553c73948870b97bdc12a880bb2fdd85
2015-05-13 18:15:32 -07:00
Deepanshu Gupta
d77b9ed7dc Add missing delegates for M preview.
- Remove ICU dependency (use the version bundled with platform).
- Restructure intelliJ project to move dependencies to module.
- Minor fixes to layoutlib tests.

TODO:
- Load ICU data.
- Hyphenator doesn't work.
- High quality line breaker not present.

Change-Id: I965e096e17bfc97ee995a649c3f4f6f64bb4f70d
2015-05-13 18:15:20 -07:00
Deepanshu Gupta
a12ec8f1e2 Run setup for full tests only once.
Change-Id: Iee64dbd88d473b7be08581f26ccddf649aed8e56
2015-05-13 18:10:53 -07:00
Deepanshu Gupta
78af255846 Remove kxml dependency.
Create XmlPullParser using callback provided by the client. This enables
clients to choose which XmlPullParser implementation they want.

Change-Id: I9ad97a4777820cdbe5c8fc3716f74ddec9065c70
2015-05-13 18:10:46 -07:00
John Reck
951f23478d am d955dceb: am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
* commit 'd955dceb4f38f214e62024e808b2b1a21be41940':
  Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
2015-05-14 01:05:47 +00:00
Jason Monk
7853e137ed Merge "Add QS Tuner" into mnc-dev 2015-05-14 01:02:13 +00:00
Jason Monk
11a77446c5 Add QS Tuner
Change-Id: I908d0161b7209b8e99299f5cb3eb58f3d7b52752
2015-05-13 20:59:23 -04:00
John Reck
d955dceb4f am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
* commit '862540cdb11a7128ae1fd670136f398645b4af7b':
  Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
2015-05-14 00:51:07 +00:00
Dianne Hackborn
c352722e8a Ignore small time changes in alarm manager.
It turns out switching to the new kernel alarm
reporting causes lots and lots of spurious flags
that the clock has changed.  The alarm manager
would blindly trust these, thinking the world has
changed on it and recomputing everything and reporting
this to everyone else.  This was expensive.

We now verify that the time has changed sufficiently
that it is worth caring about.  This is basically the
same algorithm that battery stats was using to avoid
recording small clock changes, so we are really just
pushing this down into the alarm manager and can now
remove that from battery stats.

Also since we are getting these so much, make use of
the other information in about the wakeup that tells us
if an alarm went off to avoid doing anything if it didn't.

Change-Id: I6f4f4226db6eb2b38ca73860786e7cf7c9136cc3
2015-05-13 17:44:05 -07:00
John Reck
862540cdb1 Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev 2015-05-14 00:40:45 +00:00
John Reck
e3a6a69acb am 7238435e: (-s ours) resolved conflicts for merge of e869835d to lmp-mr1-ub-dev
* commit '7238435e9b3f133965b63abc7b352b34f9401af5':
  DO NOT MERGE Backport of limited jank-tracking metrics
2015-05-14 00:38:28 +00:00
Dianne Hackborn
6495ef975f Merge "Fix build." into mnc-dev 2015-05-14 00:36:58 +00:00
Jorim Jaggi
6a587acd1d Merge "Fix fingerprint for multiuser" into mnc-dev 2015-05-14 00:36:03 +00:00
Dianne Hackborn
4be8c4cc4c Fix build.
Change-Id: I94c7e3033721c1d8024a212614752512e685289b
2015-05-13 17:35:42 -07:00
Alan Viverette
39bf9a1916 Add example for detectResourceMismatches()
Bug: 21043958
Change-Id: Iff6811539f249cbc4fbeebf63e02f62c4a2b0c95
2015-05-13 17:22:34 -07:00