Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
151,276 Commits 3 Branches 0 Tags
1fb7dc0c00a72f3ded151ea41ec22b9caa3be42e
Commit Graph

43275 Commits

Author SHA1 Message Date
Jim Miller
db2fb70b19 am 752889a9: am 9af7f4f6: Merge "Update TrustAgentService API after review." into lmp-dev 
* commit '752889a944402983874e04da6f613872275aa3d0':
  Update TrustAgentService API after review.
 2014-08-22 23:28:08 +00:00
Elliott Hughes
49e927ecd6 am 8f038952: am fff90ffb: Merge "Use CLDR narrow am/pm markers." into lmp-dev 
* commit '8f0389527241cb5b8adada12b9084b5c7f38bb84':
  Use CLDR narrow am/pm markers.
 2014-08-22 23:23:52 +00:00
Jim Miller
c7639333f8 Merge "Update TrustAgentService API after review." into lmp-dev 2014-08-22 23:08:32 +00:00
Elliott Hughes
ed40256670 Merge "Use CLDR narrow am/pm markers." into lmp-dev 2014-08-22 23:02:14 +00:00
Jim Miller
d4efaac5d5 Update TrustAgentService API after review. 
Also documents timebase on related DevicePolicyManager API.

Fixes bugs 16401527 and 17046034

Change-Id: I8ee6d0055ab6f52ec71630344d3232f7875d9c1d
 2014-08-22 22:43:30 +00:00
John Spurlock
48b9ca16f6 am c7d47057: am fa0f8288: Merge "Display notification effects suppressor in the volume panel." into lmp-dev 
* commit 'c7d47057359ba66ce7ca56a20b7bcdf9af522042':
  Display notification effects suppressor in the volume panel.
 2014-08-22 22:23:15 +00:00
John Spurlock
7653a30ea0 Merge "Display notification effects suppressor in the volume panel." into lmp-dev 2014-08-22 22:09:35 +00:00
John Spurlock
b4782526f5 Display notification effects suppressor in the volume panel. 
Bug:16958514

Change-Id: I0eac173875e8af62e3c6b39001722c3fda4517de
 2014-08-22 18:08:17 -04:00
Adam Powell
9971017140 am cb3b976d: am 2ad136df: Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev 
* commit 'cb3b976da10899bc7cfcc934ebf3eae9fa5d15db':
  Fix (another) measurement issue in ActionBarContainer
 2014-08-22 21:45:38 +00:00
Matthew Williams
e94569636f am 74d65044: am d95fb7b3: Merge "JobScheduler only run jobs for started users." into lmp-dev 
* commit '74d65044fda9dedd72a7e80ec9a607bebdf5f484':
  JobScheduler only run jobs for started users.
 2014-08-22 21:24:15 +00:00
Adam Powell
c9991c7149 Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev 2014-08-22 21:20:24 +00:00
Matthew Williams
12eec2341d Merge "JobScheduler only run jobs for started users." into lmp-dev 2014-08-22 21:08:06 +00:00
Elliott Hughes
fbba4317a8 am 942b8379: am 97352608: Merge "Don\'t show the pseudolocales unless we\'re in developer mode." into lmp-dev 
* commit '942b8379bfc2418d4cc33d45928949508bb390c5':
  Don't show the pseudolocales unless we're in developer mode.
 2014-08-22 21:03:20 +00:00
Adam Powell
2b7ff72683 Fix (another) measurement issue in ActionBarContainer 
Or, the patch in which we discover how many silly bugs adamp caused in
e77b6590.

Change-Id: Iaacd3792d161e068dee74b897872e9ab2f155aca
 2014-08-22 13:57:43 -07:00
Elliott Hughes
5d04fee900 Merge "Don't show the pseudolocales unless we're in developer mode." into lmp-dev 2014-08-22 20:42:19 +00:00
Dianne Hackborn
9986e64643 am ceb86f91: am f5b988b8: Merge "Work on issue #17011123: Hit Back/Recents button when in Recents..." into lmp-dev 
* commit 'ceb86f912d9cc0cc0fa62f712b0105a5d239a973':
  Work on issue #17011123: Hit Back/Recents button when in Recents...
 2014-08-22 20:22:53 +00:00
Dianne Hackborn
250bf41b8e Merge "Work on issue #17011123: Hit Back/Recents button when in Recents..." into lmp-dev 2014-08-22 20:05:39 +00:00
Ronghua Wu
25a4b4b3dd am 4f643cf0: am 29b2d44c: Merge "VideoView: unhide setVideoURI api and add document." into lmp-dev 
* commit '4f643cf0e7736b5be31419b38890cd92d6586936':
  VideoView: unhide setVideoURI api and add document.
 2014-08-22 19:33:17 +00:00
Yigit Boyar
eb4fd4d84c am 5ebd8379: am 907b5603: Merge "Fix RTL bug for actionbar tooltips" into lmp-dev 
* commit '5ebd837951041185b53d16d71ef939fbab00a13c':
  Fix RTL bug for actionbar tooltips
 2014-08-22 19:33:12 +00:00
Ronghua Wu
306afb9142 Merge "VideoView: unhide setVideoURI api and add document." into lmp-dev 2014-08-22 19:16:58 +00:00
Yigit Boyar
1960b32434 Merge "Fix RTL bug for actionbar tooltips" into lmp-dev 2014-08-22 19:15:40 +00:00
Elliott Hughes
dee5cde1ec Don't show the pseudolocales unless we're in developer mode. 
The old zz_ZY and zz_ZZ pseudolocales are gone, replaced by ar_XB and en_XA.
The existing check for "developer mode" wasn't working, and now the
pseudolocales are there by default, we want to _remove_ them if we're not
in developer mode rather than add them if we are in developer mode.

Bug: 17190407
Change-Id: I6ee6eba53f5b816ef8e0d1768c94cd3484a196b5
 2014-08-22 11:57:15 -07:00
Adam Powell
ee84324a2a am d2c4487a: am f8e73a96: Merge "Add a missing condition when checking measurement for ActionBarContainer" into lmp-dev 
* commit 'd2c4487acc4da13e622fac86faeff024ce10acfb':
  Add a missing condition when checking measurement for ActionBarContainer
 2014-08-22 18:20:52 +00:00
Michael Wright
bbd512a4f3 am b6f74d87: am f3091f94: Merge "Add Voice Assist key." into lmp-dev 
* commit 'b6f74d877ea382a5f739b0687a34e3fd79ea12f0':
  Add Voice Assist key.
 2014-08-22 18:20:45 +00:00
Yorke Lee
6bc654e073 am c04818f7: am 82f28d2d: Merge "Update normalized phone number for contact for successful call" into lmp-dev 
* commit 'c04818f749931cedb8d59c4bd7277940752a894f':
  Update normalized phone number for contact for successful call
 2014-08-22 18:08:15 +00:00
Adam Powell
c793c9eb24 Merge "Add a missing condition when checking measurement for ActionBarContainer" into lmp-dev 2014-08-22 18:03:20 +00:00
Michael Wright
931b2e7c3a Merge "Add Voice Assist key." into lmp-dev 2014-08-22 18:02:27 +00:00
Ronghua Wu
0e9e3b213e VideoView: unhide setVideoURI api and add document. 
Bug: 16899444
Change-Id: I576a4b334d8b1fe89f93df3587386ac7f9455687
 2014-08-22 10:56:36 -07:00
Yorke Lee
eda777592b Merge "Update normalized phone number for contact for successful call" into lmp-dev 2014-08-22 17:55:49 +00:00
Adam Powell
a12aaa75df Add a missing condition when checking measurement for ActionBarContainer 
It even said "non-tab" right there.

Bug 17202141

Change-Id: Iacc7ec9610d2639aab59dd57ba7194178fb6391f
 2014-08-22 10:46:55 -07: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
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
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
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
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
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
Matthew Williams
9ae3dbeefc JobScheduler only run jobs for started users. 
BUG: 12876556
Minor changes to test app to make persisting an option.
Change-Id: I1b40347878ec5ca44cd717ebfeb544f6c58473b5
 2014-08-21 20:28:12 -07: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