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

43721 Commits

Author SHA1 Message Date
Jim Miller
ed741c0918 am 9cb8e236: am 752889a9: am 9af7f4f6: Merge "Update TrustAgentService API after review." into lmp-dev 
* commit '9cb8e236fcb386701f5be9f18465bc304bb46c19':
  Update TrustAgentService API after review.
 2014-08-22 23:37:41 +00:00
Elliott Hughes
a70a6f03f8 am aa89f35f: am 8f038952: am fff90ffb: Merge "Use CLDR narrow am/pm markers." into lmp-dev 
* commit 'aa89f35f18385635b4fb57db7a18db9aa3620ebb':
  Use CLDR narrow am/pm markers.
 2014-08-22 23:33:18 +00:00
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
d8e885c8ea am 92e19ff2: am c7d47057: am fa0f8288: Merge "Display notification effects suppressor in the volume panel." into lmp-dev 
* commit '92e19ff2a2559a67e8108b9e41b5d17a66bb86ed':
  Display notification effects suppressor in the volume panel.
 2014-08-22 22:37:32 +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
b17974ee48 am 5deccb85: am cb3b976d: am 2ad136df: Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev 
* commit '5deccb852328dd2c0ce2d307740bbe765bd83e25':
  Fix (another) measurement issue in ActionBarContainer
 2014-08-22 21:53:35 +00: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
0b96e42706 am 7dc5efe2: am 74d65044: am d95fb7b3: Merge "JobScheduler only run jobs for started users." into lmp-dev 
* commit '7dc5efe28c1b052aa3a8f5d7d60653906f76cbce':
  JobScheduler only run jobs for started users.
 2014-08-22 21:45:08 +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
Elliott Hughes
41dc513aad am ad596491: am 942b8379: am 97352608: Merge "Don\'t show the pseudolocales unless we\'re in developer mode." into lmp-dev 
* commit 'ad596491749d7e167282b06699476bd110d88ab2':
  Don't show the pseudolocales unless we're in developer mode.
 2014-08-22 21:13:43 +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
bd79bf6794 am 33c25243: am ceb86f91: am f5b988b8: Merge "Work on issue #17011123: Hit Back/Recents button when in Recents..." into lmp-dev 
* commit '33c25243e9d3d3095e9bdadc0da8d5956dcca820':
  Work on issue #17011123: Hit Back/Recents button when in Recents...
 2014-08-22 20:34:27 +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
2cd71b9780 am 71495cd3: am 4f643cf0: am 29b2d44c: Merge "VideoView: unhide setVideoURI api and add document." into lmp-dev 
* commit '71495cd3f19c64d9256d2ad90f2804725b525ade':
  VideoView: unhide setVideoURI api and add document.
 2014-08-22 19:42:36 +00:00
Yigit Boyar
d37fe49803 am 03f2d323: am 5ebd8379: am 907b5603: Merge "Fix RTL bug for actionbar tooltips" into lmp-dev 
* commit '03f2d323583ee65058d80e4888ee72e0a52f6891':
  Fix RTL bug for actionbar tooltips
 2014-08-22 19:42:32 +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
b9c66f78dd am 8a2628e8: am d2c4487a: am f8e73a96: Merge "Add a missing condition when checking measurement for ActionBarContainer" into lmp-dev 
* commit '8a2628e8b388ef2d98402b2bb71273de611a9fa2':
  Add a missing condition when checking measurement for ActionBarContainer
 2014-08-22 18:31:00 +00:00
Michael Wright
0ac9f5f279 am abff172e: am b6f74d87: am f3091f94: Merge "Add Voice Assist key." into lmp-dev 
* commit 'abff172efc64b2922319041802402760c77b3332':
  Add Voice Assist key.
 2014-08-22 18:30:56 +00: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
21a82eba19 am 3eda44ed: am c04818f7: am 82f28d2d: Merge "Update normalized phone number for contact for successful call" into lmp-dev 
* commit '3eda44ed63b706dbb5fd919386aaafad71a445ef':
  Update normalized phone number for contact for successful call
 2014-08-22 18:16:28 +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
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