Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,504 Commits 3 Branches 0 Tags
e2cd6bd66e2b30d2a4f34cd825fae0802a93d299
Commit Graph

43673 Commits

Author SHA1 Message Date
Brian Carlstrom
e2cd6bd66e am d928416d: am 5b19e7f4: am 0830d164: Merge "Move SystemBackupAgent from services.jar to frameworks.jar" into lmp-dev 
* commit 'd928416d76d9c7ecefa1d289bb69e17a7948ec7e':
  Move SystemBackupAgent from services.jar to frameworks.jar
 2014-08-22 17:27:23 +00:00
Brian Carlstrom
73ee206745 am 5b19e7f4: am 0830d164: Merge "Move SystemBackupAgent from services.jar to frameworks.jar" into lmp-dev 
* commit '5b19e7f4153cb4af303eac79628ac96c500efc58':
  Move SystemBackupAgent from services.jar to frameworks.jar
 2014-08-22 17:16:14 +00:00
Brian Carlstrom
9a434ae00f Merge "Move SystemBackupAgent from services.jar to frameworks.jar" into lmp-dev 2014-08-22 17:03:49 +00:00
Kenny Guy
ff457daa0c am 983daaee: am 1b637e65: am 28088d5b: Merge "Fix notification badge when line 3 not shown." into lmp-dev 
* commit '983daaee9caeda2011d51fe8b2f9edb65504b1b8':
  Fix notification badge when line 3 not shown.
 2014-08-22 14:46:53 +00:00
Adrian Roos
7159a12b09 am 4e58c7e0: am 0fd731bd: am d7efee2a: Merge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev 
* commit '4e58c7e0b80e128eb5751e6a71e17133ff894d61':
  Only run TrustAgentServices for users with secure keyguards
 2014-08-22 14:46:45 +00:00
Kenny Guy
dabe02d6ca am 1b637e65: am 28088d5b: Merge "Fix notification badge when line 3 not shown." into lmp-dev 
* commit '1b637e652374daa50524623852fd3cdc868a8117':
  Fix notification badge when line 3 not shown.
 2014-08-22 14:37:46 +00:00
Adrian Roos
060b15a058 am 0fd731bd: am d7efee2a: Merge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev 
* commit '0fd731bd1c1572a11d119172c6b3e13e3719b568':
  Only run TrustAgentServices for users with secure keyguards
 2014-08-22 14:37:35 +00:00
Kenny Guy
91d065bcbf Merge "Fix notification badge when line 3 not shown." into lmp-dev 2014-08-22 14:20:31 +00:00
Adrian Roos
076e72554d Merge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev 2014-08-22 14:17:32 +00:00
Kenny Guy
98193ea54f Fix notification badge when line 3 not shown. 
Ongoing notifications from chrome and drive
don't have content in line 3 so profile badge
wasn't shown.
Add profile badge to large notifications which
hide line 3.

Bug: 16366324
Change-Id: Ib4f1e888674743aa8ef93b7eaceae72602d8df4d
 2014-08-22 13:30:58 +01:00
Yohei Yukawa
b31fd9c8ee am f9040f30: am 3756a2e2: am dc42737e: Remove CursorAnchorInfoRequest and related stuff 
* commit 'f9040f30f0c80b3808999a3f639537ab36644a62':
  Remove CursorAnchorInfoRequest and related stuff
 2014-08-22 09:26:20 +00:00
Yohei Yukawa
75830944a8 am 3756a2e2: am dc42737e: Remove CursorAnchorInfoRequest and related stuff 
* commit '3756a2e2b17bee21d729c99488635d7d93010ce0':
  Remove CursorAnchorInfoRequest and related stuff
 2014-08-22 09:17:28 +00:00
Yohei Yukawa
a277db28e9 Remove CursorAnchorInfoRequest and related stuff 
This CL removes CursorAnchorInfoRequest and related stuff
in favor of InputConnection.requestUpdateCursorAnchorInfo,
which is more easy to understand. This CL also deprecates
InputMethodManager#updateCursor and related stuff.

Rationale:
1. The spec of #updateCursor says that it provides the cursor
   position in local coordinates, while the input method
   requires it in the screen coordinates.
2. #updateCursor has never been enabled in AOSP, because
   InputMethodManager#isWatchingCursor always returned false.
3. There has been no way to let
   InputMethodManager#isWatchingCursor return true.
4. In L, InputMethodManager#updateCursorAnchorInfo is
   introduced to address all the issues above.

Given that we no longer need to support #updateCursor,
CursorAnchorInfoRequest is overkill when we need to convey
just a couple of parameters.

BUG: 17185263
BUG: 17182367

Change-Id: I4a577bfd02b37b9e56c80b8b41bb25afa95dd8ef
 2014-08-22 00:55:06 -07:00
Brian Carlstrom
8def5cbb3a Move SystemBackupAgent from services.jar to frameworks.jar 
Bug: 17168017
Change-Id: I89b98ca839a78eeb7fb43930e0699ee235deafad
 2014-08-21 23:15:13 -07:00
Jungshik Jang
fcf4331341 am be414987: am ebe59a04: am 952e276a: Merge "Implement interfaces for MHL scratchpad command" into lmp-dev 
* commit 'be4149872edca53245b0236b666e76564ea5c3d7':
  Implement interfaces for MHL scratchpad command
 2014-08-22 05:47:19 +00:00
Jungshik Jang
304eaeed8b am ebe59a04: am 952e276a: Merge "Implement interfaces for MHL scratchpad command" into lmp-dev 
* commit 'ebe59a04fb308713eeb5a546aa8568c7b2177937':
  Implement interfaces for MHL scratchpad command
 2014-08-22 05:38:01 +00:00
Jungshik Jang
6385953604 Merge "Implement interfaces for MHL scratchpad command" into lmp-dev 2014-08-22 05:22:47 +00:00
Chet Haase
4adb07fada am 07fcba7d: am 0a0642c3: am 18237f09: Merge "Fix docs for circular reveal" into lmp-dev 
* commit '07fcba7d03f027b6efec0cb32eb4b7bb98a7997a':
  Fix docs for circular reveal
 2014-08-22 04:37:44 +00:00
Chet Haase
9055f9250e am 0a0642c3: am 18237f09: Merge "Fix docs for circular reveal" into lmp-dev 
* commit '0a0642c310a6e9248ae16cb6e67a67ca9fe641cd':
  Fix docs for circular reveal
 2014-08-22 04:27:49 +00:00
Chet Haase
bc07081827 Merge "Fix docs for circular reveal" into lmp-dev 2014-08-22 04:12:50 +00:00
Lorenzo Colitti
f1a76832ad am 7f42fe30: am f325858e: am fa79cdb6: Merge "Rework the per-network URL API." into lmp-dev 
* commit '7f42fe3008fa6fe203da776bc118aa5f57d8829e':
  Rework the per-network URL API.
 2014-08-22 03:42:12 +00:00
Lorenzo Colitti
18bcd9561d am f325858e: am fa79cdb6: Merge "Rework the per-network URL API." into lmp-dev 
* commit 'f325858e128c77791d245a9a54aec0dbfc8665f0':
  Rework the per-network URL API.
 2014-08-22 03:35:06 +00:00
Adam Powell
7326f99852 am 9b4902d1: am c178c63a: am 4cccb38e: Merge "Directly propagate Activity titles to action bars" into lmp-dev 
* commit '9b4902d193af615f85c1d605daa6169f64030f27':
  Directly propagate Activity titles to action bars
 2014-08-22 03:19:26 +00:00
Alan Viverette
7172a77d9c am 5a658a15: am aa311e15: am 37ec02e0: Merge "Clean up nullable listeners in date and time picker delegates" into lmp-dev 
* commit '5a658a15006ea556bc75884558ef4f4eb34c1fa2':
  Clean up nullable listeners in date and time picker delegates
 2014-08-22 03:19:11 +00:00
Jeff Sharkey
e19a66bfac am 93d06c77: am b81b5176: am eae1f6bb: Merge "Guard against EOF when reading in FileBridge." into lmp-dev 
* commit '93d06c77948dd5d67bd58d3411640015110980b8':
  Guard against EOF when reading in FileBridge.
 2014-08-22 03:19:06 +00:00
Lorenzo Colitti
e258de6f9e Merge "Rework the per-network URL API." into lmp-dev 2014-08-22 03:07:28 +00:00
Adam Powell
658d324532 am c178c63a: am 4cccb38e: Merge "Directly propagate Activity titles to action bars" into lmp-dev 
* commit 'c178c63a1a4fbc80e3b632fbaa98561dc8a7e470':
  Directly propagate Activity titles to action bars
 2014-08-22 02:59:54 +00:00
Alan Viverette
c7a2d8a066 am aa311e15: am 37ec02e0: Merge "Clean up nullable listeners in date and time picker delegates" into lmp-dev 
* commit 'aa311e1599135ab48305e7cde5b219cae72d3f93':
  Clean up nullable listeners in date and time picker delegates
 2014-08-22 02:59:26 +00:00
Jeff Sharkey
cdd400aee1 am b81b5176: am eae1f6bb: Merge "Guard against EOF when reading in FileBridge." into lmp-dev 
* commit 'b81b51760e627eec388d2bbf9c27c6e8c46e28de':
  Guard against EOF when reading in FileBridge.
 2014-08-22 02:59:21 +00:00
Jungshik Jang
f424932cfb Implement interfaces for MHL scratchpad command 
1. Add sendScratchpadCommand to IHdmiControlService interface,
which is used to send scratchpad command.

2. Add IHdmiMhlScratchpadCommandListener to handle incoming
MHL scratchpad command.

Bug: 17146522

Change-Id: I8e8e743dc08a18c80867be470997ce79d3292c15
 2014-08-22 11:45:50 +09:00
Lorenzo Colitti
9f1274b7e4 Rework the per-network URL API. 
This addresses API council comments.

Bug: 17112978
Change-Id: I698b243b2b685d1f25414cee72450be3ae0c2bf0
 2014-08-21 19:09:27 -07:00
Chet Haase
4c902fa56d Fix docs for circular reveal 
Issue #17189634 API Review: reveal animation

Change-Id: Iffcec2669368fc95b50ddcba63d0f5c552f49231
 2014-08-21 18:55:38 -07:00
Eino-Ville Talvala
a71becc870 am b85a39d4: am 9c324750: am 4e6326e7: Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev 
* commit 'b85a39d44f08e558acfce676eea7bbac5447f905':
  Camera2: Fix return type of CaptureFailure#getFrameNumber
 2014-08-22 01:24:27 +00:00
Adam Powell
13c3d9622f Merge "Directly propagate Activity titles to action bars" into lmp-dev 2014-08-22 01:18:23 +00:00
Adam Powell
a557fdcfb8 Directly propagate Activity titles to action bars 
Window decor action bars already inherit window title changes if no
explicit action bar title has been set but from an Activity's
perspective setting the activity title is a stronger signal. This is
especially relevant when the activity's action bar has been provided
by the application in the form of a Toolbar.

Bug 17138048

Change-Id: Ibf042cab6bbda3dc29590c09d1a0910b6ba78870
 2014-08-21 18:05:53 -07:00
Eino-Ville Talvala
5705c8f5f2 am 9c324750: am 4e6326e7: Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev 
* commit '9c324750a37db67d00724056942cfe221ad6521f':
  Camera2: Fix return type of CaptureFailure#getFrameNumber
 2014-08-22 01:05:03 +00:00
Alan Viverette
87545c5a24 Merge "Clean up nullable listeners in date and time picker delegates" into lmp-dev 2014-08-22 01:02:02 +00:00
Jeff Sharkey
8e28c9c315 Merge "Guard against EOF when reading in FileBridge." into lmp-dev 2014-08-22 00:58:02 +00:00
Jeff Sharkey
5f1ed727e2 Guard against EOF when reading in FileBridge. 
Bug: 17183379
Change-Id: I8856fc149915281093f83f46bad64f211d134322
 2014-08-21 17:54:29 -07:00
Yin-Chia Yeh
5d2a37b1e4 am e1e8c63b: am 173871c9: am 671ab7d9: Merge "Camera2: add toString for two params classes" into lmp-dev 
* commit 'e1e8c63b9ebebb49c6016e213d8e0981113ab783':
  Camera2: add toString for two params classes
 2014-08-22 00:47:14 +00:00
Eino-Ville Talvala
2d9a18e02e Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev 2014-08-22 00:46:41 +00:00
Yin-Chia Yeh
c33f32db54 am 173871c9: am 671ab7d9: Merge "Camera2: add toString for two params classes" into lmp-dev 
* commit '173871c9cecf3a72907e73a214523a93a8b0d82c':
  Camera2: add toString for two params classes
 2014-08-22 00:38:04 +00:00
Yin-Chia Yeh
6fc6748ffb Merge "Camera2: add toString for two params classes" into lmp-dev 2014-08-22 00:20:06 +00:00
George Mount
049af94426 am d4f01e22: am 7f09ecc5: am c559e14d: Merge "Add Parent Change to ChangeTransform" into lmp-dev 
* commit 'd4f01e22a4c25e9b7b5a004d226a8fc635bf4eed':
  Add Parent Change to ChangeTransform
 2014-08-21 23:30:08 +00:00
George Mount
15da35abec am 7f09ecc5: am c559e14d: Merge "Add Parent Change to ChangeTransform" into lmp-dev 
* commit '7f09ecc574a079a6c0b2b7010f78caf61b1ced05':
  Add Parent Change to ChangeTransform
 2014-08-21 23:19:23 +00:00
George Mount
99db6030e1 Merge "Add Parent Change to ChangeTransform" into lmp-dev 2014-08-21 23:00:05 +00:00
Igor Murashkin
4e346bd375 am 07bad9d0: am f66338c2: am 54be067e: Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev 
* commit '07bad9d0dd74d93efc67138b694808cd41d134b5':
  camera2: Enable configuration failure to call #onConfigureFailed
 2014-08-21 22:55:29 +00:00
George Mount
04ff14035e am fec07efc: am ef21ecd5: am 3061f12a: Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 
* commit 'fec07efcb3bd69b24c43a6a80bad4edb45671022':
  Allow Activities to opt into using Overlay for shared elements.
 2014-08-21 22:55:24 +00:00
Dake Gu
c94e2b393f Add Parent Change to ChangeTransform 
Bug 16460123

Modified ChangeTransform to support any pivot changes.
Modified ChangeTransform to support changes between parents.

Change-Id: I6374890dab9f3d795f334b951bdb9d51d434b8ee
 2014-08-21 15:50:17 -07:00
Igor Murashkin
996020efa9 am f66338c2: am 54be067e: Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev 
* commit 'f66338c214b4f74467b3600a3fa3a5254fd9319d':
  camera2: Enable configuration failure to call #onConfigureFailed
 2014-08-21 22:45:59 +00:00