OSDN Git Service

android-x86/frameworks-base.git
10 years agoMerge "Fix RTL bug for actionbar tooltips" into lmp-dev
Yigit Boyar [Fri, 22 Aug 2014 19:15:39 +0000 (19:15 +0000)]
Merge "Fix RTL bug for actionbar tooltips" into lmp-dev

10 years agoMerge "Change actionbar title size for landscape" into lmp-dev
Yigit Boyar [Fri, 22 Aug 2014 19:15:24 +0000 (19:15 +0000)]
Merge "Change actionbar title size for landscape" into lmp-dev

10 years agoMerge "TIF: Fix comments in TvContentRating" into lmp-dev
Jae Seo [Fri, 22 Aug 2014 18:41:31 +0000 (18:41 +0000)]
Merge "TIF: Fix comments in TvContentRating" into lmp-dev

10 years agoTIF: Fix comments in TvContentRating
Jae Seo [Fri, 22 Aug 2014 17:52:01 +0000 (10:52 -0700)]
TIF: Fix comments in TvContentRating

Bug: 16876068
Change-Id: I4c8be4ecbbdefac8e85531fa9b918f454b9e45d8

10 years agoMerge "Add a missing condition when checking measurement for ActionBarContainer"...
Adam Powell [Fri, 22 Aug 2014 18:03:19 +0000 (18:03 +0000)]
Merge "Add a missing condition when checking measurement for ActionBarContainer" into lmp-dev

10 years agoMerge "Add Voice Assist key." into lmp-dev
Michael Wright [Fri, 22 Aug 2014 18:02:26 +0000 (18:02 +0000)]
Merge "Add Voice Assist key." into lmp-dev

10 years agoMerge "Update normalized phone number for contact for successful call" into lmp-dev
Yorke Lee [Fri, 22 Aug 2014 17:55:48 +0000 (17:55 +0000)]
Merge "Update normalized phone number for contact for successful call" into lmp-dev

10 years agoAdd a missing condition when checking measurement for ActionBarContainer
Adam Powell [Fri, 22 Aug 2014 17:46:55 +0000 (10:46 -0700)]
Add a missing condition when checking measurement for ActionBarContainer

It even said "non-tab" right there.

Bug 17202141

Change-Id: Iacc7ec9610d2639aab59dd57ba7194178fb6391f

10 years agoMerge "Hiding Video telephony related APIs." into lmp-dev
Tyler Gunn [Fri, 22 Aug 2014 17:12:56 +0000 (17:12 +0000)]
Merge "Hiding Video telephony related APIs." into lmp-dev

10 years agoMerge "Move SystemBackupAgent from services.jar to frameworks.jar" into lmp-dev
Brian Carlstrom [Fri, 22 Aug 2014 17:03:48 +0000 (17:03 +0000)]
Merge "Move SystemBackupAgent from services.jar to frameworks.jar" into lmp-dev

10 years agoMerge "Switch to proper networkcallback api" into lmp-dev
Jason Monk [Fri, 22 Aug 2014 16:56:43 +0000 (16:56 +0000)]
Merge "Switch to proper networkcallback api" into lmp-dev

10 years agoMerge "Allow NetworkRequest release from the system process." into lmp-dev
Jeff Davidson [Fri, 22 Aug 2014 16:52:27 +0000 (16:52 +0000)]
Merge "Allow NetworkRequest release from the system process." into lmp-dev

10 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Fri, 22 Aug 2014 16:49:58 +0000 (16:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

10 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Fri, 22 Aug 2014 16:41:27 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

10 years agoMerge "Zen: "Muted by <x>" indicator string." into lmp-dev
John Spurlock [Fri, 22 Aug 2014 16:06:05 +0000 (16:06 +0000)]
Merge "Zen: "Muted by <x>" indicator string." into lmp-dev

10 years agoMerge "Send notification messages immediatelly" into lmp-dev
Youngsang Cho [Fri, 22 Aug 2014 15:54:11 +0000 (15:54 +0000)]
Merge "Send notification messages immediatelly" into lmp-dev

10 years agoSend notification messages immediatelly
Youngsang Cho [Fri, 22 Aug 2014 12:27:47 +0000 (21:27 +0900)]
Send notification messages immediatelly

Notification messages are posted through a handler with a main thread.
When a caller of TIS.notifyXXX runs also in a main thread, the notification
is delivered after the method including the caller is finished.
So we added runOnMainThread and made notification messages sent through
runOnMainThread.

Change-Id: Ieb2c5c04ff031e42a532acfc45e0174563265c6b

10 years agoMerge "Fixed focusing order for the notification panel and QS" into lmp-dev
Selim Cinek [Fri, 22 Aug 2014 15:35:53 +0000 (15:35 +0000)]
Merge "Fixed focusing order for the notification panel and QS" into lmp-dev

10 years agoSwitch to proper networkcallback api
Jason Monk [Thu, 21 Aug 2014 17:44:18 +0000 (13:44 -0400)]
Switch to proper networkcallback api

This will listen properly for the connection of the VPNs.  It will
also listen for disconnects, but may catch them slightly delayed
as the connection may be held on to.

Bug: 16153201
Bug: 17164598
Change-Id: I0c522f7fb4007c3376153c4b2a0345391e0b724f

10 years agoFixed focusing order for the notification panel and QS
Selim Cinek [Wed, 20 Aug 2014 21:50:41 +0000 (23:50 +0200)]
Fixed focusing order for the notification panel and QS

Also fixed multiple bugs regarding focusability, where
some elements were focusable even though invisible.
The buttons, QS-tiles, QS-detail buttons, QS Header
icons and other elements now have the correct focusability
state.
The rect indicating accessibility focus is now also
correct for dual label tiles, instead of just the whole
button.
Also fixes an ordering issue where notifications were above
the camera circle when launching.
In addition the focus order of the notifications now work
correctly.

Bug: 15569922
Bug: 15682123
Bug: 17159249
Bug: 15690386
Change-Id: Ie9f7ae73397b41ce2e9a4060699301fdef3a0d01

10 years agoZen: "Muted by <x>" indicator string.
John Spurlock [Fri, 22 Aug 2014 14:52:55 +0000 (10:52 -0400)]
Zen: "Muted by <x>" indicator string.

Bug:16958514
Change-Id: Ic2b9cde74df29ce70f4991f64759544c91e9fac3

10 years agoMerge "Final strings tweaks for work profile" into lmp-dev
Jessica Hummel [Fri, 22 Aug 2014 14:26:55 +0000 (14:26 +0000)]
Merge "Final strings tweaks for work profile" into lmp-dev

10 years agoMerge "Fix notification badge when line 3 not shown." into lmp-dev
Kenny Guy [Fri, 22 Aug 2014 14:20:30 +0000 (14:20 +0000)]
Merge "Fix notification badge when line 3 not shown." into lmp-dev

10 years agoMerge "SysUI: Fix NotificationData dump" into lmp-dev
Christoph Studer [Fri, 22 Aug 2014 14:18:03 +0000 (14:18 +0000)]
Merge "SysUI: Fix NotificationData dump" into lmp-dev

10 years agoMerge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev
Adrian Roos [Fri, 22 Aug 2014 14:17:31 +0000 (14:17 +0000)]
Merge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev

10 years agoSysUI: Fix NotificationData dump
Christoph Studer [Thu, 21 Aug 2014 14:41:45 +0000 (16:41 +0200)]
SysUI: Fix NotificationData dump

Inactive notification count and indices were off.

Change-Id: I6e8555fe7dcaf6e7f999f09fb4cda56622928b07

10 years agoFinal strings tweaks for work profile
Jessica Hummel [Fri, 22 Aug 2014 10:26:55 +0000 (11:26 +0100)]
Final strings tweaks for work profile

Change-Id: I29ea13d522d867f847e72f5c43170a526e4e7f07
bug:15744182

10 years agoMerge "QS: Repoint Wifi + BT dual tile labels to settings." into lmp-dev
John Spurlock [Fri, 22 Aug 2014 13:27:46 +0000 (13:27 +0000)]
Merge "QS: Repoint Wifi + BT dual tile labels to settings." into lmp-dev

10 years agoMerge "Don't do ambient display when in power-conservation mode." into lmp-dev
John Spurlock [Fri, 22 Aug 2014 13:27:28 +0000 (13:27 +0000)]
Merge "Don't do ambient display when in power-conservation mode." into lmp-dev

10 years agoMerge "Content description for padlock icon depending on state" into lmp-dev
Jorim Jaggi [Fri, 22 Aug 2014 13:21:45 +0000 (13:21 +0000)]
Merge "Content description for padlock icon depending on state" into lmp-dev

10 years agoDon't do ambient display when in power-conservation mode.
John Spurlock [Thu, 21 Aug 2014 20:43:45 +0000 (16:43 -0400)]
Don't do ambient display when in power-conservation mode.

Finish SystemUI's doze dream early when we enter saver mode.

Bug:17164834
Change-Id: I79153be34da8c4b6447acf5dc9f93364906b2bab

10 years agoMerge "Doze: Improve icon treatment when dozing." into lmp-dev
John Spurlock [Fri, 22 Aug 2014 12:59:15 +0000 (12:59 +0000)]
Merge "Doze: Improve icon treatment when dozing." into lmp-dev

10 years agoFix notification badge when line 3 not shown.
Kenny Guy [Thu, 24 Jul 2014 18:54:37 +0000 (19:54 +0100)]
Fix notification badge when line 3 not shown.

Ongoing notifications from chrome and drive
don't have content in line 3 so profile badge
wasn't shown.
Add profile badge to large notifications which
hide line 3.

Bug: 16366324
Change-Id: Ib4f1e888674743aa8ef93b7eaceae72602d8df4d

10 years agoRemove a line that was accidentally committed.
Narayan Kamath [Fri, 22 Aug 2014 11:35:04 +0000 (12:35 +0100)]
Remove a line that was accidentally committed.

Prevents the APK from being installed.

bug: 17153971

Change-Id: Ic53c94dc6f0583371965d5edb0b12248c915214e

10 years agoRemove CursorAnchorInfoRequest and related stuff
Yohei Yukawa [Fri, 22 Aug 2014 01:38:44 +0000 (18:38 -0700)]
Remove CursorAnchorInfoRequest and related stuff

This CL removes CursorAnchorInfoRequest and related stuff
in favor of InputConnection.requestUpdateCursorAnchorInfo,
which is more easy to understand. This CL also deprecates
InputMethodManager#updateCursor and related stuff.

Rationale:
1. The spec of #updateCursor says that it provides the cursor
   position in local coordinates, while the input method
   requires it in the screen coordinates.
2. #updateCursor has never been enabled in AOSP, because
   InputMethodManager#isWatchingCursor always returned false.
3. There has been no way to let
   InputMethodManager#isWatchingCursor return true.
4. In L, InputMethodManager#updateCursorAnchorInfo is
   introduced to address all the issues above.

Given that we no longer need to support #updateCursor,
CursorAnchorInfoRequest is overkill when we need to convey
just a couple of parameters.

BUG: 17185263
BUG: 17182367

Change-Id: I4a577bfd02b37b9e56c80b8b41bb25afa95dd8ef

10 years agoMerge "Fix service tests." into lmp-dev
Narayan Kamath [Fri, 22 Aug 2014 07:47:36 +0000 (07:47 +0000)]
Merge "Fix service tests." into lmp-dev

10 years agoAdd spam-safe logger.
Jungshik Jang [Fri, 22 Aug 2014 04:49:55 +0000 (13:49 +0900)]
Add spam-safe logger.

This change introduces a new helper class, HdmiLogger,
which prevents spammy log for same error message.

Bug: 17179667
Change-Id: Ia55808408e0a92b0370cd627361f80754b2f1018

10 years agoMove SystemBackupAgent from services.jar to frameworks.jar
Brian Carlstrom [Fri, 22 Aug 2014 06:15:13 +0000 (23:15 -0700)]
Move SystemBackupAgent from services.jar to frameworks.jar

Bug: 17168017
Change-Id: I89b98ca839a78eeb7fb43930e0699ee235deafad

10 years agoMerge "Implement interfaces for MHL scratchpad command" into lmp-dev
Jungshik Jang [Fri, 22 Aug 2014 05:22:44 +0000 (05:22 +0000)]
Merge "Implement interfaces for MHL scratchpad command" into lmp-dev

10 years agoMerge "Fix docs for circular reveal" into lmp-dev
Chet Haase [Fri, 22 Aug 2014 04:12:49 +0000 (04:12 +0000)]
Merge "Fix docs for circular reveal" into lmp-dev

10 years agoMerge "Clean up RsFountainFbo_intermediates." into lmp-dev
Stephen Hines [Fri, 22 Aug 2014 04:09:46 +0000 (04:09 +0000)]
Merge "Clean up RsFountainFbo_intermediates." into lmp-dev

10 years agoMerge "Rework the per-network URL API." into lmp-dev
Lorenzo Colitti [Fri, 22 Aug 2014 03:07:27 +0000 (03:07 +0000)]
Merge "Rework the per-network URL API." into lmp-dev

10 years agoImplement interfaces for MHL scratchpad command
Jungshik Jang [Thu, 21 Aug 2014 05:17:05 +0000 (14:17 +0900)]
Implement interfaces for MHL scratchpad command

1. Add sendScratchpadCommand to IHdmiControlService interface,
which is used to send scratchpad command.

2. Add IHdmiMhlScratchpadCommandListener to handle incoming
MHL scratchpad command.

Bug: 17146522

Change-Id: I8e8e743dc08a18c80867be470997ce79d3292c15

10 years agoMerge "CEC: Skip routing control/internal source selection conditionally" into lmp-dev
Jinsuk Kim [Fri, 22 Aug 2014 02:14:05 +0000 (02:14 +0000)]
Merge "CEC: Skip routing control/internal source selection conditionally" into lmp-dev

10 years agoRework the per-network URL API.
Lorenzo Colitti [Thu, 21 Aug 2014 18:45:54 +0000 (11:45 -0700)]
Rework the per-network URL API.

This addresses API council comments.

Bug: 17112978
Change-Id: I698b243b2b685d1f25414cee72450be3ae0c2bf0

10 years agoAdd Voice Assist key.
Michael Wright [Fri, 22 Aug 2014 02:05:21 +0000 (19:05 -0700)]
Add Voice Assist key.

The action taken is dependent on whether the device is in an
interactive state, allowing for interactions to work even when the
device isn't actively being used

Bug: 16292420
Change-Id: I897f4383e7e4766c0bcb6246b41514b46e03a9ac

10 years agoFix docs for circular reveal
Chet Haase [Fri, 22 Aug 2014 01:55:38 +0000 (18:55 -0700)]
Fix docs for circular reveal

Issue #17189634 API Review: reveal animation

Change-Id: Iffcec2669368fc95b50ddcba63d0f5c552f49231

10 years agoMerge "Directly propagate Activity titles to action bars" into lmp-dev
Adam Powell [Fri, 22 Aug 2014 01:18:22 +0000 (01:18 +0000)]
Merge "Directly propagate Activity titles to action bars" into lmp-dev

10 years agoDirectly propagate Activity titles to action bars
Adam Powell [Fri, 22 Aug 2014 01:05:53 +0000 (18:05 -0700)]
Directly propagate Activity titles to action bars

Window decor action bars already inherit window title changes if no
explicit action bar title has been set but from an Activity's
perspective setting the activity title is a stronger signal. This is
especially relevant when the activity's action bar has been provided
by the application in the form of a Toolbar.

Bug 17138048

Change-Id: Ibf042cab6bbda3dc29590c09d1a0910b6ba78870

10 years agoMerge "Add private themes for dialogs spawned from Settings theme" into lmp-dev
Alan Viverette [Fri, 22 Aug 2014 01:03:47 +0000 (01:03 +0000)]
Merge "Add private themes for dialogs spawned from Settings theme" into lmp-dev

10 years agoMinor tweaks to recents thumbnails.
Winson Chung [Wed, 20 Aug 2014 22:39:01 +0000 (15:39 -0700)]
Minor tweaks to recents thumbnails.

- Reducing the size of the recents thumbnails
- Skip persisting if we never update the last thumbnail
- Don't bother loading the last thumbnail file descriptor if we have it in memory
- Fixing warning in getting drawable from resource

Change-Id: Ieddaeac75a5e5d80876a9b6b1d50f7cc84c7d6fd

10 years agoMerge "Clean up nullable listeners in date and time picker delegates" into lmp-dev
Alan Viverette [Fri, 22 Aug 2014 01:02:01 +0000 (01:02 +0000)]
Merge "Clean up nullable listeners in date and time picker delegates" into lmp-dev

10 years agoMerge "Guard against EOF when reading in FileBridge." into lmp-dev
Jeff Sharkey [Fri, 22 Aug 2014 00:58:01 +0000 (00:58 +0000)]
Merge "Guard against EOF when reading in FileBridge." into lmp-dev

10 years agoGuard against EOF when reading in FileBridge.
Jeff Sharkey [Fri, 22 Aug 2014 00:54:29 +0000 (17:54 -0700)]
Guard against EOF when reading in FileBridge.

Bug: 17183379
Change-Id: I8856fc149915281093f83f46bad64f211d134322

10 years agoFix RTL bug for actionbar tooltips
Yigit Boyar [Fri, 22 Aug 2014 00:48:58 +0000 (17:48 -0700)]
Fix RTL bug for actionbar tooltips

Bug: 12570378
Change-Id: I13ba94c8b736a3a80a8d79e95bd18b93a1157303

10 years agoMerge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev
Eino-Ville Talvala [Fri, 22 Aug 2014 00:46:40 +0000 (00:46 +0000)]
Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev

10 years agoCEC: Skip routing control/internal source selection conditionally
Jinsuk Kim [Fri, 22 Aug 2014 00:07:40 +0000 (09:07 +0900)]
CEC: Skip routing control/internal source selection conditionally

This is necessary for TV woken up by <Text/Image View On> to override
initial TV source selection/routing control, since the input change
will immediately come from external device.

Bug: 17189114
Change-Id: I4aa1ac31bc7f6ab554e29a9e6065e534e15abd58

10 years agoMerge "Camera2: add toString for two params classes" into lmp-dev
Yin-Chia Yeh [Fri, 22 Aug 2014 00:20:05 +0000 (00:20 +0000)]
Merge "Camera2: add toString for two params classes" into lmp-dev

10 years agoMake mAutoAttachOnCreation in DcTracker configuable
Jing Zhao [Wed, 20 Aug 2014 18:51:30 +0000 (13:51 -0500)]
Make mAutoAttachOnCreation in DcTracker configuable

Bug: 17131842
Change-Id: Iba63cff2f8f5b3ed28bde2aca42e91d3693cad54

10 years agoMerge "Content description for next alarm" into lmp-dev
Jorim Jaggi [Fri, 22 Aug 2014 00:05:45 +0000 (00:05 +0000)]
Merge "Content description for next alarm" into lmp-dev

10 years agoAdditional changes for Conference.
Santos Cordon [Thu, 21 Aug 2014 21:28:11 +0000 (14:28 -0700)]
Additional changes for Conference.

1) Connection.setConference() checked to see if the conference was valid
before setting it.  This prevented us from populating child connections
on a new conference until it was added.  Now we allow it but dont sent
the update unless the conference has already been sent.
2) removed unnecessary ArrayList<>() wrappers on CopyOnWriteLists.
3) Updated disconnect/hold/unhold so that they are sent to Conference
objects as well as Connection objects.
4) Added support for separating a child conference call.
5) Additional Logging

Bug: 15621105
Bug: 17136172
Change-Id: I939c36bc9694b9d81f0ff582e2fbe335006aa485

10 years agoHiding Video telephony related APIs.
Tyler Gunn [Thu, 21 Aug 2014 23:38:40 +0000 (16:38 -0700)]
Hiding Video telephony related APIs.

Bug: 17188135
Change-Id: I2d4111dbad2430968a458f8f3bf4f2ca1becbbdd

10 years agoClean up RsFountainFbo_intermediates.
Stephen Hines [Thu, 21 Aug 2014 23:34:43 +0000 (16:34 -0700)]
Clean up RsFountainFbo_intermediates.

Change-Id: I5c041bac357466d918d3dd209f36b505fd000852

10 years agoContent description for next alarm
Jorim Jaggi [Thu, 21 Aug 2014 23:33:33 +0000 (01:33 +0200)]
Content description for next alarm

Also fixes a bug where "status" was read out with TalkBack for no
good reason.

Bug: 15694080
Change-Id: Id295eb70af880d93ff928ebc337b09a8d679120d

10 years agoChange actionbar title size for landscape
Yigit Boyar [Thu, 21 Aug 2014 22:33:38 +0000 (15:33 -0700)]
Change actionbar title size for landscape

Bug: 16132120
Change-Id: Ic6d01671e70e338f1539f3f206d7879a67d54f1e

10 years agoUpdate normalized phone number for contact for successful call
Yorke Lee [Thu, 21 Aug 2014 16:37:22 +0000 (09:37 -0700)]
Update normalized phone number for contact for successful call

Bug: 13792353

Change-Id: I6461bd225994160ace45238aee49f39eb13cb702

10 years agoAllow NetworkRequest release from the system process.
Jeff Davidson [Thu, 21 Aug 2014 22:54:15 +0000 (15:54 -0700)]
Allow NetworkRequest release from the system process.

Otherwise attempts to release that are triggered by the binder death
receipient will be rejected.

Bug: 17187437
Change-Id: If3924d82dba69c572708e04c11d17ed25ae6870d

10 years agoMerge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback...
Lajos Molnar [Thu, 21 Aug 2014 23:05:27 +0000 (23:05 +0000)]
Merge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback" into lmp-dev

10 years agoMerge "Add Parent Change to ChangeTransform" into lmp-dev
George Mount [Thu, 21 Aug 2014 23:00:04 +0000 (23:00 +0000)]
Merge "Add Parent Change to ChangeTransform" into lmp-dev

10 years agoContent description for padlock icon depending on state
Jorim Jaggi [Thu, 21 Aug 2014 12:51:58 +0000 (14:51 +0200)]
Content description for padlock icon depending on state

Bug: 15694090
Change-Id: I340b67f2036bd4b29388f437ab5bac1f1aabb93e

10 years agoAdd Parent Change to ChangeTransform
Dake Gu [Tue, 22 Jul 2014 21:53:53 +0000 (14:53 -0700)]
Add Parent Change to ChangeTransform

Bug 16460123

Modified ChangeTransform to support any pivot changes.
Modified ChangeTransform to support changes between parents.

Change-Id: I6374890dab9f3d795f334b951bdb9d51d434b8ee

10 years agoMerge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev
Igor Murashkin [Thu, 21 Aug 2014 22:33:28 +0000 (22:33 +0000)]
Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev

10 years agoMerge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev
George Mount [Thu, 21 Aug 2014 22:26:56 +0000 (22:26 +0000)]
Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev

10 years agoMerge "MediaHTTPConnection: handles cross protocol redirects." into lmp-dev
Ronghua Wu [Thu, 21 Aug 2014 22:24:15 +0000 (22:24 +0000)]
Merge "MediaHTTPConnection: handles cross protocol redirects." into lmp-dev

10 years agoAdd private themes for dialogs spawned from Settings theme
Alan Viverette [Thu, 21 Aug 2014 22:16:31 +0000 (15:16 -0700)]
Add private themes for dialogs spawned from Settings theme

BUG: 16778165
Change-Id: I19ecf735171c55d56dc1072622eeefcef5d233a0

10 years agoVoLTE incoming call number
Jing Zhao [Tue, 19 Aug 2014 17:41:23 +0000 (12:41 -0500)]
VoLTE incoming call number

Set incoming call number in OIR to be shown to user

Bug: 17032453
Change-Id: Iceadb0f537fb35f685cbcf8279ccef7d86036600

10 years agoMerge "Add better error message for AAPT file conflicts" into lmp-dev
Adam Lesinski [Thu, 21 Aug 2014 22:00:24 +0000 (22:00 +0000)]
Merge "Add better error message for AAPT file conflicts" into lmp-dev

10 years agoMerge "AAPT: mipmaps should not end up in Splits" into lmp-dev
Adam Lesinski [Thu, 21 Aug 2014 22:00:08 +0000 (22:00 +0000)]
Merge "AAPT: mipmaps should not end up in Splits" into lmp-dev

10 years agoMerge "We need to specify a target SDK < 21 to use graphics RS." into lmp-dev
Stephen Hines [Thu, 21 Aug 2014 21:48:17 +0000 (21:48 +0000)]
Merge "We need to specify a target SDK < 21 to use graphics RS." into lmp-dev

10 years agoQS: Repoint Wifi + BT dual tile labels to settings.
John Spurlock [Thu, 21 Aug 2014 21:37:54 +0000 (17:37 -0400)]
QS: Repoint Wifi + BT dual tile labels to settings.

Bug:17179601
Change-Id: I7854ac04be60ff2dedb29d451e98b6c0d9cce46e

10 years agoMerge "Work on issue #16683269: system_server still leaking memory" into lmp-dev
Dianne Hackborn [Thu, 21 Aug 2014 21:34:08 +0000 (21:34 +0000)]
Merge "Work on issue #16683269: system_server still leaking memory" into lmp-dev

10 years agoAllow Activities to opt into using Overlay for shared elements.
George Mount [Mon, 18 Aug 2014 23:50:50 +0000 (16:50 -0700)]
Allow Activities to opt into using Overlay for shared elements.

Bug 17001227

Change-Id: Icc49a81357ee69abd2a15a1d1efcead298ab3fb7

10 years agoCamera2: Fix return type of CaptureFailure#getFrameNumber
Eino-Ville Talvala [Thu, 21 Aug 2014 21:27:20 +0000 (14:27 -0700)]
Camera2: Fix return type of CaptureFailure#getFrameNumber

Should be long, not int.

Bug: 17188354
Change-Id: If90749f21cdf9dd493aa561769655211a70acf29

10 years agoMerge "Don't say "Arabic (Egypt)" in Settings." into lmp-dev
Elliott Hughes [Thu, 21 Aug 2014 21:24:43 +0000 (21:24 +0000)]
Merge "Don't say "Arabic (Egypt)" in Settings." into lmp-dev

10 years agoMerge "Change the NetworkInfo for disconnected types." into lmp-dev
Robert Greenwalt [Thu, 21 Aug 2014 21:02:18 +0000 (21:02 +0000)]
Merge "Change the NetworkInfo for disconnected types." into lmp-dev

10 years agoAAPT: mipmaps should not end up in Splits
Adam Lesinski [Thu, 21 Aug 2014 20:19:12 +0000 (13:19 -0700)]
AAPT: mipmaps should not end up in Splits

Mipmaps are never filtered, and so they will always
end up in the base APK. Make sure they get omitted from
any split.

Change-Id: Id24b082bc9bd2d3f031a58bd0de4d30b4f0de7e0

10 years agoClean up nullable listeners in date and time picker delegates
Alan Viverette [Thu, 21 Aug 2014 20:56:54 +0000 (13:56 -0700)]
Clean up nullable listeners in date and time picker delegates

Removes the NO_OP listener from TimePicker since we actually do null
checks everywhere already.

BUG: 17179502
Change-Id: I39a7d68253845c004027e31c59afc43be42195b7

10 years agoAdd better error message for AAPT file conflicts
Adam Lesinski [Tue, 13 May 2014 05:13:02 +0000 (22:13 -0700)]
Add better error message for AAPT file conflicts

Some resource directories may be the same even though
their names are different. For instance, the
"smallest width" qualifier was added in API 13,
so the resource directory "values-sw600dp" and
"values-sw600dp-v13" are the same and cause
a conflict. The error reports that this might be the
case.

Change-Id: Ia35f1d670edd48265b3a7fe3d55656128421f612

10 years agoMerge "Enable scissor for rounded outline clips" into lmp-dev
Chris Craik [Thu, 21 Aug 2014 20:48:52 +0000 (20:48 +0000)]
Merge "Enable scissor for rounded outline clips" into lmp-dev

10 years agoEnable scissor for rounded outline clips
Chris Craik [Thu, 21 Aug 2014 19:26:16 +0000 (12:26 -0700)]
Enable scissor for rounded outline clips

bug:17164074

Change-Id: I83ca428f4d7651c6774ab81ac390477fb90c5d38

10 years agoWork on issue #16683269: system_server still leaking memory
Dianne Hackborn [Thu, 21 Aug 2014 20:44:19 +0000 (13:44 -0700)]
Work on issue #16683269: system_server still leaking memory

Fix a small temporary leak of app crash dialogs, which weren't
removing their timeout message.

Change-Id: Iee90b5fa2be700e3006388f32145ce4b14baa2ec

10 years agoMediaHTTPConnection: handles cross protocol redirects.
Ronghua Wu [Thu, 21 Aug 2014 18:15:53 +0000 (11:15 -0700)]
MediaHTTPConnection: handles cross protocol redirects.

Bug: 16899444
Bug: 17106630

Change-Id: I7e416447abffcae31c65fd469ee5f9fc867b4cdc

10 years agoMerge "Update Split example with application icon" into lmp-dev
Adam Lesinski [Thu, 21 Aug 2014 20:39:25 +0000 (20:39 +0000)]
Merge "Update Split example with application icon" into lmp-dev

10 years agoMerge "Report the right resource version in am get-config" into lmp-dev
Adam Lesinski [Thu, 21 Aug 2014 20:38:57 +0000 (20:38 +0000)]
Merge "Report the right resource version in am get-config" into lmp-dev

10 years agoJobScheduler needs to flush queue on charging
Matthew Williams [Fri, 8 Aug 2014 18:51:06 +0000 (11:51 -0700)]
JobScheduler needs to flush queue on charging

Also make it illegal to schedule a job with no constraints.
BUG: 16877705
Change-Id: Iae57286bc4f73163a7e3c9d2d531623fd50f1f72

10 years agoMerge "Write device owner name to XML" into lmp-dev
Jason Monk [Thu, 21 Aug 2014 20:28:07 +0000 (20:28 +0000)]
Merge "Write device owner name to XML" into lmp-dev

10 years agoMerge "Don't run animators in buildLayer" into lmp-dev
John Reck [Thu, 21 Aug 2014 20:26:17 +0000 (20:26 +0000)]
Merge "Don't run animators in buildLayer" into lmp-dev

10 years agoDon't say "Arabic (Egypt)" in Settings.
Elliott Hughes [Thu, 21 Aug 2014 20:10:44 +0000 (13:10 -0700)]
Don't say "Arabic (Egypt)" in Settings.

Nexus devices only ship one Arabic locale: ar_EG. This should probably be
changed to ar_001 in a later release (and, really, we should let users
choose _all_ of the Arabic-speaking countries), but there's no time for L.

This adds ar_EG to the list of special cases for LocalePicker so that
we'll show "Arabic" instead of "Arabic (Egypt)" (the actual change uses
the Arabic for "Arabic", obviously).

If you're an OEM trying to ship multiple Arabic locales, please accept
my apologies for making your lives slightly harder and, yes, this is the
patch you want to revert so that ar_EG shows up as "Arabic (Egypt)" again.

Bug: 17150708
Change-Id: Iea2fdf813bf3d7758e667bb1a8134a612ee0317b

10 years agoMerge "Fix supporting modifying listeners in callbacks" into lmp-dev
John Reck [Thu, 21 Aug 2014 20:18:54 +0000 (20:18 +0000)]
Merge "Fix supporting modifying listeners in callbacks" into lmp-dev

10 years agoDoze: Improve icon treatment when dozing.
John Spurlock [Thu, 21 Aug 2014 13:44:39 +0000 (09:44 -0400)]
Doze: Improve icon treatment when dozing.

Instead of inverting them, simply desaturate.  Also, apply
a constant background to small icons and give them some
transparency.

Bug:17137319

Change-Id: Id772b4fcd9ffa461bec26b87a74302012fb27867