OSDN Git Service
Nathan Harold [Wed, 17 Feb 2016 01:24:47 +0000 (01:24 +0000)]
Merge "Create BandMode Constants" into mm-wireless-dev am:
e629c06730
am:
56ea73f26e
* commit '
56ea73f26ebf1f3e25267544d94a475c5fae3e14':
Create BandMode Constants
Chong Zhang [Wed, 17 Feb 2016 01:23:11 +0000 (01:23 +0000)]
Merge "Clear mPendingScreenOff and stop color fade animiation if screen is on" into nyc-dev
am:
a02f168525
* commit '
a02f168525a78e58def8e55f655e50b0dbaaeb55':
Clear mPendingScreenOff and stop color fade animiation if screen is on
Felipe Leme [Wed, 17 Feb 2016 01:21:35 +0000 (01:21 +0000)]
Merge "Added option to check if an app is whitelisted for deviceidle." into nyc-dev
am:
cd6cd0064e
* commit '
cd6cd0064e8829830095c54a9d92714d70f6bd94':
Added option to check if an app is whitelisted for deviceidle.
Felipe Leme [Wed, 17 Feb 2016 01:20:33 +0000 (01:20 +0000)]
Merge "Added extra check to avoid NPE if package does not exist." into nyc-dev
am:
2b5087b381
* commit '
2b5087b381ee6417e9c6a146c75931c154129a57':
Added extra check to avoid NPE if package does not exist.
Nathan Harold [Wed, 17 Feb 2016 00:52:29 +0000 (00:52 +0000)]
Merge "Create BandMode Constants" into mm-wireless-dev
am:
e629c06730
* commit '
e629c067308964659a5886921642920cd2e1f2f4':
Create BandMode Constants
Chong Zhang [Wed, 17 Feb 2016 00:47:40 +0000 (00:47 +0000)]
Merge "Clear mPendingScreenOff and stop color fade animiation if screen is on" into nyc-dev
Felipe Leme [Wed, 17 Feb 2016 00:46:36 +0000 (00:46 +0000)]
Merge "Added option to check if an app is whitelisted for deviceidle." into nyc-dev
Felipe Leme [Wed, 17 Feb 2016 00:46:14 +0000 (00:46 +0000)]
Merge "Added extra check to avoid NPE if package does not exist." into nyc-dev
Nathan Harold [Wed, 17 Feb 2016 00:44:12 +0000 (00:44 +0000)]
Merge "Create BandMode Constants" into mm-wireless-dev
Chong Zhang [Wed, 17 Feb 2016 00:31:48 +0000 (16:31 -0800)]
Clear mPendingScreenOff and stop color fade animiation if screen is on
bug:
24116819
Change-Id: I4a962878001b00daf5473d90cbd257ac318c0446
Felipe Leme [Wed, 17 Feb 2016 00:26:05 +0000 (16:26 -0800)]
Added extra check to avoid NPE if package does not exist.
BUG:
26685616
Change-Id: I244e479fd9668bc4f07b8797ce2fc1e1df7a4d28
Doris Liu [Wed, 17 Feb 2016 00:16:51 +0000 (00:16 +0000)]
Merge "Check RenderNode\'s owning view before attaching animators" into nyc-dev
am:
e6e57a9d51
* commit '
e6e57a9d5175b6e5c874317b232652f481b6f4a4':
Check RenderNode's owning view before attaching animators
Doris Liu [Wed, 17 Feb 2016 00:07:06 +0000 (00:07 +0000)]
Merge "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY""" into nyc-dev
am:
5b49c6f31b
* commit '
5b49c6f31bce6b5ac250178ce004c21d50a48819':
Revert "Revert "VectorDrawable native rendering - Step 5 of MANY""
Keisuke Kuroyanagi [Tue, 16 Feb 2016 23:57:49 +0000 (23:57 +0000)]
Merge "Make scrollbar draggable only when it\'s visible." into nyc-dev
am:
f19e3434f8
* commit '
f19e3434f80977d6f8313a2057bca161c4f777c5':
Make scrollbar draggable only when it's visible.
Doris Liu [Tue, 16 Feb 2016 23:38:56 +0000 (23:38 +0000)]
Merge "Check RenderNode's owning view before attaching animators" into nyc-dev
Doris Liu [Tue, 16 Feb 2016 23:38:42 +0000 (23:38 +0000)]
Merge "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY""" into nyc-dev
Keisuke Kuroyanagi [Tue, 16 Feb 2016 23:26:31 +0000 (23:26 +0000)]
Merge "Make scrollbar draggable only when it's visible." into nyc-dev
Sami Tolvanen [Tue, 16 Feb 2016 23:15:46 +0000 (15:15 -0800)]
resolve merge conflicts of
dcc79d83cb to nyc-dev-plus-aosp
Change-Id: I9694d443db9ddfe7b44ffb13dd922fbc233876b4
Siyamed Sinir [Tue, 16 Feb 2016 22:45:28 +0000 (22:45 +0000)]
Merge "Ellipsized and Non-ellipsized baselines should be same." into nyc-dev
am:
afe3cd1aaf
* commit '
afe3cd1aaf71e01b78097be57bf5a2aae266be07':
Ellipsized and Non-ellipsized baselines should be same.
Siyamed Sinir [Tue, 16 Feb 2016 22:37:53 +0000 (22:37 +0000)]
Merge "Ellipsized and Non-ellipsized baselines should be same." into nyc-dev
Wale Ogunwale [Tue, 16 Feb 2016 22:37:41 +0000 (22:37 +0000)]
Merge changes from topic \'flaky-test\' into nyc-dev
am:
5a21494d6e
* commit '
5a21494d6eafce44adc95e1bf2a67658fa752196':
Fixed issue with losing window name when copying WindowManager.LayoutParams
Added AM API to remove a stack
Don't resume activity on start if there are activities pausing.
Wale Ogunwale [Tue, 16 Feb 2016 22:32:22 +0000 (22:32 +0000)]
Merge changes from topic 'flaky-test' into nyc-dev
* changes:
Fixed issue with losing window name when copying WindowManager.LayoutParams
Added AM API to remove a stack
Don't resume activity on start if there are activities pausing.
Selim Gurun [Tue, 16 Feb 2016 22:29:58 +0000 (22:29 +0000)]
Merge "Better document the ignore behavior for client cert api" into nyc-dev
am:
e542c490e1
* commit '
e542c490e1072cf02f9ae890faea079dea4e030e':
Better document the ignore behavior for client cert api
Doris Liu [Fri, 12 Feb 2016 04:08:10 +0000 (20:08 -0800)]
Check RenderNode's owning view before attaching animators
-Only add animators to a RenderNode when its owning view is attached
-When changing animator's target RenderNode, remove the animator from
the old target RenderNode that it's currently running on, if any.
Bug:
27141983
Bug:
27145149
Change-Id: I9c9592382d64ecc0390f7ec743a59ce1ad7d9798
Selim Gurun [Tue, 16 Feb 2016 22:17:41 +0000 (22:17 +0000)]
Merge "Better document the ignore behavior for client cert api" into nyc-dev
George Mount [Tue, 16 Feb 2016 21:53:49 +0000 (21:53 +0000)]
Merge "Fix TransitionSet javadoc to use transitionOrdering attribute." into nyc-dev
am:
c47738d8c2
* commit '
c47738d8c22ae09cd93096888def0cf33f39d285':
Fix TransitionSet javadoc to use transitionOrdering attribute.
George Mount [Tue, 16 Feb 2016 21:52:38 +0000 (21:52 +0000)]
Merge "Don\'t use forceVisibility for Activity Transitions." into nyc-dev
am:
d6505566a9
* commit '
d6505566a9bc606e84619a7b7a801557e795f1df':
Don't use forceVisibility for Activity Transitions.
Sami Tolvanen [Tue, 16 Feb 2016 21:52:13 +0000 (21:52 +0000)]
Merge "Support persist.sys.audit_safemode"
George Mount [Tue, 16 Feb 2016 21:38:01 +0000 (21:38 +0000)]
Merge "Fix TransitionSet javadoc to use transitionOrdering attribute." into nyc-dev
George Mount [Tue, 16 Feb 2016 21:37:39 +0000 (21:37 +0000)]
Merge "Don't use forceVisibility for Activity Transitions." into nyc-dev
Jason Monk [Tue, 16 Feb 2016 21:32:00 +0000 (21:32 +0000)]
Merge "Battery graph in QS Detail" into nyc-dev
am:
c18766d065
* commit '
c18766d065152ee6c5870a9809b35577f71ed8e1':
Battery graph in QS Detail
Jason Monk [Tue, 16 Feb 2016 21:26:24 +0000 (21:26 +0000)]
Merge "Battery graph in QS Detail" into nyc-dev
Jason Monk [Thu, 11 Feb 2016 16:33:09 +0000 (11:33 -0500)]
Battery graph in QS Detail
Add new usage graph view to SettingsLib that shows usage with
same labels and whatnot.
Use that graph in the battery detail panel to show more stuffs.
Change-Id: I397b1314f65f668df566e93bdbc15420e1b3a280
Andreas Gampe [Tue, 16 Feb 2016 20:59:24 +0000 (20:59 +0000)]
Merge "Frameworks/base: Fix registration function"
am:
a1e8ceb50b
* commit '
a1e8ceb50bdd0598b400b1cbda523ff329fa8b1e':
Frameworks/base: Fix registration function
Svetoslav Ganov [Tue, 16 Feb 2016 20:54:45 +0000 (20:54 +0000)]
Fail fast when trying to delete a non-existing pacakge.
am:
415dd94ae5
* commit '
415dd94ae5c71aaef62b66463724544b44b1f41f':
Fail fast when trying to delete a non-existing pacakge.
Makoto Onuki [Tue, 16 Feb 2016 20:53:03 +0000 (20:53 +0000)]
Merge "Don\'t allow deactivating DAs when the user is not unlocked" into nyc-dev
am:
dafec11e69
* commit '
dafec11e698daf054730cfb04db64f3e31a0c9ff':
Don't allow deactivating DAs when the user is not unlocked
Svetoslav Ganov [Thu, 11 Feb 2016 16:50:43 +0000 (08:50 -0800)]
Fail fast when trying to delete a non-existing pacakge.
bug:
26921392
Change-Id: I518cc43f3b1b28bd239093feead46107c62eb419
Makoto Onuki [Tue, 16 Feb 2016 20:47:09 +0000 (20:47 +0000)]
Merge "Don't allow deactivating DAs when the user is not unlocked" into nyc-dev
Andreas Gampe [Tue, 16 Feb 2016 20:41:30 +0000 (20:41 +0000)]
Merge "Frameworks/base: Fix registration function"
Selim Gurun [Tue, 16 Feb 2016 20:30:08 +0000 (12:30 -0800)]
Better document the ignore behavior for client cert api
Bug:
26361557
When the embedded app requests a ignore of a client cert request,
webview does not cache the response of the app. However, underlying
layers could. Clarify the document.
Change-Id: I43e6a4c91727f71c88ca69e1334f64de9f66905a
Andreas Gampe [Tue, 16 Feb 2016 19:57:55 +0000 (19:57 +0000)]
Merge "Frameworks/base: Fix registration function" into nyc-dev
am:
61def3e435
* commit '
61def3e43537599204290447d57967a37eef0fa4':
Frameworks/base: Fix registration function
Andreas Gampe [Tue, 16 Feb 2016 18:09:31 +0000 (10:09 -0800)]
Frameworks/base: Fix registration function
Registration functions return "int."
(cherry picked from commit
faa1033dc7d6b1ea6c17a483e586eaa167d154f9)
Change-Id: Icb8d35f3bc23794cdb22db1c1adda236c9d8676e
Andreas Gampe [Tue, 16 Feb 2016 19:47:31 +0000 (19:47 +0000)]
Merge "Frameworks/base: Fix registration function" into nyc-dev
Esteban Talavera [Tue, 16 Feb 2016 19:37:45 +0000 (19:37 +0000)]
Merge "Let admin disable fingerprint for the work challenge" into nyc-dev
am:
f79c887c59
* commit '
f79c887c5997f4a7735987a524869421a1a3ac2d':
Let admin disable fingerprint for the work challenge
Esteban Talavera [Tue, 16 Feb 2016 19:29:06 +0000 (19:29 +0000)]
Merge "Let admin disable fingerprint for the work challenge" into nyc-dev
Alan Viverette [Tue, 16 Feb 2016 19:11:53 +0000 (19:11 +0000)]
Merge "Force uniform width for MATCH_PARENT in AlertDialogLayout" into nyc-dev
am:
f8872b0a37
* commit '
f8872b0a37024c78dbfcf6f19d63c9555eec4709':
Force uniform width for MATCH_PARENT in AlertDialogLayout
Leon Scroggins [Tue, 16 Feb 2016 19:10:43 +0000 (19:10 +0000)]
Merge "Clean up some Skia includes" into nyc-dev
am:
5ef5e0faf0
* commit '
5ef5e0faf07469d716175896428b4e796fdbfed9':
Clean up some Skia includes
Alan Viverette [Tue, 16 Feb 2016 19:05:59 +0000 (19:05 +0000)]
Merge "Force uniform width for MATCH_PARENT in AlertDialogLayout" into nyc-dev
Robin Lee [Tue, 16 Feb 2016 19:04:35 +0000 (19:04 +0000)]
Merge "Auto-call prepare() for new always-on VPNs" into nyc-dev
am:
e154bed3b9
* commit '
e154bed3b9449f2d452c08396788fee3a0eb4055':
Auto-call prepare() for new always-on VPNs
Leon Scroggins [Tue, 16 Feb 2016 19:02:45 +0000 (19:02 +0000)]
Merge "Clean up some Skia includes" into nyc-dev
Robin Lee [Tue, 16 Feb 2016 18:56:52 +0000 (18:56 +0000)]
Merge "Auto-call prepare() for new always-on VPNs" into nyc-dev
Adam Lesinski [Tue, 16 Feb 2016 18:44:19 +0000 (18:44 +0000)]
Merge "Fix up some small resource issues" into nyc-dev
am:
e4735a9959
* commit '
e4735a99598bf29847a9f12dd7fae6d7df880bc4':
Fix up some small resource issues
Andreas Gampe [Tue, 16 Feb 2016 18:09:31 +0000 (10:09 -0800)]
Frameworks/base: Fix registration function
Registration functions return "int."
Change-Id: Icb8d35f3bc23794cdb22db1c1adda236c9d8676e
Aga Wronska [Tue, 16 Feb 2016 18:37:49 +0000 (18:37 +0000)]
Merge "Fix focus issues in directory fragment * Empty directory view gets focus when shown * Skip opening drawer when showing empty search results * Fix typo" into nyc-dev
am:
f9b78bb69d
* commit '
f9b78bb69db70a7b10d38ed958baf24ba96d1380':
Fix focus issues in directory fragment * Empty directory view gets focus when shown * Skip opening drawer when showing empty search results * Fix typo
Adam Lesinski [Tue, 16 Feb 2016 18:34:27 +0000 (18:34 +0000)]
Merge "Fix up some small resource issues" into nyc-dev
Aga Wronska [Tue, 16 Feb 2016 18:29:49 +0000 (18:29 +0000)]
Merge "Fix focus issues in directory fragment * Empty directory view gets focus when shown * Skip opening drawer when showing empty search results * Fix typo" into nyc-dev
Peter Qiu [Tue, 16 Feb 2016 18:26:06 +0000 (18:26 +0000)]
Merge "WifiConfiguration: add constants for radio band" into mm-wireless-dev am:
03d7581cf6
am:
b3f9ee0d5a
* commit '
b3f9ee0d5a1c0a45d957a6e50f4ada3a8e3592dd':
WifiConfiguration: add constants for radio band
Aga Wronska [Fri, 12 Feb 2016 17:15:32 +0000 (09:15 -0800)]
Fix focus issues in directory fragment
* Empty directory view gets focus when shown
* Skip opening drawer when showing empty search results
* Fix typo
Bug:
27109140
Change-Id: Ie62d48e1c3f78e5244d88067587b3e5986f99a03
Peter Qiu [Tue, 16 Feb 2016 18:14:42 +0000 (18:14 +0000)]
Merge "WifiConfiguration: add constants for radio band" into mm-wireless-dev
am:
03d7581cf6
* commit '
03d7581cf6dcc8072fe22c834513593a46fcf93b':
WifiConfiguration: add constants for radio band
Wale Ogunwale [Mon, 15 Feb 2016 16:28:47 +0000 (08:28 -0800)]
Fixed issue with losing window name when copying WindowManager.LayoutParams
It is possible for the WindowManager.LayoutParams set from a view/window on
the client side not to have the LayoutParams.mTitle set. This is normally
not an issue as we later set it to the package name before passing the
LayoutParams to window manager. However, we rely on the full window name
in order to identify unique windows during CTS hostside tests. We now
retain the current LayoutParams.mTitle if the LayoutParams we are copying
form didn't set one.
Bug:
26982752
Change-Id: Icc3c5937391ed1646c3777921c6f61c27ebec05d
Wale Ogunwale [Fri, 12 Feb 2016 20:56:32 +0000 (12:56 -0800)]
Added AM API to remove a stack
Use the new API when closing Pip.
Bug:
26982752
Change-Id: I074d23b5535a4534626183ab77142d3932a803f0
Wale Ogunwale [Fri, 12 Feb 2016 20:22:19 +0000 (12:22 -0800)]
Don't resume activity on start if there are activities pausing.
The path to start an activity if it isn't running was unconditionally
resuming the starting activity which we don't do if there are activities
pausing. It now starts the activity in a paused state if other activities
are pausing. It is then resumed when pause completes.
Also, improved logging in BoundsAnimationController and removed some
disabled code that has been in the codebase for 6yrs...
Bug:
26982752
Change-Id: Ie042fc938331127f1270fca1b5905b067b9dae7c
Alan Viverette [Tue, 16 Feb 2016 17:53:36 +0000 (12:53 -0500)]
Force uniform width for MATCH_PARENT in AlertDialogLayout
The initial layout passes run using whatever was specified by the
parent, which ensures that TOO_SMALL will get set correctly when
needed. The final layout pass runs as EXACTLY to ensure that
MATCH_PARENT widths are correctly set.
Bug:
27030200
Change-Id: Ia7af3f75746e725761e78e7c4eefb0b31f499113
Peter Qiu [Tue, 16 Feb 2016 18:04:13 +0000 (18:04 +0000)]
Merge "WifiConfiguration: add constants for radio band" into mm-wireless-dev
Wale Ogunwale [Tue, 16 Feb 2016 18:00:24 +0000 (18:00 +0000)]
Merge "Force resize pre-N apps that don\'t have fixed orientation." into nyc-dev
am:
b305e16051
* commit '
b305e16051192540e2e19863d4c3c0fb3e980db2':
Force resize pre-N apps that don't have fixed orientation.
Wale Ogunwale [Tue, 16 Feb 2016 17:54:32 +0000 (17:54 +0000)]
Merge "Force resize pre-N apps that don't have fixed orientation." into nyc-dev
Winson Chung [Tue, 16 Feb 2016 17:39:12 +0000 (17:39 +0000)]
Merge "Adding null check for invalid activity" into nyc-dev
am:
bc56ca34aa
* commit '
bc56ca34aaa02bc4c1f83d0aad621a1eef45aab8':
Adding null check for invalid activity
Winson Chung [Tue, 16 Feb 2016 17:32:35 +0000 (17:32 +0000)]
Merge "Adding null check for invalid activity" into nyc-dev
Dongwon Kang [Tue, 16 Feb 2016 17:32:36 +0000 (17:32 +0000)]
Merge "TIF: Unhide TvInputInfo.isHidden/loadCustomLabel" into nyc-dev
am:
8da2bf4946
* commit '
8da2bf49467f026da70a94d7cdf01b84d80bd07a':
TIF: Unhide TvInputInfo.isHidden/loadCustomLabel
Winson [Tue, 16 Feb 2016 17:28:54 +0000 (09:28 -0800)]
Adding null check for invalid activity
Bug:
24569398
Change-Id: I509bacaab810407a3d4b44781f698b5c76a6af8a
Dongwon Kang [Tue, 16 Feb 2016 17:22:07 +0000 (17:22 +0000)]
Merge "TIF: Unhide TvInputInfo.isHidden/loadCustomLabel" into nyc-dev
Jaewan Kim [Tue, 16 Feb 2016 17:18:37 +0000 (17:18 +0000)]
Merge "Revert "PIP: Use long press HOME for PIP on Android TV (2/2)"" into nyc-dev
am:
c3e78d5e62
* commit '
c3e78d5e6297ddb41bf73a0c0985005315d7949b':
Revert "PIP: Use long press HOME for PIP on Android TV (2/2)"
Jaewan Kim [Tue, 16 Feb 2016 17:11:57 +0000 (17:11 +0000)]
Merge "Revert "PIP: Use long press HOME for PIP on Android TV (2/2)"" into nyc-dev
Jaewan Kim [Fri, 12 Feb 2016 10:01:02 +0000 (19:01 +0900)]
Revert "PIP: Use long press HOME for PIP on Android TV (2/2)"
Long press HOME will launch recents instead.
Bug:
27159966
Change-Id: I9a4fd847d716d7e4e4754c7a9c48628c46f82233
Jeff Sharkey [Tue, 16 Feb 2016 17:02:16 +0000 (17:02 +0000)]
Merge "More protected broadcasts." into nyc-dev
am:
82a6017fc5
* commit '
82a6017fc5fc4e5cc134e02011871135d24a8b02':
More protected broadcasts.
Jeff Sharkey [Tue, 16 Feb 2016 17:00:06 +0000 (17:00 +0000)]
Merge "Disable StrictMode when starting activity." into nyc-dev
am:
a3331309a9
* commit '
a3331309a9f29cf4e3676b1a6a230148eaf04fe1':
Disable StrictMode when starting activity.
Tao Bao [Tue, 16 Feb 2016 16:58:31 +0000 (16:58 +0000)]
Merge "BootReceiver: Stop using SharedPreferences." into nyc-dev
am:
1256ab6734
* commit '
1256ab67349e88bb985900b986a3833fae2dab18':
BootReceiver: Stop using SharedPreferences.
Jeff Sharkey [Tue, 16 Feb 2016 16:48:29 +0000 (16:48 +0000)]
Merge "More protected broadcasts." into nyc-dev
Jeff Sharkey [Tue, 16 Feb 2016 16:47:47 +0000 (16:47 +0000)]
Merge "Disable StrictMode when starting activity." into nyc-dev
Tao Bao [Tue, 16 Feb 2016 16:46:53 +0000 (16:46 +0000)]
Merge "BootReceiver: Stop using SharedPreferences." into nyc-dev
Jeff Sharkey [Tue, 16 Feb 2016 16:41:54 +0000 (09:41 -0700)]
More protected broadcasts.
These actions are owned by the system and should not be sent by
third-party apps for security reasons.
Bug:
27171917,
27169730,
27172357,
27163393
Change-Id: I3161cd3c1c37d26a92723b22878dc5aef6f30c47
Leon Scroggins III [Tue, 16 Feb 2016 15:20:11 +0000 (10:20 -0500)]
Clean up some Skia includes
Neither of these files need SkScalerContext.h. Remove those includes.
One really needs SkGlyph.h, so include it instead.
Change-Id: Ic7cfce9e7784c9290c5a2dfdd8385b65d32f9b76
Rubin Xu [Tue, 16 Feb 2016 16:25:10 +0000 (16:25 +0000)]
Merge "Initialize mTiles before constructing AutoTileManager" into nyc-dev
am:
5db2f16f15
* commit '
5db2f16f15549c490c9541602a96f42bef984acb':
Initialize mTiles before constructing AutoTileManager
Yohei Yukawa [Tue, 16 Feb 2016 16:24:04 +0000 (16:24 +0000)]
Merge changes I0f79243e,Ia27e19f9,Iec6b89f0,I276c7eb0 into nyc-dev
am:
ce3f338040
* commit '
ce3f338040894f23cdea7ac2f9e9e14a58fd15a3':
Have unified setter/getter for Secure Settings.
Remove redundant arguments.
Use Context#getSystemService(Class<T>) in IMMS.
Use Java7 diamond operator in InputMethodUtils.
Jeff Sharkey [Tue, 16 Feb 2016 16:21:51 +0000 (09:21 -0700)]
Disable StrictMode when starting activity.
Since intents can come in from older apps, don't let them crash us
by including file:// Uris. This narrows the relaxation to only apply
when starting the requested intent.
Bug:
27070755
Change-Id: Ifcf9068424e072f52758c8feeab5fbf23d678a2e
Rubin Xu [Tue, 16 Feb 2016 16:12:44 +0000 (16:12 +0000)]
Merge "Initialize mTiles before constructing AutoTileManager" into nyc-dev
Yohei Yukawa [Tue, 16 Feb 2016 16:11:49 +0000 (16:11 +0000)]
Merge changes I0f79243e,Ia27e19f9,Iec6b89f0,I276c7eb0 into nyc-dev
* changes:
Have unified setter/getter for Secure Settings.
Remove redundant arguments.
Use Context#getSystemService(Class<T>) in IMMS.
Use Java7 diamond operator in InputMethodUtils.
Jason Monk [Tue, 16 Feb 2016 15:45:18 +0000 (15:45 +0000)]
Merge "Add missing cast tile" into nyc-dev
am:
d6b6e9c2ef
* commit '
d6b6e9c2efd3454b2ab047a506ce925e45ea75a0':
Add missing cast tile
Jason Monk [Tue, 16 Feb 2016 15:40:47 +0000 (15:40 +0000)]
Merge "Add missing cast tile" into nyc-dev
Jason Monk [Tue, 16 Feb 2016 15:39:04 +0000 (10:39 -0500)]
Add missing cast tile
Bug:
27061481
Change-Id: Icf037b199c382096d2145a7b3a169be2f6079e54
George Mount [Tue, 16 Feb 2016 15:26:51 +0000 (15:26 +0000)]
Merge "Null check for fade start alpha value." into nyc-dev
am:
21eb4e2684
* commit '
21eb4e2684e8490deedab002dd2b867b6d35147a':
Null check for fade start alpha value.
George Mount [Tue, 16 Feb 2016 15:25:16 +0000 (15:25 +0000)]
Merge "Set the hover state to the same as focus state in RippleDrawable." into nyc-dev
am:
d86d3fd768
* commit '
d86d3fd7689676bf18710cfb4d9cb2a6c76b0128':
Set the hover state to the same as focus state in RippleDrawable.
George Mount [Tue, 16 Feb 2016 15:20:42 +0000 (15:20 +0000)]
Merge "Null check for fade start alpha value." into nyc-dev
George Mount [Tue, 16 Feb 2016 15:19:03 +0000 (15:19 +0000)]
Merge "Set the hover state to the same as focus state in RippleDrawable." into nyc-dev
Neil Fuller [Tue, 16 Feb 2016 15:12:31 +0000 (15:12 +0000)]
Merge "Fix a compilation error due to 1.8 type inference differences" into nyc-dev
am:
5393a6605f
* commit '
5393a6605f0ffd7f5e1e7e080c414096d6b0db2a':
Fix a compilation error due to 1.8 type inference differences
Jason Monk [Tue, 16 Feb 2016 15:11:20 +0000 (15:11 +0000)]
Merge "Fix RTL in Nav Bar" into nyc-dev
am:
087ba40044
* commit '
087ba4004494f287d78074ba62583ca012629c7d':
Fix RTL in Nav Bar
Shreyas Basarge [Tue, 16 Feb 2016 15:05:20 +0000 (15:05 +0000)]
Merge "Fixes JobScheduler not persisting flex and sourcePackage" into nyc-dev
am:
b55fa08c74
* commit '
b55fa08c74141d2c0e4ef9218214e1ba30bac8b8':
Fixes JobScheduler not persisting flex and sourcePackage
Neil Fuller [Tue, 16 Feb 2016 15:01:43 +0000 (15:01 +0000)]
Merge "Fix a compilation error due to 1.8 type inference differences" into nyc-dev
Jason Monk [Tue, 16 Feb 2016 15:01:32 +0000 (15:01 +0000)]
Merge "Fix RTL in Nav Bar" into nyc-dev
Leon Scroggins [Tue, 16 Feb 2016 14:58:57 +0000 (14:58 +0000)]
Merge "use std factory for compose-shader" into nyc-dev
am:
8e552f2eae
* commit '
8e552f2eaef9c31c6e69c3babe6639829afd7b1c':
use std factory for compose-shader
OSDN Git Service
