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

4453 Commits

Author SHA1 Message Date
George Mount
0e3de61f90 am cef72c8a: am 1bb44645: am 8c789490: Merge "API Review: change fragment transition methods." into lmp-dev 
* commit 'cef72c8a21a9e8d0bd0f3af42114c72935701d29':
  API Review: change fragment transition methods.
 2014-08-25 08:24:58 +00:00
Matthew Williams
d308790da6 am efd88692: am f56a5290: am fdb7e602: Merge "Implement API review feedback for JobScheduler" into lmp-dev 
* commit 'efd8869219e16506eab663dc228f4a905fa2bcf0':
  Implement API review feedback for JobScheduler
 2014-08-25 08:23:52 +00:00
George Mount
da604cc1ec Merge "API Review: change fragment transition methods." into lmp-dev 2014-08-24 18:11:07 +00:00
Matthew Williams
306908f235 Merge "Implement API review feedback for JobScheduler" into lmp-dev 2014-08-23 02:48:19 +00:00
George Mount
448bace861 API Review: change fragment transition methods. 
Bug 16959326

Change-Id: I7460ac077e81c37bbec3ed6350b6e34f7c7b6e33
 2014-08-22 17:09:05 -07:00
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
Matthew Williams
d1c06753d0 Implement API review feedback for JobScheduler 
BUG: 17005336

Took the opportunity to clean up some back-off logic

Change-Id: Ibc8ae34d1d44dd064ba071e4cbad17872f7e38cf
 2014-08-22 16:08:45 -07: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
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
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
12eec2341d Merge "JobScheduler only run jobs for started users." into lmp-dev 2014-08-22 21:08:06 +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
250bf41b8e Merge "Work on issue #17011123: Hit Back/Recents button when in Recents..." into lmp-dev 2014-08-22 20:05:39 +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
Kenny Guy
91d065bcbf Merge "Fix notification badge when line 3 not shown." into lmp-dev 2014-08-22 14:20:31 +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
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
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
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
Dianne Hackborn
6f4d61ff2e Work on issue #17011123: Hit Back/Recents button when in Recents... 
...without interacting with any of the Recents items should not bring
Home back to top

Up navigation needs to be smarter about multi-document and in the case
of being at the root of a document know to re-construct a task for
the app.

Change-Id: Ief874e46e9a9897379dda1010bcce4c5b03d82f1
 2014-08-21 17:50:42 -07: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
George Mount
7762e8e798 Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 2014-08-21 22:26:57 +00:00
George Mount
b89d5cc2c6 Allow Activities to opt into using Overlay for shared elements. 
Bug 17001227

Change-Id: Icc49a81357ee69abd2a15a1d1efcead298ab3fb7
 2014-08-21 14:30:51 -07:00
Matthew Williams
9c705edacd am 6eb4900c: am 47d59fb7: am 7a67b0c9: JobScheduler needs to flush queue on charging 
* commit '6eb4900ce1b79f78efe23c7aa14ba0d7f353d8d5':
  JobScheduler needs to flush queue on charging
 2014-08-21 21:01:57 +00:00
Matthew Williams
bafeeb9813 JobScheduler needs to flush queue on charging 
Also make it illegal to schedule a job with no constraints.
BUG: 16877705
Change-Id: Iae57286bc4f73163a7e3c9d2d531623fd50f1f72
 2014-08-21 20:37:06 +00:00
Dianne Hackborn
5aef45eca4 am 8c6c54ec: am a7d4d7bc: am ee6e179e: Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 
* commit '8c6c54ecfd281751925ff6df566e154c2f8aec60':
  Fix issue #17038762: Add API to add entries to the recents list
 2014-08-21 17:27:02 +00:00
Nicolas Prevot
2af85abffd am 2fbb6bb5: am 6815c529: am 85814a34: Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 
* commit '2fbb6bb5dd7a359efeeb9b3bc7d0e207021fdced':
  Marking the methods to get Profile/Device Owner with @SystemApi.
 2014-08-21 16:58:10 +00:00
Dianne Hackborn
198d928615 Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 2014-08-21 16:56:18 +00:00
Esteban Talavera
8a4f5c7b0e am 065746f2: am 4536f11f: am a47533ff: Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 
* commit '065746f261d1d650d0ac492ad39abdf982a170ed':
  Set last phrase for constant values of EXTRA_* fields to ALL_CAPS
 2014-08-21 16:47:22 +00:00
Esteban Talavera
80f64df7a4 am f88a7165: am ff3bcbf8: am 3e02b271: Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 
* commit 'f88a7165a7ccf18e113cce68504919ac603feb85':
  Updated documentation for setScreenCaptureDisabled()
 2014-08-21 16:47:17 +00:00
Jorim Jaggi
6dd325fd79 am bf20472c: am fa4b90b8: am af1c312d: Merge "Update notification layouts to match redlines" into lmp-dev 
* commit 'bf20472c351b3cb8a1cc32bba35b3fa7f3c65048':
  Update notification layouts to match redlines
 2014-08-21 16:47:13 +00:00
Nicolas Prevot
01e6a6fef1 Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 2014-08-21 16:33:47 +00:00
Nicolas Prevot
465acf3f3f Marking the methods to get Profile/Device Owner with @SystemApi. 
BUG: 16860239

Change-Id: I60126a8112a57e836cae3bcd9b62ebf50385f5ec
 2014-08-21 17:22:28 +01:00
Esteban Talavera
e4be1bf2be Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 2014-08-21 15:33:20 +00:00
Esteban Talavera
fc3487fe49 am 25900c0a: am 82e2dd54: am a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 
* commit '25900c0a347ae6d79efc0a96b06cf6933bd7c741':
  Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC
 2014-08-21 15:31:58 +00:00
Esteban Talavera
5cef4fa9c1 Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 2014-08-21 15:21:59 +00:00
Esteban Talavera
4d3fc0b828 am 3c736f5a: am 87d536ab: am 5f9653ce: Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev 
* commit '3c736f5a538c44e6a438157a18378abad036c75b':
  Rename get/setBlockUninstall() to get/setUninstallBlocked()
 2014-08-21 15:21:58 +00:00
Jorim Jaggi
922fb7a7db Merge "Update notification layouts to match redlines" into lmp-dev 2014-08-21 15:21:22 +00:00
Jorim Jaggi
445d3c0a6f Update notification layouts to match redlines 
Also fixes a lot of paddings and other small issues with
the notification layouts.

Bug: 15437369
Change-Id: I40b6c69afc160c498b7e2e709814b5b847f615de
 2014-08-21 17:13:55 +02:00
Esteban Talavera
2df7d1ef51 Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 2014-08-21 14:58:18 +00:00
Esteban Talavera
6f52c702fb am fd496a2c: am 50a84946: am 58dada0d: Merge "Remove setApplicationsHidden" into lmp-dev 
* commit 'fd496a2c66d6f45e0cb009e8a52360b3560cdcc4':
  Remove setApplicationsHidden
 2014-08-21 14:43:53 +00:00
Esteban Talavera
d5c5c13c85 Rename get/setBlockUninstall() to get/setUninstallBlocked() 
As requested in the API review

Bug: 17005622
Change-Id: I1332ad11e588ab3fa409f2a28222608936cb383e
 2014-08-21 15:30:13 +01:00
Esteban Talavera
8c5c373647 Merge "Remove setApplicationsHidden" into lmp-dev 2014-08-21 14:17:25 +00:00
Esteban Talavera
d469a0b9ce Set last phrase for constant values of EXTRA_* fields to ALL_CAPS 
As requested in the API review.

Bug: 17005622,16486199
Change-Id: I6f60a43fe23526cfe855d81015feb759cf643926
 2014-08-21 14:58:14 +01:00
Kenny Guy
6699748d68 resolved conflicts for merge of 06cc91a6 to master 
Change-Id: I9e66cd0f41a5b26592a802c4cacbac772d663b73
 2014-08-21 14:34:37 +01:00
Esteban Talavera
1aee98fbf3 Updated documentation for setScreenCaptureDisabled() 
As requested in the API review. Also, removed unused import.

Bug: 17005622
Change-Id: I0bc57411ec34119f64e28eaf27c32a67b45fd66f
 2014-08-21 14:03:55 +01:00
Kenny Guy
b9e468cb9d Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev 2014-08-21 10:54:26 +00:00