OSDN Git Service
Jorim Jaggi [Wed, 10 Sep 2014 17:31:47 +0000 (17:31 +0000)]
am
bf763e77: Merge "Remove some overdraw in Keyguard" into lmp-dev
* commit '
bf763e77177f172dcb1d7590dd1855d53ff0d2e5':
Remove some overdraw in Keyguard
Jorim Jaggi [Wed, 10 Sep 2014 17:31:43 +0000 (17:31 +0000)]
am
07291645: Merge "Fix QS interception on tablets" into lmp-dev
* commit '
07291645ca6479b6ba8f83c95c137602dfd20ddb':
Fix QS interception on tablets
Jorim Jaggi [Wed, 10 Sep 2014 17:22:51 +0000 (17:22 +0000)]
Merge "Remove some overdraw in Keyguard" into lmp-dev
Jorim Jaggi [Wed, 10 Sep 2014 17:22:41 +0000 (17:22 +0000)]
Merge "Fix QS interception on tablets" into lmp-dev
Ruben Brunk [Wed, 10 Sep 2014 17:20:58 +0000 (17:20 +0000)]
am
17fcb255: Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev
* commit '
17fcb2556b1c04a42398738dcc1ad491b3597aa7':
camera2: Fix preview stretching in LEGACY mode.
Ruben Brunk [Wed, 10 Sep 2014 17:11:20 +0000 (17:11 +0000)]
Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev
Esteban Talavera [Wed, 10 Sep 2014 17:06:45 +0000 (17:06 +0000)]
am
55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev
* commit '
55bffb5041e18f2cf6884841165c2bbaf9576b98':
Update string value for provisioning action and extra
Jorim Jaggi [Wed, 10 Sep 2014 17:06:41 +0000 (17:06 +0000)]
am
bf671114: Merge "Don\'t let two closing animations run at the same time" into lmp-dev
* commit '
bf671114aa8cd713ff915dbd1403e077821c07f8':
Don't let two closing animations run at the same time
Jorim Jaggi [Wed, 10 Sep 2014 16:52:29 +0000 (18:52 +0200)]
Remove some overdraw in Keyguard
Bug:
17287256
Change-Id: I0bc4101713f83abc2738528c247ca8ce5748bff1
Esteban Talavera [Wed, 10 Sep 2014 16:26:48 +0000 (16:26 +0000)]
Merge "Update string value for provisioning action and extra" into lmp-dev
Jorim Jaggi [Wed, 10 Sep 2014 16:20:58 +0000 (18:20 +0200)]
Fix QS interception on tablets
Only intercept when touching on the panel and not on the left or
right of the panel. Fixes a bug where the user couldn't dismiss the
panel by tapping outside.
Bug:
17437547
Change-Id: Ice484a301683fa2df1f2a21f13977023b48189f4
Jorim Jaggi [Wed, 10 Sep 2014 15:48:44 +0000 (15:48 +0000)]
Merge "Don't let two closing animations run at the same time" into lmp-dev
Selim Cinek [Wed, 10 Sep 2014 15:10:36 +0000 (15:10 +0000)]
am
abe5f130: Merge "Fixed unnecessary layer creations in the pin unlock method" into lmp-dev
* commit '
abe5f1300b333b9120d7d120b0cec6cca96b778f':
Fixed unnecessary layer creations in the pin unlock method
Jason Monk [Wed, 10 Sep 2014 15:10:32 +0000 (15:10 +0000)]
am
89551fab: Merge "Fix blank QS Panel after double tap on profile icon" into lmp-dev
* commit '
89551fab5725e7c67002f894bdf8933c00a9c409':
Fix blank QS Panel after double tap on profile icon
Jason Monk [Wed, 10 Sep 2014 15:10:28 +0000 (15:10 +0000)]
am
1c52586c: Merge "Update zen mode and qs strings on locale change" into lmp-dev
* commit '
1c52586cb3273f419d9e70a884823c411abacf73':
Update zen mode and qs strings on locale change
Jason Monk [Wed, 10 Sep 2014 15:10:24 +0000 (15:10 +0000)]
am
473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev
* commit '
473d27fa34875083dfea48e933c2e9300979c64a':
Move zen mode constants and code to framework
Selim Cinek [Wed, 10 Sep 2014 15:08:32 +0000 (15:08 +0000)]
Merge "Fixed unnecessary layer creations in the pin unlock method" into lmp-dev
Jorim Jaggi [Wed, 10 Sep 2014 15:04:27 +0000 (17:04 +0200)]
Don't let two closing animations run at the same time
Fixes a flash when clicking on a single notification.
Bug:
17450892
Change-Id: Ia99c21a0bb30ce100532cfab66c96ec24f2412bf
Jason Monk [Wed, 10 Sep 2014 15:00:53 +0000 (15:00 +0000)]
Merge "Fix blank QS Panel after double tap on profile icon" into lmp-dev
Jason Monk [Wed, 10 Sep 2014 15:00:30 +0000 (15:00 +0000)]
Merge "Update zen mode and qs strings on locale change" into lmp-dev
Jason Monk [Wed, 10 Sep 2014 15:00:19 +0000 (15:00 +0000)]
Merge "Move zen mode constants and code to framework" into lmp-dev
John Spurlock [Wed, 10 Sep 2014 14:54:35 +0000 (14:54 +0000)]
am
82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev
* commit '
821268455ca57051983c0e5f8cc24695033be174':
Zen: make Condition available over @SystemApi
John Spurlock [Wed, 10 Sep 2014 14:46:19 +0000 (14:46 +0000)]
Merge "Zen: make Condition available over @SystemApi" into lmp-dev
John Spurlock [Wed, 10 Sep 2014 14:42:13 +0000 (10:42 -0400)]
Zen: make Condition available over @SystemApi
Fix build.
Bug:
16819503
Change-Id: I011723a770a9a8b7fc8124defd56137ec5f1704e
Selim Cinek [Wed, 10 Sep 2014 14:39:01 +0000 (16:39 +0200)]
Fixed unnecessary layer creations in the pin unlock method
This was especially noticible when double tapping a notification
because of the staggered appearing.
Bug:
17287256
Change-Id: I8f39892fa122bb8b7b6f2a7b1e7be8a9570e661e
George Mount [Wed, 10 Sep 2014 14:38:19 +0000 (14:38 +0000)]
am
1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev
* commit '
1fac2ba1c9577f88cf93e88794780af9b5eacb1b':
Use intrinsic size for path animation in AnimatedVectorDrawable
George Mount [Wed, 10 Sep 2014 14:38:15 +0000 (14:38 +0000)]
am
bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev
* commit '
bfbb5882cb2e11d9a201e4f5ade6a3fe9f43e6b0':
Fix fade transition not working with Activity Transitions.
George Mount [Wed, 10 Sep 2014 14:30:15 +0000 (14:30 +0000)]
Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev
George Mount [Wed, 10 Sep 2014 14:29:58 +0000 (14:29 +0000)]
Merge "Fix fade transition not working with Activity Transitions." into lmp-dev
John Spurlock [Wed, 10 Sep 2014 13:45:09 +0000 (13:45 +0000)]
am
3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev
* commit '
3a972844e934b1031d73bfb114d84a7d2f8d4b19':
Zen: Make condition providers available via @SystemApi.
Selim Cinek [Wed, 10 Sep 2014 13:45:00 +0000 (13:45 +0000)]
am
20c285a6: Merge "Fixed a bug where text could overlap in Quick settings" into lmp-dev
* commit '
20c285a6485e57669eae5a9ea165b390f0d8369c':
Fixed a bug where text could overlap in Quick settings
John Spurlock [Wed, 10 Sep 2014 13:38:08 +0000 (13:38 +0000)]
Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev
Selim Cinek [Wed, 10 Sep 2014 13:36:17 +0000 (13:36 +0000)]
Merge "Fixed a bug where text could overlap in Quick settings" into lmp-dev
Jason Monk [Mon, 8 Sep 2014 14:13:59 +0000 (10:13 -0400)]
Move zen mode constants and code to framework
This allows the strings and code to be shared with settings.
Bug:
15454830
Change-Id: I9300af4f8b6d80042452b75db3418b20c5c5cc81
John Spurlock [Wed, 10 Sep 2014 13:10:00 +0000 (09:10 -0400)]
Zen: Make condition providers available via @SystemApi.
Bug:
16819503
Change-Id: Ibd7004f7a0928d3f14f9ccd55088cf645d5285e2
Jorim Jaggi [Wed, 10 Sep 2014 13:11:51 +0000 (13:11 +0000)]
am
2f52f74c: Merge "Use simpler layout for auto-redacted notifications" into lmp-dev
* commit '
2f52f74c4a670370e32b36ecb89a06f5203df8d1':
Use simpler layout for auto-redacted notifications
Jorim Jaggi [Wed, 10 Sep 2014 13:11:47 +0000 (13:11 +0000)]
am
222ff70d: Merge "Inflate guts only when needed" into lmp-dev
* commit '
222ff70d04bd1e3721d455cd42ce36f046b52b93':
Inflate guts only when needed
Jorim Jaggi [Wed, 10 Sep 2014 13:03:29 +0000 (13:03 +0000)]
Merge "Use simpler layout for auto-redacted notifications" into lmp-dev
Jorim Jaggi [Wed, 10 Sep 2014 13:03:05 +0000 (13:03 +0000)]
Merge "Inflate guts only when needed" into lmp-dev
Jorim Jaggi [Mon, 8 Sep 2014 17:55:17 +0000 (19:55 +0200)]
Inflate guts only when needed
This saves us a ton of views.
Bug:
17346296
Change-Id: I3eafd6703d19704dc8b108c1034266f38cf77f7b
Selim Cinek [Wed, 10 Sep 2014 12:41:58 +0000 (14:41 +0200)]
Fixed a bug where text could overlap in Quick settings
Bug:
17434395
Change-Id: I001f54586666e2e575b0295315f7b2181c25a1e9
Adrian Roos [Wed, 10 Sep 2014 11:32:11 +0000 (11:32 +0000)]
am
500eebbb: Merge "Only unbind agents of the user that is being refreshed" into lmp-dev
* commit '
500eebbb71d64c5b4d4b6ef4ab2f10800ac455df':
Only unbind agents of the user that is being refreshed
Adrian Roos [Wed, 10 Sep 2014 11:32:07 +0000 (11:32 +0000)]
am
be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev
* commit '
be12538056cf441f441d42d2bf7d430ecdc3fd4f':
Add system trust agents on first boot or when adding user
Adrian Roos [Wed, 10 Sep 2014 11:24:07 +0000 (11:24 +0000)]
Merge "Only unbind agents of the user that is being refreshed" into lmp-dev
Adrian Roos [Wed, 10 Sep 2014 11:23:37 +0000 (11:23 +0000)]
Merge "Add system trust agents on first boot or when adding user" into lmp-dev
Kenny Guy [Wed, 10 Sep 2014 11:22:10 +0000 (11:22 +0000)]
am
cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev
* commit '
cefee0c8185594f017ffd396cfe1877419c24371':
Remember userId when stripping / rebuilding notification.
Christoph Studer [Wed, 10 Sep 2014 11:22:06 +0000 (11:22 +0000)]
am
6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev
* commit '
6e68dff3deb0ec350aa769b4936e52ea00262beb':
NoLiService: Delete @removed meetsInterruptionFilter
Christoph Studer [Wed, 10 Sep 2014 11:22:02 +0000 (11:22 +0000)]
am
c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev
* commit '
c4290acf31f537821c42356d8a5db22afd353d1c':
Notification: Use ViewStub for ProgressBar
Kenny Guy [Wed, 10 Sep 2014 11:14:57 +0000 (11:14 +0000)]
Merge "Remember userId when stripping / rebuilding notification." into lmp-dev
Christoph Studer [Wed, 10 Sep 2014 11:14:32 +0000 (11:14 +0000)]
Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev
Christoph Studer [Wed, 10 Sep 2014 11:14:07 +0000 (11:14 +0000)]
Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev
Adam Connors [Wed, 10 Sep 2014 10:16:38 +0000 (10:16 +0000)]
am
5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev
* commit '
5e1fe70f82a58b3afe87ed14f5c44e02e05ddccb':
Add feature flags for verified boot and securely remove users.
Adam Connors [Wed, 10 Sep 2014 10:07:13 +0000 (10:07 +0000)]
Merge "Add feature flags for verified boot and securely remove users." into lmp-dev
Yohei Yukawa [Wed, 10 Sep 2014 09:16:04 +0000 (09:16 +0000)]
am
107505bd: Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev
* commit '
107505bd85f615c82a1dca462581f8b10de72270':
Use public APIs to instantiate InputMethodSubtype
Jessica Hummel [Wed, 10 Sep 2014 09:16:00 +0000 (09:16 +0000)]
am
1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev
* commit '
1e4efc916adb2e62f1189a6f1d8c54f8970a31f6':
Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
Yohei Yukawa [Wed, 10 Sep 2014 08:29:29 +0000 (08:29 +0000)]
Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev
Jessica Hummel [Wed, 10 Sep 2014 08:08:47 +0000 (08:08 +0000)]
Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev
Jessica Hummel [Wed, 20 Aug 2014 14:20:11 +0000 (15:20 +0100)]
Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
Change-Id: I6fe96df66a4a78cf2e2455d58bba13051d108fdf
bug:
17152955
Vinit Deshpande [Wed, 10 Sep 2014 06:58:15 +0000 (06:58 +0000)]
am
8270c789: Merge "Secure access to WifiScanner" into lmp-dev
* commit '
8270c789682e2d10cd292ccc906ddc47df7fc1fd':
Secure access to WifiScanner
Zhijun He [Wed, 10 Sep 2014 06:58:12 +0000 (06:58 +0000)]
am
5ef21e48: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev
* commit '
5ef21e48b80876178636f3c5936c81409843ff7a':
CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
Eric Rowe [Wed, 10 Sep 2014 06:58:08 +0000 (06:58 +0000)]
am
9c8a45b5: Merge "Allow protected wifi in connectivity tests" into lmp-dev
* commit '
9c8a45b554b4af5c8a7ca959eb8d0d4d05d91ace':
Allow protected wifi in connectivity tests
Lajos Molnar [Wed, 10 Sep 2014 06:58:04 +0000 (06:58 +0000)]
am
4f276471: Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev
* commit '
4f2764717bab9175eb1a22bcd770ff52d5c955f5':
MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
Robert Shih [Wed, 10 Sep 2014 06:58:00 +0000 (06:58 +0000)]
am
3b0b5ce3: MediaPlayer/SubtitleController:fix add/select timed text on start
* commit '
3b0b5ce31f19d75ca4ea9796d4efaa1eda5e2295':
MediaPlayer/SubtitleController:fix add/select timed text on start
Yohei Yukawa [Wed, 10 Sep 2014 05:10:30 +0000 (14:10 +0900)]
Use public APIs to instantiate InputMethodSubtype
This is a groundwork for subsequent CLs that are
supposed to improve default input method selection
logics.
Historically we have had a @hide constructor of
InputMethodSubtype. However, this contructor is
a bit obsolete because we can not specify some
parameters that were added in recent platform
releases. We should use InputMethodSubtypeBuilder
instead.
BUG:
17347871
Change-Id: I72ad79682a58344e14380eb20e26edf98aee37cd
Vinit Deshpande [Wed, 10 Sep 2014 06:34:23 +0000 (06:34 +0000)]
Merge "Secure access to WifiScanner" into lmp-dev
Wink Saville [Wed, 10 Sep 2014 06:20:18 +0000 (23:20 -0700)]
Rename answerRingingCallUsingSubId to answrRingingCallForSubscriber.
Bug:
17255752
Change-Id: I0c792227105c6b4697b9de0e7120247795ab6641
Wink Saville [Wed, 10 Sep 2014 05:43:39 +0000 (22:43 -0700)]
Update current.txt for two renamed methods.
getSmsManagerUsingSubId and getSubIfnoUsingSubId now have ForSubscriber
as their suffix instead of UsingSubId.
Change-Id: I1e36a4770463fd0d6a2656c3bcbbfc07bd747e01
Zhijun He [Wed, 10 Sep 2014 05:12:25 +0000 (05:12 +0000)]
Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev
Alan Viverette [Wed, 10 Sep 2014 03:52:10 +0000 (03:52 +0000)]
am
a9962d36: Merge "Improve dialog padding when title or body text are missing" into lmp-dev
* commit '
a9962d3609c2cf03ee7d437fcee2c339423da3c5':
Improve dialog padding when title or body text are missing
Eric Rowe [Wed, 10 Sep 2014 02:43:21 +0000 (02:43 +0000)]
Merge "Allow protected wifi in connectivity tests" into lmp-dev
Lajos Molnar [Wed, 10 Sep 2014 02:38:49 +0000 (02:38 +0000)]
Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev
Eric Rowe [Wed, 10 Sep 2014 02:25:55 +0000 (19:25 -0700)]
Allow protected wifi in connectivity tests
Change-Id: I31285572f90bfb46cc28fb04e79cb9b407477a7d
Ruben Brunk [Wed, 10 Sep 2014 01:46:00 +0000 (18:46 -0700)]
camera2: Fix preview stretching in LEGACY mode.
Bug:
17447262
Change-Id: Idf4ba8d3702cf03c5b01045e2e3efe380b503002
Robert Shih [Fri, 5 Sep 2014 20:33:31 +0000 (13:33 -0700)]
MediaPlayer/SubtitleController:fix add/select timed text on start
- scan internal tracks when necessary
- fix overflow in addTimedTextSource
- do not hide timed text track in doSelectDefaultTrack; i.e. apply
hiding logic to subtitle tracks only
- do not notify stop in scheduleUpdate; it will be fired in onStopped
if necessary
Bug:
17323221
Change-Id: I485f7d9197d10562fbd58d0afe5e9aa4cf610f1a
Alan Viverette [Wed, 10 Sep 2014 01:27:56 +0000 (01:27 +0000)]
Merge "Improve dialog padding when title or body text are missing" into lmp-dev
Alan Viverette [Wed, 10 Sep 2014 01:24:52 +0000 (18:24 -0700)]
Improve dialog padding when title or body text are missing
BUG:
17446820
Change-Id: I20ace8660da90e6722e55978a3ce49eeafcd1220
Eric Laurent [Wed, 10 Sep 2014 01:01:07 +0000 (01:01 +0000)]
am
4f0149fe: Merge "SoundTriggerHelper: handle media server death" into lmp-dev
* commit '
4f0149fe3d4057b61f7df77820ef6df0bd2cfbb7':
SoundTriggerHelper: handle media server death
Junda Liu [Wed, 10 Sep 2014 01:00:59 +0000 (01:00 +0000)]
am
bdf9cf90: Add ForSubscriber suffix to APIs w/ subId argument.
* commit '
bdf9cf904c5f7c61c1d77ba4261238fdbb9b08d8':
Add ForSubscriber suffix to APIs w/ subId argument.
Eric Laurent [Wed, 10 Sep 2014 00:52:59 +0000 (00:52 +0000)]
Merge "SoundTriggerHelper: handle media server death" into lmp-dev
Dianne Hackborn [Wed, 10 Sep 2014 00:50:48 +0000 (00:50 +0000)]
am
829b79f6: Merge "Fix build." into lmp-dev
* commit '
829b79f67a23f89e994ea720cd0c4a146f57ba5f':
Fix build.
Junda Liu [Sat, 6 Sep 2014 00:31:08 +0000 (17:31 -0700)]
Add ForSubscriber suffix to APIs w/ subId argument.
Bug: b/
17255752
Change-Id: I142d8961aa4c1fa074833f70c404c955caea0870
Dianne Hackborn [Wed, 10 Sep 2014 00:40:54 +0000 (00:40 +0000)]
Merge "Fix build." into lmp-dev
Dianne Hackborn [Wed, 10 Sep 2014 00:38:34 +0000 (17:38 -0700)]
Fix build.
Change-Id: I92eabc35168acfe58641917179be0d90a14f2f11
Amit Mahajan [Wed, 10 Sep 2014 00:29:01 +0000 (00:29 +0000)]
am
7cd6fc5b: Merge "Support to load default voicemail number from the configuration." into lmp-dev
* commit '
7cd6fc5b838fde5046028518cee44d8fd69cc701':
Support to load default voicemail number from the configuration.
wsmlby [Wed, 10 Sep 2014 00:28:58 +0000 (00:28 +0000)]
am
d1ed1e81: Merge "Fix AppCompatibility test for different process name of one package." into lmp-dev
* commit '
d1ed1e81df51543cd1ab45170f12f2ed615f770d':
Fix AppCompatibility test for different process name of one package.
Lajos Molnar [Tue, 9 Sep 2014 23:17:02 +0000 (16:17 -0700)]
MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
Bug:
17059255
Change-Id: I9f5f0be61e94795d90ad29e94b3a1a6e6aedfb1d
Eric Laurent [Tue, 9 Sep 2014 22:52:25 +0000 (15:52 -0700)]
SoundTriggerHelper: handle media server death
Retry to attach sound trigger module when startRecognition() is called.
Bug:
17373746.
Change-Id: I5b2f806b6cab47741d345be1cde73a84f5a62590
Jinsuk Kim [Wed, 10 Sep 2014 00:24:48 +0000 (00:24 +0000)]
am
a8c43b25: Merge "CEC: Stub MHL Controller" into lmp-dev
* commit '
a8c43b254104ead2c465544efb88ec8de6f9f462':
CEC: Stub MHL Controller
Amit Mahajan [Wed, 10 Sep 2014 00:23:48 +0000 (00:23 +0000)]
Merge "Support to load default voicemail number from the configuration." into lmp-dev
wsmlby [Wed, 10 Sep 2014 00:21:26 +0000 (00:21 +0000)]
Merge "Fix AppCompatibility test for different process name of one package." into lmp-dev
Robert Ly [Wed, 10 Sep 2014 00:18:04 +0000 (00:18 +0000)]
am
bb6ede49: am
0cb4c738: am
9f60bc3f: am
52a18161: docs: update api dashboard for september
* commit '
bb6ede49f4378feb261a577a74ee0532a9b3f4f0':
docs: update api dashboard for september
Jeff Tinker [Wed, 10 Sep 2014 00:17:58 +0000 (00:17 +0000)]
am
50bb6215: Merge "Add support for max-res decode" into lmp-dev
* commit '
50bb621501fafc85be31e2039a43e6bbe93344bd':
Add support for max-res decode
Adam Lesinski [Wed, 10 Sep 2014 00:17:53 +0000 (00:17 +0000)]
am
38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev
* commit '
38bd55ffd7084d744e4e814593056e1e12ebfb00':
Make UsageStats API default on only for the system
ActivityManager shouldn't return null for getCurrentUser
Tsuwei Chen [Wed, 10 Sep 2014 00:17:43 +0000 (00:17 +0000)]
am
5675ab1b: Merge "Move carrier-specific GPS parameters out of framework/base directory. Bug:
17288144" into lmp-dev
* commit '
5675ab1b691f2dc2b94bbdd78bbdbba90896cb01':
Move carrier-specific GPS parameters out of framework/base directory. Bug:
17288144
Adam Lesinski [Wed, 10 Sep 2014 00:17:39 +0000 (00:17 +0000)]
am
799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" into lmp-dev
* commit '
799dc7483f6c6a4b554f2a3dad4b801371347cea':
AAPT: Don't crash on illegal symbol name
Alan Viverette [Wed, 10 Sep 2014 00:17:35 +0000 (00:17 +0000)]
am
b7afde5c: Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev
* commit '
b7afde5c05fa7bc37aa8cdd58b55b298dbeca004':
Bring up the IME when TextView receives ACTION_CLICK
Adam Powell [Wed, 10 Sep 2014 00:17:31 +0000 (00:17 +0000)]
am
8197da77: Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev
* commit '
8197da7703d0753d29b3ab5fda8771ef9d165d40':
ActionMenuViews always reserve overflow when creating their own menus
Christopher Tate [Wed, 10 Sep 2014 00:17:26 +0000 (00:17 +0000)]
am
3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev
* commit '
3b9417ff52248190fa324eef87bec8ab050e42f4':
Fix BackupManager.isBackupEnabled()
Winson Chung [Wed, 10 Sep 2014 00:17:22 +0000 (00:17 +0000)]
am
b68c78bd: Announcing the task list as you scroll. (Bug
15699050)
* commit '
b68c78bdec4f680e4b5536a7f8df90513cc5aba7':
Announcing the task list as you scroll. (Bug
15699050)
Winson Chung [Wed, 10 Sep 2014 00:17:19 +0000 (00:17 +0000)]
am
5ec5fa49: Fixing issue with Recents showing blank. (Bug
16987565)
* commit '
5ec5fa491c6cba8a6bb451d0aa121318df927ffd':
Fixing issue with Recents showing blank. (Bug
16987565)