147828 Commits

Author SHA1 Message Date
Robert Ly
b369ff7b38 am 84f00277: am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs
* commit '84f00277b11a0324f0dd08054b119f2a61f1e646':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
2014-08-13 16:17:49 +00:00
Torne (Richard Coles)
3822882b32 Add trace events to WebView startup.
Add system trace events for several interesting points during the
loading of the WebView APK so we can measure how much each part
contributes to startup time.

Bug: 16870075
Change-Id: Iadfd1881faea0377fa01313dddabb1d030962c5f
2014-08-13 17:11:45 +01:00
kmccormick
bcdbe1a0fc Merge "Doc Change: remove obsolete links." into klp-modular-docs 2014-08-12 23:14:35 +00:00
kmccormick
cb62407d7a Doc Change: remove obsolete links.
Fixes for:

b/16494813

Change-Id: I2aaae520cdafadf8707f2fbf38c10588f0de2987
2014-08-12 17:52:27 -07:00
Dake Gu
aa2474d50a Merge "fix ghost clipBounds problem" into lmp-dev 2014-08-12 23:14:35 +00:00
Ihab Awad
df22cbc9ad Merge "Final structural tweaks to Telecomm API (1/8)" into lmp-dev 2014-08-12 23:14:35 +00:00
kmccormick
a33ec00e49 am 7b708ec3: am 0672ea6f: am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs
* commit '7b708ec3178e30a18e4680a9903a65a13b4c32d2':
  Doc Change: Remove obsolete sample link.
2014-08-13 18:55:37 +00:00
kmccormick
7b708ec317 am 0672ea6f: am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs
* commit '0672ea6f3f9f5a8dfcea75b405eb83057746e4e9':
  Doc Change: Remove obsolete sample link.
2014-08-13 18:50:43 +00:00
kmccormick
0672ea6f3f am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs
* commit 'a0197180e76bad29a4b6eaed5c43cd922bc1803d':
  Doc Change: Remove obsolete sample link.
2014-08-13 18:43:20 +00:00
Ihab Awad
b19a0bcdd8 Final structural tweaks to Telecomm API (1/8)
Bug: 16416927
Bug: 16494880
Change-Id: I45fbe287c410cbb5e1b985f320b862d732811f43
2014-08-13 11:16:46 -07:00
Chulwoo Lee
b5d88d8973 Merge "TIF: Enable to build uri for browsableOnly channels" into lmp-dev 2014-08-12 23:14:35 +00:00
Chulwoo Lee
81d1b4def0 TIF: Enable to build uri for browsableOnly channels
BUG: 16966138
Change-Id: Idf3a349547a269777a8336b6bbbf933b52f5582a
2014-08-13 12:28:34 -07:00
Jean-Michel Trivi
ceb4d41846 Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev 2014-08-12 23:14:35 +00:00
Raph Levien
e07465fafd Merge "Resolve invalid Typeface style to default" into lmp-dev 2014-08-13 01:30:28 +00:00
John Spurlock
55b0abd75c Merge "Send LED signal up to SystemUI regardless of setting." into lmp-dev 2014-08-12 23:14:48 +00:00
John Spurlock
3929232cf9 Send LED signal up to SystemUI regardless of setting.
Let it make an independent decision about whether or not to
do anything with it.

Bug:17001245
Change-Id: Ie494abec423f3620bf142ad332bb5f0a4d4341a5
2014-08-13 11:00:59 -04:00
Jorim Jaggi
72eb2ae21b Merge "Lockscreen launch animations" into lmp-dev 2014-08-12 23:14:48 +00:00
Selim Cinek
f7fc6f7582 Merge "Reuse existing TouchHelpers on rotation" into lmp-dev 2014-08-12 23:14:49 +00:00
Selim Cinek
059a49f834 Merge "Reset the notification expanded states on screen off" into lmp-dev 2014-08-12 23:14:48 +00:00
Winson Chung
d82b3750d0 Merge "Implementing Recents focus states. (Bug 16950262)" into lmp-dev 2014-08-12 23:14:35 +00:00
Tenghui Zhu
3caecc6ea2 Revert "Update attrs / public.xml for VectorDrawable opacity removal"
This reverts commit 9c44a95d5168c219facb39e7cca275d1e0a02cee.

Change-Id: If328d3101ce44c63d643217218109bb82e4f20ae
2014-08-12 16:48:46 -07:00
Winson Chung
a0e88b5013 Implementing Recents focus states. (Bug 16950262)
- Fixed issue with focus going to send front most task when coming from Home
- Adding shortcut to dismiss a task
- Refactoring code to get secondary overlay and affiliation color
- Throttling alt-tab key presses
- Fixing issue with slivers of the task thumbnail being visible for affiliated tasks

Change-Id: Iaafe408318646a423fd58b51bbe93dbe0f2eed99
2014-08-12 23:18:34 +00:00
kmccormick
a0197180e7 Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 2014-08-12 23:14:35 +00:00
kmccormick
71f8f1d81f Doc Change: Remove obsolete sample link.
Fix for:

b/16685592

Change-Id: If15951ee783e8c05b4dfb32983a87a3518cdbe82
2014-08-12 18:08:58 -07:00
Jae Seo
0204938659 Merge "TIF: Change the directory of the state file" into lmp-dev 2014-08-12 23:14:33 +00:00
Jae Seo
8211dda34d TIF: Change the directory of the state file
Changed it from /data/system/tv/{userId} to the directory obtained from
Environment.getUserSystemDirectory(userId).

Bug: 17018435
Change-Id: Ib9704a974c4397149ca4b50670cf11346b818de3
2014-08-14 10:50:25 -07:00
Amit Mahajan
1e1a01b0e4 Merge "Contribute roaming configuration for domestic roaming and non-roaming cases" into lmp-dev 2014-08-12 23:14:33 +00:00
Jorim Jaggi
fbc88e19cb Fix emergency call when in launch transition.
Bug: 16831662
Change-Id: I3411decc3053a7e5fc760ffce5e8b3c52a6e0c49
2014-08-14 21:44:26 +00:00
Jing Zhao
5b14c3ef7b Contribute roaming configuration for domestic roaming and non-roaming cases
Change-Id: Ia1f1078aa50c8169086f63fe6f3d7d2f27389726
2014-08-14 13:03:11 -07:00
Amit Mahajan
46f65a7d99 Merge "Revert "Revert "add apn setting parameters, and set apn parameters to bp""" into lmp-dev 2014-08-12 23:14:33 +00:00
Amit Mahajan
ad254384ad Revert "Revert "add apn setting parameters, and set apn parameters to bp""
This reverts commit 193418074ad85878121776ebf316367ad53d2039.

Change-Id: I52641411da884fa252c40c303537e61ca6e14fc0
2014-08-13 21:56:32 +00:00
Chris Craik
0d79310e25 Merge "Switch to cos interpolation of shadow alpha" into lmp-dev 2014-08-12 23:14:33 +00:00
Alan Viverette
780fcd9f1a Merge "Make sure we're obtaining themed drawables correctly" into lmp-dev 2014-08-12 23:14:33 +00:00
Alan Viverette
03d30a573b Make sure we're obtaining themed drawables correctly
Change-Id: I446a3492f7bf5a897c5d698e61327af4b7840d85
2014-08-14 19:59:50 +00:00
Jorim Jaggi
8599a33580 Fix listening states for two-finger and fast-double swipe
Bug: 16655660
Change-Id: I46d826edc901e08eb1513fe87de2f63228581617
2014-08-14 19:55:42 +00:00
Jason Monk
92117e9b0c Merge "Switch exiting screen pinning to recents+back" into lmp-dev 2014-08-14 19:41:44 +00:00
Jason Monk
815e057b9b Switch exiting screen pinning to recents+back
When accessibility is on, still use just recents.

While here fix strings to be less wrong.  Still need finalization.

Bug: 16649417
Change-Id: I94debe9471d5132f1f662543cc98cbde638c758d
2014-08-14 20:06:41 +00:00
Alan Viverette
b7bd357cb8 Merge "Prevent SwitchPreference widget from receiving a11y focus" into lmp-dev 2014-08-14 19:41:44 +00:00
Alan Viverette
0464ca04e8 Prevent SwitchPreference widget from receiving a11y focus
Has no effect on behavior when explore by touch is turned off.

BUG: 16961152
Change-Id: I1e494d6a86f261d22d551afc43fe9e499907df6f
2014-08-14 20:00:04 +00:00
Alan Viverette
e06f9845df Merge "Don't set textColor in button style" into lmp-dev 2014-08-12 23:14:33 +00:00
Anish Athalye
4798c44563 Merge "Make LeadingMarginSpan2 behavior more consistent" into lmp-dev 2014-08-14 19:49:28 +00:00
Anish Athalye
ab08c6d38a Make LeadingMarginSpan2 behavior more consistent
This addresses b/16486549.

This change updates public documentation to specify the behavior of
LeadingMarginSpan2s. This change specifies what happens when a
LeadingMarginSpan2 is combined with other LeadingMarginSpans. This
behavior was not previously documented.

LeadingMarginSpan2s specify the number of lines used for the leading
margin. When laying out and rendering, for all LeadingMarginSpans, the
first line margin is applied for the number of lines specified by the
LeadingMarginSpan2.

Previously, this behavior was slightly buggy -- the LeadingMarginSpan2
affected all LeadingMarginSpans when laying out text, but not when
rendering.

This change is designed to cause the least amount of breakage in
existing code while achieving consistency with the way
LeadingMarginSpan2 is handled in layout and drawing.

For the most common use of LeadingMarginSpan2 -- getting a multi-line
first margin in the first paragraph of text in a layout -- this should
cause no change in behavior. For any other uses, the old (buggy)
implementation most likely did not exhibit correct behavior to begin
with, so developers were most likely not relying on that functionality.

Change-Id: I6f69df09c0130e703458e65bf3eaac4a905df56e
2014-08-14 11:58:37 -07:00
Alan Viverette
a6ef180b6f Don't set textColor in button style
We set the text color in the button text appearance, no need to do it
in the style as well.

Change-Id: I8cdad2f71b0cfea5d46ce662103b7c4883183083
2014-08-13 16:51:16 -07:00
Nancy Chen
5f52e8ce42 Merge "Add extras for outgoing call" into lmp-dev 2014-08-12 23:14:33 +00:00
Nancy Chen
10798dcaff Add extras for outgoing call
To be able to pass information from dialer to incallui,
telecomm.Call needs to hold extra information. Add this extra bundle to
the intent.

Bug: 15284651
Change-Id: Ie462c35ece41647c7104c657cc1de947ff284729
2014-08-14 11:59:43 -07:00
RoboErik
6d3e0c6d1a Merge "Remove REMOTE_STREAM_MUSIC references from AudioService" into lmp-dev 2014-08-12 23:14:33 +00:00
RoboErik
2811dd3372 Remove REMOTE_STREAM_MUSIC references from AudioService
This removes the fake stream from AudioService and cleans up
references to it. Also removes isLocalOrRemoteMusicActive.

bug:15884752
Change-Id: I1c2b57a2f8ba80061313737f254463f4c80ce8c3
2014-08-14 17:23:34 +00:00
Selim Cinek
1a8b72af90 Merge "Fixed a NPE during setup wizard" into lmp-dev 2014-08-12 23:14:49 +00:00
Selim Cinek
e34c6513bb Fixed a NPE during setup wizard
The heightChangedListener might not be set.

Bug: 17000238
Change-Id: I3e930d22eeaeea5984c089d3f76c91997e4a2b01
2014-08-14 09:26:04 +00:00
Dake Gu
0017ef9ee1 fix ghost clipBounds problem
OverlayViewGroup clipChildren=true, so that RenderNode
of GhostView will be forced clip its content to its bounds.
Because GhostView is transformed to a different location
other than (0,0),  the content left/up to the bounds
is clipped out.

Introduce another clipChildren=false view between
OverlayViewGroup and GhostView.

b/16982904

Change-Id: Ia11926c78e19bffe80c3d4584a59b83b2fbee6df
2014-08-12 16:10:40 -07:00