OSDN Git Service
Ruben Brunk [Fri, 5 Sep 2014 19:00:27 +0000 (19:00 +0000)]
am
eb08250a: Merge "camera2: Undo mirror for front camera in legacy mode." into lmp-dev
* commit '
eb08250a9bb7ad87518be9454eb9451d9b08c62f':
camera2: Undo mirror for front camera in legacy mode.
Wei Wang [Fri, 5 Sep 2014 19:00:19 +0000 (19:00 +0000)]
am
294383cc: Merge "Unregister app when advertise failed after registration." into lmp-dev
* commit '
294383ccc75090a4c616bef02dcd7572dcca6004':
Unregister app when advertise failed after registration.
Ruben Brunk [Fri, 5 Sep 2014 18:52:53 +0000 (18:52 +0000)]
Merge "camera2: Undo mirror for front camera in legacy mode." into lmp-dev
Wei Wang [Fri, 5 Sep 2014 18:49:26 +0000 (18:49 +0000)]
Merge "Unregister app when advertise failed after registration." into lmp-dev
Svetoslav [Fri, 5 Sep 2014 18:38:11 +0000 (18:38 +0000)]
am
b1d65d18: Merge "Fix runtime restart" into lmp-dev
* commit '
b1d65d187db52c541ac71b5b9e3f34f15eb3001f':
Fix runtime restart
Svetoslav [Fri, 5 Sep 2014 18:30:40 +0000 (18:30 +0000)]
Merge "Fix runtime restart" into lmp-dev
Svetoslav [Fri, 5 Sep 2014 18:28:00 +0000 (11:28 -0700)]
Fix runtime restart
Change-Id: Ic50c8b3b06603ad517fdc8a2392ad12318d46817
Jean-Michel Trivi [Fri, 5 Sep 2014 18:09:29 +0000 (18:09 +0000)]
am
0bd1a9d7: Merge "Permission check for entering MODE_IN_CALL" into lmp-dev
* commit '
0bd1a9d7c3ea358c520ff5ff6e066d3daab1b964':
Permission check for entering MODE_IN_CALL
Jean-Michel Trivi [Fri, 5 Sep 2014 18:00:50 +0000 (18:00 +0000)]
Merge "Permission check for entering MODE_IN_CALL" into lmp-dev
Jeff Sharkey [Fri, 5 Sep 2014 17:59:14 +0000 (17:59 +0000)]
am
a32e4e6b: Merge "Allow badging updates to install sessions." into lmp-dev
* commit '
a32e4e6b1fafed78546f8084eea78e641a92124d':
Allow badging updates to install sessions.
Eino-Ville Talvala [Fri, 5 Sep 2014 17:59:10 +0000 (17:59 +0000)]
am
f62fb8f9: Merge "Camera2: Document supported target combinations for a session." into lmp-dev
* commit '
f62fb8f94ac595d31da73fd791a2738737a13efa':
Camera2: Document supported target combinations for a session.
Chris Craik [Fri, 5 Sep 2014 17:59:06 +0000 (17:59 +0000)]
am
8ff3e227: Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev
* commit '
8ff3e227327d21bf8269af47efa4d91b6a32613b':
Replace native crash with IAE when calling picture.draw() w/ a HW canvas
Jeff Sharkey [Fri, 5 Sep 2014 17:56:38 +0000 (17:56 +0000)]
Merge "Allow badging updates to install sessions." into lmp-dev
Eino-Ville Talvala [Fri, 5 Sep 2014 17:54:00 +0000 (17:54 +0000)]
Merge "Camera2: Document supported target combinations for a session." into lmp-dev
Chris Craik [Fri, 5 Sep 2014 17:49:19 +0000 (17:49 +0000)]
Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev
Chris Craik [Fri, 5 Sep 2014 17:35:56 +0000 (17:35 +0000)]
am
96b6b3df: Merge "Hide color filter mutability" into lmp-dev
* commit '
96b6b3dfc55f08752084b472cf9c62c22a2f2759':
Hide color filter mutability
Christopher Ferris [Fri, 5 Sep 2014 17:35:52 +0000 (17:35 +0000)]
am
3110fe01: Merge "Add new header to support 32 bit/64 bit dumps." into lmp-dev
* commit '
3110fe01137b9a496533cd534df148d3105253a6':
Add new header to support 32 bit/64 bit dumps.
George Mount [Fri, 5 Sep 2014 17:35:48 +0000 (17:35 +0000)]
am
1377fe31: Merge "API Review: Improve javadoc." into lmp-dev
* commit '
1377fe31f3d655e5d764b213904131f7e75a870d':
API Review: Improve javadoc.
Chris Craik [Fri, 5 Sep 2014 17:33:39 +0000 (10:33 -0700)]
Replace native crash with IAE when calling picture.draw() w/ a HW canvas
bug:
17397958
Change-Id: I75f942db0e604f9fd6ab31e6c81f718c0f57b16a
Chris Craik [Fri, 5 Sep 2014 17:30:49 +0000 (17:30 +0000)]
Merge "Hide color filter mutability" into lmp-dev
Christopher Ferris [Fri, 5 Sep 2014 17:30:20 +0000 (17:30 +0000)]
Merge "Add new header to support 32 bit/64 bit dumps." into lmp-dev
Svetoslav [Fri, 5 Sep 2014 17:30:07 +0000 (17:30 +0000)]
am
f1a858c7: Fix broken aidl
* commit '
f1a858c7887ba8af0cf991fd6fa8a1f72e069ff1':
Fix broken aidl
George Mount [Fri, 5 Sep 2014 17:29:28 +0000 (17:29 +0000)]
Merge "API Review: Improve javadoc." into lmp-dev
George Mount [Fri, 29 Aug 2014 18:32:13 +0000 (11:32 -0700)]
API Review: Improve javadoc.
Bug
17189781
Also rename PatternMotion to PatternPathMotion
Change-Id: I1c4dcbdd65e33cf9de1504277e31f9f7ede0380d
Svetoslav [Fri, 5 Sep 2014 17:19:39 +0000 (10:19 -0700)]
Fix broken aidl
Change-Id: I2187abd75b4f60e790b747a492ad610592f2ef53
Jeff Sharkey [Fri, 5 Sep 2014 16:45:20 +0000 (09:45 -0700)]
Allow badging updates to install sessions.
For the system restore use-case, an installer may need to enqueue
their sessions quickly before badging details, like icons, have been
downloaded. This change relaxes to allow an installer to update
their session badging after the session has been created. Notify
observers when badging changes.
Rename callback registration methods to match style guide. Relax
constraint that observers are home app. Fix bug around internal
progress reporting.
Bug:
17376797,
17389236,
17334199
Change-Id: I5fb88508baea2f08e89a1504fcf5ef972afad4a7
Svetoslav [Fri, 5 Sep 2014 17:12:44 +0000 (17:12 +0000)]
am
4c8c9ac0: Merge "Update FrameStats API per api-council request." into lmp-dev
* commit '
4c8c9ac06fc213d9bc9d82c39d55f425fee5b429':
Update FrameStats API per api-council request.
Svetoslav [Fri, 5 Sep 2014 17:12:40 +0000 (17:12 +0000)]
am
6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev
* commit '
6f0cf112a712cd1a9e77a9b2b66e5f771d4e061e':
Addressing API council comments for UserManager.
Wei Liu [Fri, 5 Sep 2014 17:12:37 +0000 (17:12 +0000)]
am
ea237b13: am
0641ab3d: am
636f3eac: Add clear_top flag to settings action intent. Bug:
17200185
* commit '
ea237b130ddc76269131a2cb7ef56940033fea7e':
Add clear_top flag to settings action intent. Bug:
17200185
Amith Yamasani [Fri, 5 Sep 2014 17:12:31 +0000 (17:12 +0000)]
am
3c0a511d: Merge "Remove class that was moved to a different package." into lmp-dev
* commit '
3c0a511dee505d46ebab80a9b5a1579d39e597fd':
Remove class that was moved to a different package.
Svetoslav [Fri, 5 Sep 2014 17:09:44 +0000 (17:09 +0000)]
Merge "Update FrameStats API per api-council request." into lmp-dev
Svetoslav [Fri, 5 Sep 2014 17:08:11 +0000 (17:08 +0000)]
Merge "Addressing API council comments for UserManager." into lmp-dev
Wei Liu [Fri, 5 Sep 2014 17:07:19 +0000 (17:07 +0000)]
am
0641ab3d: am
636f3eac: Add clear_top flag to settings action intent. Bug:
17200185
* commit '
0641ab3dd0282edc272f425a245ede63a78dd222':
Add clear_top flag to settings action intent. Bug:
17200185
Svetoslav [Fri, 5 Sep 2014 01:37:31 +0000 (18:37 -0700)]
Update FrameStats API per api-council request.
bug:
17390382
Change-Id: I50518834569f4d0ec394709294537256f03530e0
Svetoslav [Thu, 4 Sep 2014 22:39:54 +0000 (15:39 -0700)]
Addressing API council comments for UserManager.
bug:
17390424
Change-Id: I498d2541289915cb7db16e5c3249ccc7a7dc5ee6
Amith Yamasani [Fri, 5 Sep 2014 17:03:30 +0000 (17:03 +0000)]
Merge "Remove class that was moved to a different package." into lmp-dev
Wei Liu [Fri, 5 Sep 2014 16:52:20 +0000 (16:52 +0000)]
am
636f3eac: Add clear_top flag to settings action intent. Bug:
17200185
* commit '
636f3eac6d3ae69e7cc1dd159fe7cdbb043ce2df':
Add clear_top flag to settings action intent. Bug:
17200185
Jeff Sharkey [Fri, 5 Sep 2014 16:51:18 +0000 (16:51 +0000)]
am
e7bea8e5: Merge "Move Size parceling to Bundle." into lmp-dev
* commit '
e7bea8e53ba42dc7a6de18dc19f7b1fcfa7bbdf7':
Move Size parceling to Bundle.
Jean-Michel Trivi [Thu, 4 Sep 2014 00:48:47 +0000 (17:48 -0700)]
Permission check for entering MODE_IN_CALL
Make the ability to change the audio mode conditional to having
the MODIFY_PHONE_STATE permission.
Make AudioService's internal implementation of the mode setting
(the setModeInt() method) private, it is only meant to be used
by AudioService.
Refer to the permission names through Manifest.permission, not
by their string value.
Bug
14964198
Change-Id: I49870207566e53d5c8764646cece06d8272f93ed
Jeff Sharkey [Fri, 5 Sep 2014 16:45:59 +0000 (16:45 +0000)]
Merge "Move Size parceling to Bundle." into lmp-dev
Amith Yamasani [Fri, 5 Sep 2014 16:42:59 +0000 (09:42 -0700)]
Remove class that was moved to a different package.
Completes the API change.
Bug:
17006805
Change-Id: I5031e05df6b1a317a902482274eb056ecaf5dfbb
Tom O'Neill [Fri, 5 Sep 2014 16:41:17 +0000 (16:41 +0000)]
am
971e730a: Merge "Suppress location tile in QS on lock screen" into lmp-dev
* commit '
971e730a5d646719688a70a59d8b7c987945d4ef':
Suppress location tile in QS on lock screen
Amith Yamasani [Fri, 5 Sep 2014 16:41:13 +0000 (16:41 +0000)]
am
0c3b7b15: Merge "Don\'t allow guests to install from unknown sources" into lmp-dev
* commit '
0c3b7b1567d591a5723456f9935dc00e4131daff':
Don't allow guests to install from unknown sources
Tom O'Neill [Fri, 5 Sep 2014 16:37:43 +0000 (16:37 +0000)]
Merge "Suppress location tile in QS on lock screen" into lmp-dev
Amith Yamasani [Fri, 5 Sep 2014 16:32:29 +0000 (16:32 +0000)]
Merge "Don't allow guests to install from unknown sources" into lmp-dev
Amith Yamasani [Fri, 5 Sep 2014 16:31:37 +0000 (16:31 +0000)]
am
5c605494: Merge "Fix current.txt (fixes build)" into lmp-dev
* commit '
5c6054945de9f51e34d94e4f6eb463d0da850746':
Fix current.txt (fixes build)
Akos Ludanyi [Fri, 5 Sep 2014 16:31:34 +0000 (16:31 +0000)]
am
9f5e2229: Merge "Fix ProviderTestCase2 broken by ag/519661:" into lmp-dev
* commit '
9f5e22294e6493a1fbb511d1ba956ea8266ac2b3':
Fix ProviderTestCase2 broken by ag/519661:
Evan Charlton [Fri, 5 Sep 2014 16:31:30 +0000 (16:31 +0000)]
am
2b70dbb4: Merge "Add a constant for CHANGE_PHONE_ACCOUNTS action" into lmp-dev
* commit '
2b70dbb479db7ada3ecbda056501846624d9bbea':
Add a constant for CHANGE_PHONE_ACCOUNTS action
Jorim Jaggi [Fri, 5 Sep 2014 16:31:27 +0000 (16:31 +0000)]
am
0e2b27df: Merge "Don\'t update notification layer when collapsing the panel" into lmp-dev
* commit '
0e2b27df7d672c0b765fd37b2a0d96ba6266a0d5':
Don't update notification layer when collapsing the panel
Amith Yamasani [Fri, 5 Sep 2014 16:28:18 +0000 (16:28 +0000)]
Merge "Fix current.txt (fixes build)" into lmp-dev
Akos Ludanyi [Fri, 5 Sep 2014 16:28:04 +0000 (16:28 +0000)]
Merge "Fix ProviderTestCase2 broken by ag/519661:" into lmp-dev
Amith Yamasani [Fri, 5 Sep 2014 16:27:15 +0000 (09:27 -0700)]
Fix current.txt (fixes build)
Change-Id: Iaa9272d6f32b1562c7d1fbd41e8031c0f9050953
Evan Charlton [Fri, 5 Sep 2014 16:27:58 +0000 (16:27 +0000)]
Merge "Add a constant for CHANGE_PHONE_ACCOUNTS action" into lmp-dev
Jorim Jaggi [Fri, 5 Sep 2014 16:22:24 +0000 (16:22 +0000)]
Merge "Don't update notification layer when collapsing the panel" into lmp-dev
Robert Greenwalt [Fri, 5 Sep 2014 16:20:05 +0000 (16:20 +0000)]
am
a155ef81: Merge "Fix networking API per scripting checks." into lmp-dev
* commit '
a155ef8135420584325cbe94967058b3f83e88b0':
Fix networking API per scripting checks.
Jorim Jaggi [Fri, 5 Sep 2014 16:20:01 +0000 (16:20 +0000)]
am
3dadb79a: Merge "Remove "forgot pattern" in pattern view" into lmp-dev
* commit '
3dadb79a7fe90a727568aa76744f0d0c5ea44782':
Remove "forgot pattern" in pattern view
Robert Greenwalt [Fri, 5 Sep 2014 16:17:26 +0000 (16:17 +0000)]
Merge "Fix networking API per scripting checks." into lmp-dev
Evan Charlton [Thu, 4 Sep 2014 19:38:17 +0000 (12:38 -0700)]
Add a constant for CHANGE_PHONE_ACCOUNTS action
To make life easier for developers, pull the CHANGE_PHONE_ACCOUNTS
intent action out to a constant.
Bug:
17383844
Change-Id: I6989324c8d01930cd2e2be5d7d0defea860fc718
Jorim Jaggi [Fri, 5 Sep 2014 16:12:02 +0000 (16:12 +0000)]
Merge "Remove "forgot pattern" in pattern view" into lmp-dev
Jeff Sharkey [Fri, 5 Sep 2014 01:13:39 +0000 (18:13 -0700)]
Move Size parceling to Bundle.
Size itself shouldn't be Parcelable, since that would be a layering
violation.
Bug:
17390381
Change-Id: Ica62709bd889db51c916c550a0146714b002baa3
Christoph Studer [Fri, 5 Sep 2014 16:04:30 +0000 (16:04 +0000)]
am
d6036d35: Merge "SysUI: Sort status bar notification icons" into lmp-dev
* commit '
d6036d35627f0ac3e03343b1e31108616b687eea':
SysUI: Sort status bar notification icons
Jim Miller [Fri, 5 Sep 2014 16:04:27 +0000 (16:04 +0000)]
am
8007e4a6: Merge "Send USER_PRESENT broadcast after keyguard animation finishes" into lmp-dev
* commit '
8007e4a65c2839de43b48199df9f8f3004e82c7f':
Send USER_PRESENT broadcast after keyguard animation finishes
Dharmesh Mokani [Fri, 5 Sep 2014 16:04:23 +0000 (16:04 +0000)]
am
efd4ea01: Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev
* commit '
efd4ea013b00a1b645afde65bae56dc0a8370276':
Address API review comment:AlwaysOnHotwordDetector
Christoph Studer [Fri, 5 Sep 2014 15:59:40 +0000 (15:59 +0000)]
Merge "SysUI: Sort status bar notification icons" into lmp-dev
Jim Miller [Fri, 5 Sep 2014 15:57:15 +0000 (15:57 +0000)]
Merge "Send USER_PRESENT broadcast after keyguard animation finishes" into lmp-dev
Dharmesh Mokani [Fri, 5 Sep 2014 15:56:16 +0000 (15:56 +0000)]
Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev
Evan Charlton [Fri, 5 Sep 2014 15:48:37 +0000 (15:48 +0000)]
am
55533d6a: Merge "Add a way to fetch the current connection manager" into lmp-dev
* commit '
55533d6ae24c9c270cd8b8d0277e28bb856aa096':
Add a way to fetch the current connection manager
Evan Charlton [Fri, 5 Sep 2014 15:41:23 +0000 (15:41 +0000)]
Merge "Add a way to fetch the current connection manager" into lmp-dev
Alexandra Gherghina [Fri, 5 Sep 2014 15:31:07 +0000 (15:31 +0000)]
am
e27eb3ec: Merge "Rename intent extra following API review" into lmp-dev
* commit '
e27eb3ec797a5a9621fc4eece3579bb4fcbf0363':
Rename intent extra following API review
Marcin Kosiba [Fri, 5 Sep 2014 15:31:03 +0000 (15:31 +0000)]
am
210d7b22: Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev
* commit '
210d7b224da0425b3c65888ac49abd1c6ef9f846':
Rename WebResourceRequest.hasUserGestureInsecure to hasGesture.
Chris Wren [Fri, 5 Sep 2014 15:30:59 +0000 (15:30 +0000)]
am
b59b5205: Merge "Keep contact affinities separate across users." into lmp-dev
* commit '
b59b5205ff9c784085bf6b85bceb496e608fc042':
Keep contact affinities separate across users.
Shishir Agrawal [Fri, 5 Sep 2014 15:30:56 +0000 (15:30 +0000)]
am
e90b1315: Merge "IccOpenLogicalChannelResponse: Adding final to fa few constants." into lmp-dev
* commit '
e90b1315a83fd75906fa1bc876fb2973cf6f8676':
IccOpenLogicalChannelResponse: Adding final to fa few constants.
Esteban Talavera [Fri, 5 Sep 2014 15:30:52 +0000 (15:30 +0000)]
am
2c6aa357: Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev
* commit '
2c6aa357bddb428193c0c006d9535f208b9d8903':
Changed value of EXTRAs to match constant name in code.
Anwar Ghuloum [Fri, 5 Sep 2014 15:30:49 +0000 (15:30 +0000)]
am
f8545bc6: Merge "Timing Hacks DO NOT MERGE" into lmp-dev
* commit '
f8545bc6f498e0b93f7ee42e51ea0ff05e695731':
Timing Hacks DO NOT MERGE
George Mount [Fri, 5 Sep 2014 15:30:45 +0000 (15:30 +0000)]
am
b555f0cf: Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev
* commit '
b555f0cf77c66c9d8204146c3f16e27cf83c4ed8':
Fix selection of epicenter in Activity Transitions.
George Mount [Fri, 5 Sep 2014 15:30:41 +0000 (15:30 +0000)]
am
da6df616: Merge "Fix NPE when Window disappears during a transition." into lmp-dev
* commit '
da6df616bc21eabf56ff9de8f8606898fc388e60':
Fix NPE when Window disappears during a transition.
Christoph Studer [Fri, 5 Sep 2014 15:30:37 +0000 (15:30 +0000)]
am
fa169184: Merge "NoMan: Fix speedbump for PRIORITY_MIN intrusives" into lmp-dev
* commit '
fa1691841ea52fd34b1f6c80918763e5816c25b9':
NoMan: Fix speedbump for PRIORITY_MIN intrusives
Jorim Jaggi [Fri, 5 Sep 2014 15:30:34 +0000 (15:30 +0000)]
am
6f52cfa8: Merge "Remove the scrimming of notifications" into lmp-dev
* commit '
6f52cfa8f52559fcc3c5c17348da18d18eed5655':
Remove the scrimming of notifications
Adrian Roos [Fri, 5 Sep 2014 15:30:31 +0000 (15:30 +0000)]
am
8ab59227: Merge "Reorder brightness slider mirror in front of album art" into lmp-dev
* commit '
8ab5922758bf29d1b7de82214e9b7e6c3eb7c0ee':
Reorder brightness slider mirror in front of album art
George Mount [Fri, 5 Sep 2014 15:30:27 +0000 (15:30 +0000)]
am
47229456: Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev
* commit '
472294569a26cb60d75202d5bc13e44fb040dbce':
API Review: Change SharedElementListener to SharedElementCallback.
Jorim Jaggi [Fri, 5 Sep 2014 15:30:23 +0000 (15:30 +0000)]
am
4ec48cb7: Merge "Hide notifications when occluded and disabled on keyguard" into lmp-dev
* commit '
4ec48cb7b428eef28e95ec4c6bf484d32196fa1a':
Hide notifications when occluded and disabled on keyguard
Selim Cinek [Fri, 5 Sep 2014 15:30:20 +0000 (15:30 +0000)]
am
1f49d9b3: Merge "Fixed a bug where the notifications could overlap when reset" into lmp-dev
* commit '
1f49d9b36609f9260bdf85ff3f5dc85f8af7229b':
Fixed a bug where the notifications could overlap when reset
Martin Kosiba [Fri, 5 Sep 2014 15:30:16 +0000 (15:30 +0000)]
am
c3ec88fd: Merge "Change WebView.zoomBy return type to void." into lmp-dev
* commit '
c3ec88fd433540729a4a818d4d01b21cf2106835':
Change WebView.zoomBy return type to void.
Winson Chung [Fri, 5 Sep 2014 15:30:12 +0000 (15:30 +0000)]
am
927df1c2: Merge "Generalizing Recents widget category to Search box. (Bug
17334589)" into lmp-dev
* commit '
927df1c290c65ae877b67e2383517494ee7afb68':
Generalizing Recents widget category to Search box. (Bug
17334589)
Jason Monk [Fri, 5 Sep 2014 15:30:00 +0000 (15:30 +0000)]
am
78337827: Merge "Allow downtime to exit from no interruptions" into lmp-dev
* commit '
783378274989c6d5fe032993f595e85cc58c362e':
Allow downtime to exit from no interruptions
Adrian Roos [Fri, 5 Sep 2014 15:29:57 +0000 (15:29 +0000)]
am
c5126d91: Merge changes Ibb63814e,I0322b1e6 into lmp-dev
* commit '
c5126d91e9d772f3f1ed64404746f8fe7af580a7':
Prevent full shade guesture from doing the wrong thing
Add current user announce to MultiUserSwitch
Jorim Jaggi [Fri, 5 Sep 2014 15:29:53 +0000 (15:29 +0000)]
am
162a1b42: Merge "Use material screen off animation for all devices" into lmp-dev
* commit '
162a1b4273ec8461c58925b5450392ad4920c548':
Use material screen off animation for all devices
Kenny Guy [Fri, 5 Sep 2014 15:29:50 +0000 (15:29 +0000)]
am
42484d43: Merge "Fix RemoteViews to inflate views for current user." into lmp-dev
* commit '
42484d4365201d4250ebedb2f4cd6348c626b158':
Fix RemoteViews to inflate views for current user.
Christoph Studer [Fri, 5 Sep 2014 15:29:46 +0000 (15:29 +0000)]
am
8dd353c8: Merge "SysUI: Upsort PRIORITY_MAX system notifications" into lmp-dev
* commit '
8dd353c86c38f181032b5e0135bb91707ced9832':
SysUI: Upsort PRIORITY_MAX system notifications
Winson Chung [Fri, 5 Sep 2014 15:29:42 +0000 (15:29 +0000)]
am
893fd9fc: Merge "Ensure that there is enough space for the tablet search widget. (Bug
17190069)" into lmp-dev
* commit '
893fd9fc8320806a5bf14284775e2600c85f78d2':
Ensure that there is enough space for the tablet search widget. (Bug
17190069)
Brian Carlstrom [Fri, 5 Sep 2014 15:29:39 +0000 (15:29 +0000)]
am
8a5a6aec: Merge "Fix backwards arguments to performDexOpt" into lmp-dev
* commit '
8a5a6aec125a398d7c14874a3780b27d642ee892':
Fix backwards arguments to performDexOpt
Jungshik Jang [Fri, 5 Sep 2014 15:29:35 +0000 (15:29 +0000)]
am
796603a5: Merge "Prevent sending <Feature Abort> for some messages." into lmp-dev
* commit '
796603a56b6dac4eb7c7111fec38f8b564fdb45d':
Prevent sending <Feature Abort> for some messages.
Tom O'Neill [Fri, 5 Sep 2014 15:22:47 +0000 (08:22 -0700)]
Suppress location tile in QS on lock screen
- Work around bug in QS implementation
- Bug:
15916487
Change-Id: I623a4e31e8b4187d920c2724182c927328885b3b
Alexandra Gherghina [Fri, 5 Sep 2014 15:16:01 +0000 (15:16 +0000)]
Merge "Rename intent extra following API review" into lmp-dev
Marcin Kosiba [Fri, 5 Sep 2014 15:13:39 +0000 (15:13 +0000)]
Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev
Chris Wren [Fri, 5 Sep 2014 14:58:39 +0000 (14:58 +0000)]
Merge "Keep contact affinities separate across users." into lmp-dev
Shishir Agrawal [Fri, 5 Sep 2014 14:48:19 +0000 (14:48 +0000)]
Merge "IccOpenLogicalChannelResponse: Adding final to fa few constants." into lmp-dev
Alexandra Gherghina [Fri, 5 Sep 2014 14:48:06 +0000 (15:48 +0100)]
Rename intent extra following API review
Bug:
17389968
Change-Id: Id2bd8d12019ad7a4c5a3ac8a7f76f55d06fc4dff
Esteban Talavera [Fri, 5 Sep 2014 14:46:08 +0000 (14:46 +0000)]
Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev
Chris Wren [Thu, 4 Sep 2014 19:53:52 +0000 (15:53 -0400)]
Keep contact affinities separate across users.
Also ignore people extras on USER_ALL notifications.
Bug:
16213960
Change-Id: Ic0341c88d42d4a4f12cac35c0f41c2746aec02ac
OSDN Git Service
