Commit Graph

9305 Commits

Author SHA1 Message Date
Selim Cinek
0efe38d743 Merge "Made the Chronometer able to count downwards" into nyc-dev am: f1c6371587
am: 5cf8722f94

* commit '5cf8722f94021f0eb5078fceece80182a65144a8':
  Made the Chronometer able to count downwards
2016-02-23 01:18:13 +00:00
Selim Cinek
f1c6371587 Merge "Made the Chronometer able to count downwards" into nyc-dev 2016-02-23 00:55:26 +00:00
Jae Seo
c412e925c4 Merge "TIF: Add android.permission.READ_TV_LISTINGS" into nyc-dev am: af326ed2b9
am: 43ddc14d5d

* commit '43ddc14d5da7e9432d4847fe3485a5cd42b783cc':
  TIF: Add android.permission.READ_TV_LISTINGS
2016-02-23 00:14:11 +00:00
Selim Cinek
ed1a33cc86 Made the Chronometer able to count downwards
Bug: 26862188
Change-Id: I3a4a34ffccdbcbcb8001b1894ce47bb75b11821d
2016-02-22 15:56:56 -08:00
Jae Seo
af326ed2b9 Merge "TIF: Add android.permission.READ_TV_LISTINGS" into nyc-dev 2016-02-22 23:44:48 +00:00
Shawn Willden
d76e2855e5 Merge "Revert "Add option to allow key validity after fingerprint enrollment."" into nyc-dev am: b094ebf18a
am: c7c55dbc67

* commit 'c7c55dbc67fab095441a7e15c3755e663d5d4dc8':
  Revert "Add option to allow key validity after fingerprint enrollment."
2016-02-22 23:15:17 +00:00
Shawn Willden
b094ebf18a Merge "Revert "Add option to allow key validity after fingerprint enrollment."" into nyc-dev 2016-02-22 23:00:50 +00:00
Shawn Willden
512c132f49 Revert "Add option to allow key validity after fingerprint enrollment."
This reverts commit ada0fc1b05.

Change-Id: I934b6e6af49ab680af726c544f0193dfcb80054e
2016-02-22 22:59:34 +00:00
Shawn Willden
1ab6e33f23 Merge "Add option to allow key validity after fingerprint enrollment." into nyc-dev am: 272fe13331
am: 718dce52eb

* commit '718dce52eb1a32fcc0d366f2244267e6a7cb35f2':
  Add option to allow key validity after fingerprint enrollment.
2016-02-22 21:26:20 +00:00
Shawn Willden
272fe13331 Merge "Add option to allow key validity after fingerprint enrollment." into nyc-dev 2016-02-22 20:12:42 +00:00
Donghyun Cho
53df72c2d2 Merge "MediaSession: Add new methods for preparing media content" into nyc-dev am: f3db5743b9
am: e53db46568

* commit 'e53db46568f2a7830e5fe1d8ddd69d8c0dfb89b7':
  MediaSession: Add new methods for preparing media content
2016-02-22 03:46:43 +00:00
Donghyun Cho
f3db5743b9 Merge "MediaSession: Add new methods for preparing media content" into nyc-dev 2016-02-22 03:38:55 +00:00
Jae Seo
ed76f3509d TIF: Add android.permission.READ_TV_LISTINGS
Bug: 21959866
Change-Id: I6f30289f8660ed8d268bb9138c32d9c6a95bb0b9
2016-02-20 02:17:39 -08:00
Lifu Tang
67684c1f32 Merge "Finalized GPS=>GNSS changes with documents" into nyc-dev am: 116229b797
am: 5675956499

* commit '56759564997fb16da235979bb9ef1c467e5f40e8':
  Finalized GPS=>GNSS changes with documents
2016-02-20 08:44:11 +00:00
Lifu Tang
116229b797 Merge "Finalized GPS=>GNSS changes with documents" into nyc-dev 2016-02-20 04:58:17 +00:00
Lifu Tang
9363b949a1 Finalized GPS=>GNSS changes with documents
Bug: 27098594
Change-Id: I24529e60d8eb9b48b644cf01e5efc684e6f04839
2016-02-19 16:59:28 -08:00
Selim Cinek
65d25ad4d2 Merge "Add support for custom media notifications" into nyc-dev am: c68190ae90
am: 147ad1680b

* commit '147ad1680bc313f3b30abad7e78db174b7499227':
  Add support for custom media notifications
2016-02-19 23:42:35 +00:00
Selim Cinek
10bfbf6261 Merge "Added the possibility to show custom notifications decorated." into nyc-dev am: 3c306d8acd
am: 3145572f64

* commit '3145572f64eed125d8eba856a4552e98d61af263':
  Added the possibility to show custom notifications decorated.
2016-02-19 23:16:59 +00:00
Selim Cinek
c68190ae90 Merge "Add support for custom media notifications" into nyc-dev 2016-02-19 23:04:42 +00:00
Selim Cinek
3c306d8acd Merge "Added the possibility to show custom notifications decorated." into nyc-dev 2016-02-19 23:03:38 +00:00
Jason Monk
4bc0d84771 Merge changes Iaf1ee1e6,I861cb65d into nyc-dev am: d2308771f0
am: b134b53f38

* commit 'b134b53f383d7850c68da4a270102ca37322ba35':
  Add TileService settings API
  Add QS long-press -> Settings
2016-02-19 22:07:46 +00:00
Jason Monk
724214a878 Add TileService settings API
It will be used for long-clicks on TileServices when available.
Otherwise will default back to app info for the app providing the
tile.

Bug: 27269699
Change-Id: Iaf1ee1e6fe6e1357cda32c74bfdc0c26af0f5901
2016-02-19 16:43:00 -05:00
Selim Cinek
03eb3b7c44 Add support for custom media notifications
Custom media notifications can now also be decorated by the system
instead of going fully custom.

Bug: 26961842
Change-Id: I1d85a652b93f10988939b471a14b372671acfaf1
2016-02-19 11:54:42 -08:00
Selim Cinek
593610c248 Added the possibility to show custom notifications decorated.
Bug: 26961842
Change-Id: I3966a4e6ecb05b9f284ec5b244b2594f78bcb337
2016-02-19 11:52:12 -08:00
Julia Reynolds
53faf747f6 Merge "Remove Notification Topics." into nyc-dev am: 73d96fb4bb
am: f7f055e407

* commit 'f7f055e40709d8de6bad8f4384f4dc59adceb213':
  Remove Notification Topics.
2016-02-19 19:32:13 +00:00
Julia Reynolds
73d96fb4bb Merge "Remove Notification Topics." into nyc-dev 2016-02-19 19:17:25 +00:00
Lajos Molnar
a8be884d0b Merge "media: expose audio sample format in MediaFormat" into nyc-dev am: 0ab076c5c9
am: 4474a5cd4b

* commit '4474a5cd4b6b55e14048515be5a04ba438f60e90':
  media: expose audio sample format in MediaFormat
2016-02-19 18:56:54 +00:00
Lajos Molnar
0ab076c5c9 Merge "media: expose audio sample format in MediaFormat" into nyc-dev 2016-02-19 18:47:06 +00:00
Narayan Kamath
0762586970 Merge "Track libcore commit aaebe4e16c487da7555cd230265acc211389781d." into nyc-dev am: 92584673d6
am: f6abd1555e

* commit 'f6abd1555e273ec7e1269267aa89317ac878c4ca':
  Track libcore commit aaebe4e16c487da7555cd230265acc211389781d.
2016-02-19 13:56:48 +00:00
Narayan Kamath
92584673d6 Merge "Track libcore commit aaebe4e16c487da7555cd230265acc211389781d." into nyc-dev 2016-02-19 13:46:38 +00:00
Narayan Kamath
02545f5dd2 Track libcore commit aaebe4e16c487da7555cd230265acc211389781d.
bug: 27186457
Change-Id: Ibd7d246893d9a97c8eea0e80d181cf2a5313b2d3
2016-02-19 11:41:27 +00:00
Yohei Yukawa
9da8464a0b Merge "Introduce InputConnection#getHandler()." into nyc-dev am: 116d872d9c
am: 887f7c0fe3

* commit '887f7c0fe3b6d8b08e8b53638bbfecc1de2b7f8f':
  Introduce InputConnection#getHandler().
2016-02-19 02:59:19 +00:00
Yohei Yukawa
116d872d9c Merge "Introduce InputConnection#getHandler()." into nyc-dev 2016-02-19 02:36:50 +00:00
Dongwon Kang
6aeca36685 Merge "TIF: Unhide TvContract.Programs.Genres#isCanonical" into nyc-dev am: ca601d9303
am: d98c06cad3

* commit 'd98c06cad34c57eb783d7d61a73d797b7be5deee':
  TIF: Unhide TvContract.Programs.Genres#isCanonical
2016-02-19 00:08:09 +00:00
Dongwon Kang
ca601d9303 Merge "TIF: Unhide TvContract.Programs.Genres#isCanonical" into nyc-dev 2016-02-18 23:54:51 +00:00
Dongwon Kang
d16d1f519b TIF: Unhide TvContract.Programs.Genres#isCanonical
Bug: 25726917
Change-Id: I8717b1c9f39f8b5b9196658c1501d5abf2337eb9
2016-02-18 15:42:09 -08:00
Christopher Tate
a836c545c3 Keyguard wallpaper am: be132e6ea4
am: 15e95000b1

* commit '15e95000b18086fc4f5dd948207a8fa863492852':
  Keyguard wallpaper
2016-02-18 23:16:51 +00:00
Christopher Tate
be132e6ea4 Keyguard wallpaper
Clients can now set a lock-only wallpaper that Keyguard can
observe and choose to draw as appropriate.

Bug 25454162

Change-Id: I3fc30e02919e814b55dfded2a1a36ad9d2e55299
2016-02-18 15:01:02 -08:00
Shawn Willden
ada0fc1b05 Add option to allow key validity after fingerprint enrollment.
Bug: 21563854
Change-Id: I4f601e59fbfcd601e6a80ddcbc7b83ced6cc18c8
2016-02-18 15:13:50 -07:00
Chris Tate
a9520351bb Merge "Add android:backupInForeground" into nyc-dev am: 40d8823dd3
am: eced804d01

* commit 'eced804d011c763728f231c2c64f02de2c945edc':
  Add android:backupInForeground
2016-02-18 21:59:52 +00:00
Christopher Tate
43fbc5f898 Add android:backupInForeground
An app can now declare that it really needs to be backed up
whenever possible even if it is currently engaged in foreground-
equivalent work.  Only applies to full-data backup clients: key/value
backups are not intrusive on normal lifecycle so they can already
happen in such circumstances.

Bug 26790411

Change-Id: Ia0ebcc7a53da888ae9ae4d63cd4bcab6e3a2e866
2016-02-18 20:47:36 +00:00
Sudheer Shanka
47dafc978a Merge "Update ACTION_SHOW_ADMIN_SUPPORT_DETAILS action to be hidden." into nyc-dev am: af9c30aa74
am: 19e2adac15

* commit '19e2adac15d36e7307c275e253ae998536e539a6':
  Update ACTION_SHOW_ADMIN_SUPPORT_DETAILS action to be hidden.
2016-02-18 18:54:06 +00:00
Shawn Willden
291c7ddc33 Merge "Add support for extending key validity while on body." into nyc-dev am: 0f900c02d9
am: b838736b6e

* commit 'b838736b6eea75bb652b2bd7724979074c37d502':
  Add support for extending key validity while on body.
2016-02-18 18:45:34 +00:00
Jeff Sharkey
2c1ba9a961 Make BackupManager encryption aware.
Backup requires both CE and DE storage to be available, so delay
spinning up the backup system until the user is unlocked, since
that's when CE storage becomes available.  Note that devices without
FBE immediately transition USER_SYSTEM into the unlocked state,
since their CE is always available.

Offer to backup and restore files under both CE and DE.  Since DE
is effectively the same as CE, most logic is simply duplicated for
now, but it could be simplified in the future.  Since system apps
can force their default storage location to DE, we always build
explicit CE and DE paths.

Add getDataDir() to give clean access to the top-level private data
directory, but disclaim that apps shouldn't create files there.

Bug: 26279618
Change-Id: Ic34a4b330223725db93b1d0f5c9dffc88002c61f
2016-02-18 10:54:11 -07:00
Jeff Sharkey
7368938550 Merge "Make BackupManager encryption aware." 2016-02-18 17:38:42 +00:00
Sudheer Shanka
af9c30aa74 Merge "Update ACTION_SHOW_ADMIN_SUPPORT_DETAILS action to be hidden." into nyc-dev 2016-02-18 13:58:05 +00:00
Julia Reynolds
ef37f28436 Remove Notification Topics.
Bug: 23220370
Change-Id: Ifbcdbab1cf6974c192483091512f75762784a98e
2016-02-18 08:55:33 -05:00
Shawn Willden
0f900c02d9 Merge "Add support for extending key validity while on body." into nyc-dev 2016-02-18 12:51:50 +00:00
Shawn Willden
adef49640d Add support for extending key validity while on body.
Bug: 21563854
Change-Id: I3b622d2af77ec4ac3ba42407fc391112c153ef0f
2016-02-18 05:50:21 -07:00
Sudheer Shanka
aebd5dd786 Update ACTION_SHOW_ADMIN_SUPPORT_DETAILS action to be hidden.
Bug: 27225657
Change-Id: I85ad8bf88845e9164011b303ec9ca90d993fc20e
2016-02-18 12:39:57 +00:00