Doris Liu
ca4cb337ef
am 10464f7a: am 0b9fd85f: Merge "Change ActionBar animtion from/to ActionMode" into mnc-dev
...
* commit '10464f7a190e0facb2b42ab5efcfdd6e48cd7688':
Change ActionBar animtion from/to ActionMode
2015-06-12 21:45:00 +00:00
Doris Liu
0b9fd85f8f
Merge "Change ActionBar animtion from/to ActionMode" into mnc-dev
2015-06-12 21:31:48 +00:00
Doris Liu
94283533ab
Change ActionBar animtion from/to ActionMode
...
This CL changes the animation going from/to ActionMode per UX request.
The previous animation uses a combination of scale and translation
animation, whereas the new animation uses fade-out and then fade-in
(no cross-fade) for the action bar transition.
Bug: 20882034
Change-Id: I06286a215d058ed6f9f2023a4f0bcc60fa7ef46f
2015-06-12 14:21:30 -07:00
Dianne Hackborn
2712ce948a
am 6e2fb78f: am e554cc96: Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev
...
* commit '6e2fb78fbe3ce50182f0ad928748aeada57a44cf':
Implement some control over ALLOW_WHILE_IDLE alarms.
2015-06-12 19:54:28 +00:00
Chris Wren
604f6cf113
am 63cae6c8: am 17de4b2a: Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev
...
* commit '63cae6c8caa77b6b1cdc45423ed6ec771f6c485b':
remove usage of deprecated method setLatestEventInfo
2015-06-12 19:54:23 +00:00
Dianne Hackborn
e554cc9659
Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev
2015-06-12 19:38:39 +00:00
Dianne Hackborn
3d1933c45f
Implement some control over ALLOW_WHILE_IDLE alarms.
...
Since these alarms allow you to bypass the idle restrictions,
we don't want them to be so open-ended like other alarms. This
implements a policy where the alarm manager will only deliver these
types of alarms every X minutes to each application. For this
initial implementation, X is 1 minute under normal operation and
15 minutes when in idle mode.
To do this, I needed to introduce a new internal allow-while-idle
flag for system alarms, which applications can't get, and doesn't
have these new restrictions.
Also tweaked how the alarm manager handles the alarm window, so it
doesn't change if the alarm gets rescheduld; the window is now always
what as computed based on the time when the alarm was first
given to it.
Finally, fix TimeUtils to be able to correctly print times that
are > 999 days.
Change-Id: Ibad8c6a7c14b0624b54e82267be23224b4c31e84
2015-06-12 12:37:35 -07:00
Chris Wren
17de4b2a73
Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev
2015-06-12 19:28:54 +00:00
Rubin Xu
b8fd9182d6
am 23d5a49b: am 6161eb34: Merge "Update doc of ACTION_PROVISION_MANAGED_DEVICE" into mnc-dev
...
* commit '23d5a49bf3a36f0431154ecc4d8776a3d44e94d0':
Update doc of ACTION_PROVISION_MANAGED_DEVICE
2015-06-12 18:54:19 +00:00
Rubin Xu
6161eb3494
Merge "Update doc of ACTION_PROVISION_MANAGED_DEVICE" into mnc-dev
2015-06-12 18:27:45 +00:00
Amith Yamasani
db589a3d0d
am dc0df828: am ffff74ab: Merge "Report app standby state to batterystats" into mnc-dev
...
* commit 'dc0df828a2d93828696cf6b09e02de0af5717cb4':
Report app standby state to batterystats
2015-06-12 18:17:58 +00:00
Przemyslaw Szczepaniak
4dcde911de
am 1bb6ee4a: am 7ae22652: Merge "Fixes for API Review: android.speech.tts" into mnc-dev
...
* commit '1bb6ee4a938a6d8a032f0f8947ff9a44bea999cd':
Fixes for API Review: android.speech.tts
2015-06-12 17:58:30 +00:00
Amith Yamasani
ffff74abb1
Merge "Report app standby state to batterystats" into mnc-dev
2015-06-12 17:52:55 +00:00
Przemyslaw Szczepaniak
7ae22652a5
Merge "Fixes for API Review: android.speech.tts" into mnc-dev
2015-06-12 17:34:13 +00:00
Przemyslaw Szczepaniak
f77b2de1a9
Fixes for API Review: android.speech.tts
...
Bug: 21571893
Change-Id: Icd25f4aa9a465050c7410c7bfec004a71ba24548
2015-06-12 18:32:13 +01:00
Jeff Sharkey
551ca4ffc4
am 05107ddf: am 54b65ff3: Merge "Annotate ContentProviderClient arguments." into mnc-dev
...
* commit '05107ddf2069f3ea0d8ef01d20d6bc4d65addc7a':
Annotate ContentProviderClient arguments.
2015-06-12 17:31:46 +00:00
Dianne Hackborn
ccd6d0c14d
am d55860d9: am 8a435ced: Merge "Fix APIs." into mnc-dev
...
* commit 'd55860d990587509f0e9624c44494172f3e24714':
Fix APIs.
2015-06-12 17:31:21 +00:00
Jeff Sharkey
54b65ff300
Merge "Annotate ContentProviderClient arguments." into mnc-dev
2015-06-12 16:57:56 +00:00
Jeff Sharkey
73ed509d44
Annotate ContentProviderClient arguments.
...
Explicitly mark if they're @Nullable or @NonNull.
Bug: 21560515
Change-Id: Id0a208a38c5a9ea19dddbe60c65d285645d08bb0
2015-06-12 09:49:31 -07:00
Dianne Hackborn
8a435ced67
Merge "Fix APIs." into mnc-dev
2015-06-12 16:34:38 +00:00
Alex Klyubin
88fc537102
am d3f2657e: am 738241f9: Merge "Document that DownloadManager supports HTTPS." into mnc-dev
...
* commit 'd3f2657ee3655eb07d3772d6ce0b7fdbfe2cf48d':
Document that DownloadManager supports HTTPS.
2015-06-12 16:22:43 +00:00
Amith Yamasani
6776849dc5
Report app standby state to batterystats
...
Also reduce idle checks to the target user if possible.
Optimized calls to some internal methods
Bug: 21639147
Change-Id: If1faf26f862e5c4ca905f2603a4ba52a8d1af954
2015-06-12 09:05:22 -07:00
Alex Klyubin
738241f93c
Merge "Document that DownloadManager supports HTTPS." into mnc-dev
2015-06-12 16:02:17 +00:00
Chet Haase
501209dfc0
am 16b4e751: am e61fc94b: Merge "Remove View.getBackgroundColor()" into mnc-dev
...
* commit '16b4e7515d49c52df9f049f40f324d714e745459':
Remove View.getBackgroundColor()
2015-06-12 15:16:35 +00:00
Chet Haase
e61fc94b9b
Merge "Remove View.getBackgroundColor()" into mnc-dev
2015-06-12 14:50:20 +00:00
Rubin Xu
a4f9dc1cf0
Update doc of ACTION_PROVISION_MANAGED_DEVICE
...
It also supports an optional extra EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
Bug: 21797182
Change-Id: Ie145e6a79dd7eebdbb4cc58e1baba761b9cc5bbf
2015-06-12 15:18:59 +01:00
Chris Wren
1ce4b6d3c6
remove usage of deprecated method setLatestEventInfo
...
Bug: 18510449
Change-Id: I56a77991c729990e501f402e007dfa79ee57621e
2015-06-12 10:16:04 -04:00
Chet Haase
3dcb9945fd
Remove View.getBackgroundColor()
...
This method was added earlier in M - removing it now based on API
Council feedback.
Issue #21572678 API Review: android.view.View.getBackgroundColor()
Change-Id: I04fad49c3c377218d0fb708dbeaea609aca46ce8
2015-06-12 13:25:27 +01:00
Keisuke Kuroyanagi
60a640f415
am 3015edb0: am a31940df: Merge "Reset drag accelerator state in Editor#sendOnTextChanged." into mnc-dev
...
* commit '3015edb01e35d35f2971af7c6c9c6cfe9a2b8b2c':
Reset drag accelerator state in Editor#sendOnTextChanged.
2015-06-12 11:32:59 +00:00
Keisuke Kuroyanagi
a31940df17
Merge "Reset drag accelerator state in Editor#sendOnTextChanged." into mnc-dev
2015-06-12 11:10:20 +00:00
Rubin Xu
d841ebb7e7
am c13ea212: am 5c82d2cc: Change references to APK Certificate to Signature
...
* commit 'c13ea21249455708a5d1ffb42ef0a4751214c6b1':
Change references to APK Certificate to Signature
2015-06-12 10:17:44 +00:00
Rubin Xu
5c82d2cc17
Change references to APK Certificate to Signature
...
The fact that currently apk signature is certificates is just
implementation details.
Bug: 20820366
Change-Id: Icdd02cb51a550ea71ff83a84e2bdfcc21f8d43ed
2015-06-12 10:32:24 +01:00
Jeff Sharkey
a1d8a67b6f
am 9b68fb74: am 3c4d6139: Merge "Sigh, some apps are sending null ContentValues." into mnc-dev
...
* commit '9b68fb745ca26f725ae174623cc6e1183f9d9ca6':
Sigh, some apps are sending null ContentValues.
2015-06-12 05:15:43 +00:00
Yohei Yukawa
4c231bf412
am 16efc517: am 09259de0: Merge "Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b." into mnc-dev
...
* commit '16efc517be792d9aec284ae7d8cbba81027ca971':
Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b.
2015-06-12 05:15:39 +00:00
Jeff Sharkey
aaf42c9ea0
am c69a4fc5: am 1c83a043: Merge "Annotate ContentResolver/Provider arguments." into mnc-dev
...
* commit 'c69a4fc556b8c4bd6d28abde3c73b65384a6c574':
Annotate ContentResolver/Provider arguments.
2015-06-12 05:03:03 +00:00
Jeff Sharkey
3c4d613926
Merge "Sigh, some apps are sending null ContentValues." into mnc-dev
2015-06-12 04:57:08 +00:00
Jeff Sharkey
34796bd07f
Sigh, some apps are sending null ContentValues.
...
Bug: 21560515
Change-Id: Id5a62611781a2d9da47ad3e522d3d43f860b1f70
2015-06-11 21:55:32 -07:00
Yohei Yukawa
09259de032
Merge "Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b." into mnc-dev
2015-06-12 04:53:07 +00:00
Jeff Sharkey
1c83a0430f
Merge "Annotate ContentResolver/Provider arguments." into mnc-dev
2015-06-12 04:46:15 +00:00
Jeff Sharkey
673db44fb3
Annotate ContentResolver/Provider arguments.
...
Explicitly mark if they're @Nullable or @NonNull.
Bug: 21560515
Change-Id: I5f671c241dfe65e5ab8bc06b2382fbf5a82bdb20
2015-06-11 21:45:05 -07:00
Yohei Yukawa
fd65287cfd
Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b.
...
Fix confirmed with 'make doc-comment-check-docs'
Bug: 21446448
Change-Id: Ica4359b13ddbc790740cc22c95b9e002f7c8e4b8
2015-06-11 21:42:49 -07:00
Jeff Sharkey
c1a54115bd
am 2e9704f9: am 5347f0ff: Merge "Valid filenames have length limits!" into mnc-dev
...
* commit '2e9704f969df4d140f4c54243c6faabf17517144':
Valid filenames have length limits!
2015-06-12 02:41:30 +00:00
Jeff Sharkey
5347f0ff38
Merge "Valid filenames have length limits!" into mnc-dev
2015-06-12 02:18:29 +00:00
Jeff Sharkey
4f5e8b3ca4
Valid filenames have length limits!
...
ext4 filenames are at most 255 bytes. vfat filenames are bit more
lax, but we're often saving them on ext4 through a FUSE daemon, so
limit them the same way.
Since package names are used as directory names, verify that they're
valid filenames.
Tests to verify behavior.
Bug: 18689171
Change-Id: If7df4c40d352954510b71de4ff05d78259c721ed
2015-06-11 19:16:27 -07:00
Adam Powell
0b8f8c78a2
am b0fb6255: am de64ac45: Merge "Check targetSdkVersion when passing size hints for UNSPECIFIED specs" into mnc-dev
...
* commit 'b0fb62554b7083f38ee59a781f24e6e2996cc6bf':
Check targetSdkVersion when passing size hints for UNSPECIFIED specs
2015-06-12 01:08:34 +00:00
Yohei Yukawa
4878a26cb6
am bbbe13d5: am d4673355: Merge "Keyboard.Key#onReleased() should handle inside parameter." into mnc-dev
...
* commit 'bbbe13d51998968c188c2530df8ac823dcccca8c':
Keyboard.Key#onReleased() should handle inside parameter.
2015-06-12 01:08:24 +00:00
Dianne Hackborn
ece0f4f519
Fix APIs.
...
Issue #21039494 : API Review: android.os.PowerManager.isDeviceIdleMode()
Issue #21347000 : API Review: android.content.IntentFilter
Issue #20654534 : API Review: android.app.assist
Also allow use of ActivityManager.setWatchHeapLimit on any platform
build as long as the calling app is debuggable.
Change-Id: Ic597e596fa772fcdf2553b64f444b3d9269e8b92
2015-06-11 18:07:43 -07:00
Ruben Brunk
3435b0ba8d
am 86f3fbf7: am 25f3a7d1: Merge "Make CameraDeviceImpl#close() idempotent (for real)." into mnc-dev
...
* commit '86f3fbf721f87419d61fd03f9212b15b48225a3c':
Make CameraDeviceImpl#close() idempotent (for real).
2015-06-12 00:51:57 +00:00
Adam Powell
de64ac4599
Merge "Check targetSdkVersion when passing size hints for UNSPECIFIED specs" into mnc-dev
2015-06-12 00:45:23 +00:00
Yohei Yukawa
d46733556b
Merge "Keyboard.Key#onReleased() should handle inside parameter." into mnc-dev
2015-06-12 00:38:25 +00:00