OSDN Git Service
Diego Perez [Thu, 7 May 2015 00:49:46 +0000 (00:49 +0000)]
am
52ef7fce: am
ffeb8117: am
9c13c8de: am
bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev
* commit '
52ef7fce1626868d6be34f4038cd852259ad6a26':
Make sure shaders use a color model compatible with the destination.
Deepanshu Gupta [Thu, 7 May 2015 00:49:40 +0000 (00:49 +0000)]
am
a131bfe0: am
3dbd18cd: am
872e9950: am
1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev
* commit '
a131bfe094c007721d006fc9ca21cfa74f41dfef':
More layoutlib tests.
Deepanshu Gupta [Thu, 7 May 2015 00:45:29 +0000 (17:45 -0700)]
resolved conflicts for merge of
a663e012 to mnc-dev
Change-Id: I279cad7db6e9b5e97da3ea3c3bb91e09cabc7076
Diego Perez [Thu, 7 May 2015 00:34:32 +0000 (00:34 +0000)]
am
9efcb308: am
21246bd9: am
8e75e307: am
1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '
9efcb308615c0adaf418d430adabea3d271bcbb4':
Fix isThemeAppCompat NPE when using an invalid theme
Deepanshu Gupta [Thu, 7 May 2015 00:34:26 +0000 (00:34 +0000)]
am
9c9bcd34: am
cae76a70: am
46241071: am
4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit '
9c9bcd3486d9f7557329dea90b3c5fa1bdace91c':
Nullity annotations to some tests.
Deepanshu Gupta [Thu, 7 May 2015 00:34:21 +0000 (00:34 +0000)]
am
b2951490: am
b19325be: am
2e3c41a4: am
92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
* commit '
b2951490eabf71e14c8fc5d50397adf869a2a291':
Fix title bar showing when not required.
Deepanshu Gupta [Thu, 7 May 2015 00:34:14 +0000 (00:34 +0000)]
am
88b193d7: am
047a28ec: am
96437fb4: am
9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
* commit '
88b193d717bb73cbe555e4e621f7b6efdf49cdaa':
LayoutLib: fix crash when shadow size <=0.
Diego Perez [Thu, 7 May 2015 00:21:24 +0000 (00:21 +0000)]
am
ffeb8117: am
9c13c8de: am
bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev
* commit '
ffeb8117b139f61dd7c92bda6a7d47b83871cb66':
Make sure shaders use a color model compatible with the destination.
Deepanshu Gupta [Thu, 7 May 2015 00:21:19 +0000 (00:21 +0000)]
am
3dbd18cd: am
872e9950: am
1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev
* commit '
3dbd18cdfe6af1a9c36261551ef98d39e849d389':
More layoutlib tests.
Deepanshu Gupta [Thu, 7 May 2015 00:21:14 +0000 (00:21 +0000)]
am
9abe4232: am
7e4c1a92: am
b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev
* commit '
9abe42324f2252460b003e6fcdb097910e16178a':
RecyclerView in LayoutLib: better XML attrs.
Diego Perez [Thu, 7 May 2015 00:21:09 +0000 (00:21 +0000)]
am
21246bd9: am
8e75e307: am
1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '
21246bd92f54be468496848b659bf47f2522430a':
Fix isThemeAppCompat NPE when using an invalid theme
Deepanshu Gupta [Thu, 7 May 2015 00:21:03 +0000 (00:21 +0000)]
am
cae76a70: am
46241071: am
4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit '
cae76a70bfca9f37a10f34582cddbe0792625f26':
Nullity annotations to some tests.
Deepanshu Gupta [Thu, 7 May 2015 00:20:59 +0000 (00:20 +0000)]
am
b19325be: am
2e3c41a4: am
92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
* commit '
b19325be074e466c39e86fd4418726a7c305546c':
Fix title bar showing when not required.
Deepanshu Gupta [Thu, 7 May 2015 00:20:53 +0000 (00:20 +0000)]
am
047a28ec: am
96437fb4: am
9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
* commit '
047a28ec506bb40081eef6eaf8434884157709ce':
LayoutLib: fix crash when shadow size <=0.
Diego Perez [Thu, 7 May 2015 00:08:53 +0000 (00:08 +0000)]
am
9c13c8de: am
bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev
* commit '
9c13c8de8291aac69958a106248d3229ff90609f':
Make sure shaders use a color model compatible with the destination.
Deepanshu Gupta [Thu, 7 May 2015 00:08:45 +0000 (00:08 +0000)]
am
872e9950: am
1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev
* commit '
872e9950a227128d323c24eb369863e16964493a':
More layoutlib tests.
Deepanshu Gupta [Thu, 7 May 2015 00:08:36 +0000 (00:08 +0000)]
am
7e4c1a92: am
b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev
* commit '
7e4c1a92b8f3ce02df0a1502be45c450308d81b7':
RecyclerView in LayoutLib: better XML attrs.
Diego Perez [Thu, 7 May 2015 00:08:29 +0000 (00:08 +0000)]
am
8e75e307: am
1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '
8e75e307373a03dcbc55ce71be5b50f80e0474db':
Fix isThemeAppCompat NPE when using an invalid theme
Deepanshu Gupta [Thu, 7 May 2015 00:08:22 +0000 (00:08 +0000)]
am
46241071: am
4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit '
4624107185135db9db6bfbfb3d0c3a0951c19ee1':
Nullity annotations to some tests.
Deepanshu Gupta [Thu, 7 May 2015 00:08:01 +0000 (00:08 +0000)]
am
2e3c41a4: am
92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
* commit '
2e3c41a4e4fbb811cdafc754708d62cba7c6c1b6':
Fix title bar showing when not required.
Deepanshu Gupta [Thu, 7 May 2015 00:07:54 +0000 (00:07 +0000)]
am
96437fb4: am
9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
* commit '
96437fb4b05be2602bb0fa215988be646aec28fc':
LayoutLib: fix crash when shadow size <=0.
Adam Powell [Wed, 6 May 2015 23:55:54 +0000 (23:55 +0000)]
Merge "Move PhoneWindow and friends back into internal package" into mnc-dev
Diego Perez [Wed, 6 May 2015 23:53:41 +0000 (23:53 +0000)]
am
bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev
* commit '
bc47abe4b444d0386d1d939e4a223a976fade565':
Make sure shaders use a color model compatible with the destination.
Deepanshu Gupta [Wed, 6 May 2015 23:53:37 +0000 (23:53 +0000)]
am
1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev
* commit '
1f8e3de40c0aed9fa8b9216ddd3224b7ac94acf1':
More layoutlib tests.
Deepanshu Gupta [Wed, 6 May 2015 23:53:32 +0000 (23:53 +0000)]
am
b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev
* commit '
b4ca896f05eed9d36ac9971810d102a9139502f9':
RecyclerView in LayoutLib: better XML attrs.
Diego Perez [Wed, 6 May 2015 23:53:27 +0000 (23:53 +0000)]
am
1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '
1bc7fb2dcc954caac78d3fc02eb98ec30658d4d0':
Fix isThemeAppCompat NPE when using an invalid theme
Deepanshu Gupta [Wed, 6 May 2015 23:53:23 +0000 (23:53 +0000)]
am
4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit '
4f8a999682fdb8b38ee5671b8a8f527569ebb5ff':
Nullity annotations to some tests.
Deepanshu Gupta [Wed, 6 May 2015 23:53:18 +0000 (23:53 +0000)]
am
92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
* commit '
92e798682b5e45a05bffecb40a9b9f473420ea79':
Fix title bar showing when not required.
Deepanshu Gupta [Wed, 6 May 2015 23:53:14 +0000 (23:53 +0000)]
am
9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
* commit '
9aa600e79f8f68115e8e95f02933376e3da7d194':
LayoutLib: fix crash when shadow size <=0.
Diego Perez [Wed, 6 May 2015 23:43:49 +0000 (23:43 +0000)]
Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:43:09 +0000 (23:43 +0000)]
Merge "More layoutlib tests." into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:42:54 +0000 (23:42 +0000)]
Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev
Diego Perez [Wed, 6 May 2015 23:42:33 +0000 (23:42 +0000)]
Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:42:19 +0000 (23:42 +0000)]
Merge "Nullity annotations to some tests." into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:42:00 +0000 (23:42 +0000)]
Merge "Fix title bar showing when not required." into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:41:35 +0000 (23:41 +0000)]
Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
Seigo Nonaka [Wed, 6 May 2015 23:08:03 +0000 (23:08 +0000)]
Merge "Do nothing if hideSoftInput is called from not focused client." into mnc-dev
Seigo Nonaka [Wed, 6 May 2015 17:31:47 +0000 (10:31 -0700)]
Do nothing if hideSoftInput is called from not focused client.
IMMS#hideSoftInput calls IMMS#setImeWindowVisibilityStatusHiddenLocked
if it is called from not focused client. However this function changes
IMS visibility state and also changes the back key indicator wrongly.
IMMS should just ignore IMMS#hideSoftInput from not-focused client.
As a preparation to fix b/
20764441, this CL partially reverts
Ife3a8733b1a1bf43b195ecf4b8c5082b6538d0a0 but shouldn't have any
user-visible UX regressions.
Bug:
20764441
Change-Id: I60963f1474457ff37cca85e262460dca8105acff
Adam Powell [Wed, 6 May 2015 22:57:09 +0000 (15:57 -0700)]
Move PhoneWindow and friends back into internal package
PhoneWindow, PhoneLayoutInflater and PhoneFallbackEventHandler decided
to @hide out over in the android.view package after the policy jar was
disbanded. Give them a more appropriate home over in framework that
doesn't imply that they should be accessed from other internal layers
of abstraction.
Bug
19606548
Change-Id: Id07b791d178fa447010b49b24726b52208838e88
John Spurlock [Wed, 6 May 2015 22:49:03 +0000 (22:49 +0000)]
Merge "Add setting to mute wireless charging sound." into mnc-dev
Yorke Lee [Wed, 6 May 2015 22:29:18 +0000 (22:29 +0000)]
Merge "Fix potential NPE in TelecomManager.placeCall" into mnc-dev
John Spurlock [Wed, 6 May 2015 21:41:30 +0000 (17:41 -0400)]
Add setting to mute wireless charging sound.
Bug:
19538553
Change-Id: I1af971b35ae9eeb38d8ec38c57b22152095e2725
Nicolas Prevot [Wed, 6 May 2015 22:18:35 +0000 (22:18 +0000)]
Merge "Fetch DISALLOW_CONFIG_VPN for the current user." into mnc-dev
John Reck [Wed, 6 May 2015 22:09:59 +0000 (22:09 +0000)]
Merge "Annotate Application with @CallSuper" into mnc-dev
Jinsuk Kim [Wed, 6 May 2015 22:07:21 +0000 (22:07 +0000)]
Merge "CEC: Reset active source/path before going into standby" into mnc-dev
Matthew Williams [Wed, 6 May 2015 21:46:21 +0000 (21:46 +0000)]
Merge "Delay all syncing until the device is provisioned" into mnc-dev
Raph Levien [Wed, 6 May 2015 21:35:11 +0000 (21:35 +0000)]
Merge "Clear all StaticLayout.Builder fields on pool recycle" into mnc-dev
Raph Levien [Wed, 6 May 2015 21:26:35 +0000 (14:26 -0700)]
Clear all StaticLayout.Builder fields on pool recycle
When returning a StaticLayout.Builder object to the pool, it is
important to clear everything out. If not, then the object may have
stale state from a previous layout operation. This was causing CTS
test failures and probably other mischief.
Bug:
20636917
Change-Id: I76fb20076ee954fcb476131a8fbe8833d72fbc0d
John Spurlock [Wed, 6 May 2015 21:20:30 +0000 (21:20 +0000)]
Merge "Volume a11y: Resize zen footer text when changed." into mnc-dev
John Spurlock [Wed, 6 May 2015 21:20:10 +0000 (21:20 +0000)]
Merge "Volume a11y: Rename introduction 'confirm' button to 'close'." into mnc-dev
Tim Murray [Wed, 6 May 2015 21:19:43 +0000 (21:19 +0000)]
Merge "Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest" into mnc-dev
John Spurlock [Wed, 6 May 2015 21:12:18 +0000 (17:12 -0400)]
Volume a11y: Resize zen footer text when changed.
Bug:
20346315
Change-Id: Ia6af36d856a17639bf27c9a7b4941655d38d2a99
Adam Powell [Wed, 6 May 2015 21:08:37 +0000 (21:08 +0000)]
Merge "Add alternate intents and refinement callbacks to ChooserActivity" into mnc-dev
Ruben Brunk [Wed, 6 May 2015 21:02:35 +0000 (21:02 +0000)]
Merge "Revert "camera: Start/stop preview before clearing surface."" into mnc-dev
Sanket Padawe [Wed, 6 May 2015 20:59:10 +0000 (20:59 +0000)]
Merge "Saved network summary string fixes in Wifi Settings" into mnc-dev
John Spurlock [Wed, 6 May 2015 20:53:21 +0000 (16:53 -0400)]
Volume a11y: Rename introduction 'confirm' button to 'close'.
For the benefit of screen readers.
Bug:
20813824
Change-Id: I776cf75d3c0f2e2d5b67bcbad476a28f9ef37c5f
Tim Murray [Wed, 6 May 2015 19:38:05 +0000 (12:38 -0700)]
Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest
Change-Id: I069a2836cf1405adfd018ba0a058bf8f4a1cd39c
Seigo Nonaka [Wed, 6 May 2015 20:31:18 +0000 (20:31 +0000)]
Merge "Always show auxiliary subtypes from NavBar keyboard icon." into mnc-dev
Seigo Nonaka [Mon, 4 May 2015 20:02:22 +0000 (13:02 -0700)]
Always show auxiliary subtypes from NavBar keyboard icon.
The auxiliary subtypes should be listed if the input method picker is
opened from NavBar keyboard icon. However there is only
IMM#showInputMethodPicker() API to open input method picker and this is
also used from LockScreen or Settings UI. Auxiliary subtypes should not
be listed there(Id7cf5d122). Thus framework shows auxiliary subtypes
based on IMMS#mInputShown and LockScreen state, but it is not a perfect
solution. If a physical keyboard is connected, the soft input may be
gone. As the result, auxiliary subtypes won't be listed even if it is
opened from NavBar keyboard icon.
To fix this issue, this CL introduces IMM#showInputMethodPicker(boolean)
to be able to decide showing auxiliary subtypes by caller.
Note that IMM#showInputMethodPicker(boolean) is still hidden with @hide.
There is no public API change in this CL.
Bug:
20763994
Change-Id: I1e50ee42838a1bf64a612da4904aa93458d44ea4
Adam Powell [Thu, 30 Apr 2015 01:45:04 +0000 (18:45 -0700)]
Add alternate intents and refinement callbacks to ChooserActivity
Allow a calling app to supply an array of additional Intents to the
system ChooserActivity.
The chooser will present a merged list of targets that can handle any
of the Intents supplied, including both the standard EXTRA_INTENT as
well as any of the intents supplied in EXTRA_ALTERNATE_INTENTS. These are
treated as ordered; EXTRA_INTENT is considered the first/primary
Intent and EXTRA_ALTERNATE_INTENTS are sorted most important first.
Targets are queried for all supplied Intents. If the same component is
returned for more than one Intent, the target is associated with the
most important Intent that matched.
This allows calling apps to supply several different payloads for an
action depending on what the intended targets are able to support. For
example, an app performing ACTION_SEND may supply image/jpeg data to
compatible targets or a hosted web link to targets that only support
text/plain. The user will have the opportunity to pick from a single
merged list of choices using the best available payload, and will not
be bothered with the implementation details of how the payload will be
delivered to the recipient.
If the calling app wishes to provide further disambiguation or
refinement after the user makes a choice, for example to let the user
choose which of the source intents to send from the primary or
alternates, show a progress dialog as a full-resolution version of a
photo is downloaded from the server before being sent along or while
reticulating splines, the caller can supply an IntentSender to
ACTION_CHOOSER including the extra EXTRA_REFINEMENT_INTENT_SENDER.
This should be the IntentSender obtained from a PendingIntent pointing
at an activity to launch to perform the refinement.
The refinement activity should report that it is finished by obtaining
the ResultReceiver from EXTRA_RESULT_RECEIVER. Available intents to
send to the selected target will be contained in EXTRA_INTENT and
EXTRA_ALTERNATE_INTENTS.
To complete the refinement and send the result along to the chosen
target, the refinement activity should select one of the supplied
intents and send it to the ResultReceiver in a Bundle with the key
EXTRA_INTENT and the result code RESULT_OK. To cancel the refinement,
and let the user select another choice, send RESULT_CANCEL.
While refinement activities cannot modify the filterEquals-affecting
fields of the Intent they return, they may modify extras to provide
additional or altered details to the final recipient. These extras
will be filled into the Intent sent to the final target.
Change-Id: I7ad4739eadd1a0e307675847ccf47ea948918a3a
Christopher Tate [Wed, 6 May 2015 19:41:39 +0000 (19:41 +0000)]
Merge "Fix requestRestore() of an app's own package" into mnc-dev
Jason Sams [Wed, 6 May 2015 19:40:20 +0000 (19:40 +0000)]
Merge "Fix Allocation-less launches" into mnc-dev
Tim Murray [Wed, 6 May 2015 19:31:47 +0000 (19:31 +0000)]
Merge "Add loop option to hwuitest." into mnc-dev
Christopher Tate [Wed, 6 May 2015 19:31:46 +0000 (12:31 -0700)]
Fix requestRestore() of an app's own package
The BACKUP permission check was being applied over-zealously.
Bug
19336200
Change-Id: Ia52b5c5cc0fd8d19b74ee624be85113d1b8dca7e
Tim Murray [Wed, 6 May 2015 18:37:37 +0000 (11:37 -0700)]
Add loop option to hwuitest.
Change-Id: I15b6b121bd6bd963e5b433bdd93d6dc3e83645b8
Chris Wren [Wed, 6 May 2015 18:34:46 +0000 (18:34 +0000)]
Merge "count panel open method" into mnc-dev
Matthew Williams [Mon, 4 May 2015 01:16:25 +0000 (18:16 -0700)]
Delay all syncing until the device is provisioned
BUG:
20185340
Add ContentObserver to be notified when device provisioned
system setting bit is flipped. Stash all messages that come
along before then, similar to how we were doing it for
onBootCompleted, and fire them off when ready.
Change-Id: Ied9fe2262b2a96ea3316b6dd7c57e23628e19581
Eric Laurent [Wed, 6 May 2015 17:51:52 +0000 (17:51 +0000)]
Merge "Implement audio routing callbacks" into mnc-dev
Alex Klyubin [Wed, 6 May 2015 17:26:07 +0000 (17:26 +0000)]
Merge "Keystore uses 0 for invalid operation handles." into mnc-dev
Alan Viverette [Wed, 6 May 2015 17:25:25 +0000 (17:25 +0000)]
Merge "DayNight theme for framework packages" into mnc-dev
Alan Viverette [Wed, 6 May 2015 17:24:29 +0000 (17:24 +0000)]
Merge "ListPopupWindow should use window layout type SUB_PANEL" into mnc-dev
Jeff Tinker [Wed, 6 May 2015 17:22:33 +0000 (17:22 +0000)]
Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-dev
Alex Klyubin [Wed, 6 May 2015 17:16:57 +0000 (10:16 -0700)]
Keystore uses 0 for invalid operation handles.
This propagates the concept that 0 is an invalid crypto operation
handle to the outside of AndroidKeyStore abstraction.
Bug:
20864436
Change-Id: I1e5abb66c5d41d8fc32aac44372495a708c2b6e2
Alan Viverette [Wed, 6 May 2015 17:11:23 +0000 (17:11 +0000)]
Merge "Add scroll indicators on View, use in AlertDialog" into mnc-dev
Alan Viverette [Wed, 6 May 2015 00:18:27 +0000 (17:18 -0700)]
Add scroll indicators on View, use in AlertDialog
Also updates default fade duration for scrollbars to match Material
spec and moves around some padding in AlertDialog so that scrolling
text and list items aren't so close to the title.
Bug:
19098033
Change-Id: I40dca6a931480c4c48463e3ea5b8361534cbd8d7
Eric Laurent [Fri, 1 May 2015 18:37:49 +0000 (11:37 -0700)]
Implement audio routing callbacks
Implement JNI for AudioTrack and AudioRecord routing
callbacks:
- Added files core/jni/android_media_DeviceCallback.cpp/.h
for JNI callback implementation used by both AudioTrack
and AudioRecord.
- Made AudioManager AudioPort and AudioPatch methods static
in order to call them without context.
Also added IO handle information to AudioMixPort.
Change-Id: Icee182aa68310d4b12fd1469f48e78110889acf1
Alan Viverette [Wed, 6 May 2015 16:58:08 +0000 (16:58 +0000)]
Merge "Fix setting hotspot bounds in a drawable container" into mnc-dev
Chris Wren [Fri, 1 May 2015 20:12:12 +0000 (16:12 -0400)]
count panel open method
open panel
open with two fingers
open via peek
pull down to open QS
tap to open QS
Bug:
20262922
Change-Id: I7eaa8a6de75867035c64a3ac939cec86daaab913
Alexander Martinz [Tue, 5 May 2015 22:44:24 +0000 (00:44 +0200)]
Fix setting hotspot bounds in a drawable container
We are passing the wrong parameters for setting hotspot bounds.
Bottom and right are in the wrong order, correct it.
Change-Id: I2762fc3a4c29f05ba8b7e71a5c6cad0be16c2ae0
John Reck [Wed, 6 May 2015 16:44:53 +0000 (09:44 -0700)]
Annotate Application with @CallSuper
Bug:
19844784
Change-Id: I12431ed65edd0076e1231ba6ebcff479580370c4
John Spurlock [Wed, 6 May 2015 16:21:58 +0000 (16:21 +0000)]
Merge "Zen: Calendar tracker should use event availability." into mnc-dev
Tyler Gunn [Wed, 6 May 2015 16:01:29 +0000 (16:01 +0000)]
Merge "Change sendSessionModifyRequest VideoProvider API signature." into mnc-dev
Tyler Gunn [Wed, 6 May 2015 15:52:27 +0000 (08:52 -0700)]
Change sendSessionModifyRequest VideoProvider API signature.
Including a fromProfile in addition to the requestedProfile.
- Changed VideoCallImpl to generate the fromVideoProfile based on the
call's current videoState. This ensures the InCall UI only needs to
pass in the new video profile; the VideoCall Impl already has enough
knowledge to generate the fromProfile.
- Changed VideoCallImpl to track the current videoQuality, which forms
a part of the fromVideoProfile.
Bug:
20704229
Change-Id: I89f293f03a2b13fc8c1dcfd8a07ab8640d3950e0
John Spurlock [Wed, 6 May 2015 15:36:19 +0000 (11:36 -0400)]
Zen: Calendar tracker should use event availability.
- Ignore events that are marked as availability=free for consideration
as DND trigger events. All-day events are conventionally marked
as free by default.
Bug:
20064962
Change-Id: Ie26c81a6b79bdd86444092886f9bc123470575a7
Benjamin Franz [Wed, 6 May 2015 15:16:18 +0000 (15:16 +0000)]
Merge "Rename functions that disable status bar and keyguard" into mnc-dev
Brian Colonna [Wed, 6 May 2015 14:37:22 +0000 (14:37 +0000)]
Merge "Removed unused Face Unlock string" into mnc-dev
Benjamin Franz [Wed, 6 May 2015 11:14:31 +0000 (12:14 +0100)]
Rename functions that disable status bar and keyguard
Rename the DevicePolicyManager functions setKeyguardEnabledState and
setStatusBarEnabledState to setKeyguardDisabled and
setStatusBarDisabled respectively.
Bug:
20820039
Change-Id: I06f6a19ac55b24e66e9f2cb340ead5d940cb2235
Clara Bayarri [Wed, 6 May 2015 09:10:24 +0000 (09:10 +0000)]
Merge "Allow Floating ActionModes in SearchDialog." into mnc-dev
Alan Viverette [Wed, 6 May 2015 03:55:37 +0000 (03:55 +0000)]
Merge "Fix checkbox animation end colors" into mnc-dev
Sanket Padawe [Wed, 6 May 2015 03:10:46 +0000 (20:10 -0700)]
Saved network summary string fixes in Wifi Settings
Bug:
20667217
Change-Id: Ife1b1e7da3270020ef405693252a9e8a1ea5a6ca
Adam Lesinski [Wed, 6 May 2015 02:21:15 +0000 (02:21 +0000)]
Merge "Fix overcounting of mobile radio" into mnc-dev
Adam Lesinski [Wed, 6 May 2015 02:19:00 +0000 (19:19 -0700)]
Fix overcounting of mobile radio
Bug:
20438089
Change-Id: Ie8987cf61ef7a0cecab6d730eed7bc47eabb9eec
Rich Slogar [Wed, 6 May 2015 01:24:46 +0000 (01:24 +0000)]
am
34e0f640: am
84a67c7d: am
1b5f692d: am
9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
* commit '
34e0f6401e66df33ec71df7f76196bbe0eca3183':
docs: gradle multidex update
Rich Slogar [Wed, 6 May 2015 01:24:41 +0000 (01:24 +0000)]
am
b462da9e: am
f0ea8f9f: am
f77d64dc: am
2f14c38f: Merge "docs: overview link to release notes" into lmp-docs
* commit '
b462da9e3d554deb9ba5b8ca58d5d66797fb54d5':
docs: overview link to release notes
Rich Slogar [Wed, 6 May 2015 01:24:33 +0000 (01:24 +0000)]
am
48ea7762: am
7e33aa48: am
96d00bb6: am
37ca7773: Merge "docs: translation editor update" into lmp-docs
* commit '
48ea7762295cdf3e2bd61dafd55422a0d6bee5e6':
docs: translation editor update
Rich Slogar [Wed, 6 May 2015 01:24:27 +0000 (01:24 +0000)]
am
cc4a2980: am
ffef3b76: am
39b51b49: am
2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
* commit '
cc4a29807e679a1691a949c117f540867304acc7':
docs: memory monitor duplicate paragraph
Rich Slogar [Wed, 6 May 2015 01:14:31 +0000 (01:14 +0000)]
am
84a67c7d: am
1b5f692d: am
9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
* commit '
84a67c7db75edc192a8975637c99c9a917796ff1':
docs: gradle multidex update
Rich Slogar [Wed, 6 May 2015 01:14:26 +0000 (01:14 +0000)]
am
f0ea8f9f: am
f77d64dc: am
2f14c38f: Merge "docs: overview link to release notes" into lmp-docs
* commit '
f0ea8f9f1e1ede23f954cade5ee4a84e92d28943':
docs: overview link to release notes
Rich Slogar [Wed, 6 May 2015 01:14:21 +0000 (01:14 +0000)]
am
7e33aa48: am
96d00bb6: am
37ca7773: Merge "docs: translation editor update" into lmp-docs
* commit '
7e33aa4843edbc037659023cff98dd44ac90d44c':
docs: translation editor update
Rich Slogar [Wed, 6 May 2015 01:14:08 +0000 (01:14 +0000)]
am
ffef3b76: am
39b51b49: am
2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
* commit '
ffef3b76762ae32c3a6fca00fa9cbdd1230f6f83':
docs: memory monitor duplicate paragraph