Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
254,184 Commits 3 Branches 0 Tags
093adbb3304098eb8d336ff2bebef335dc94bbb1
Commit Graph

13277 Commits

Author SHA1 Message Date
Zoltan Szatmary-Ban
96489e0c2a Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117 
am: 07e232371f

* commit '07e232371f5249de1c8fe4d8ac277b22b646576c':
  Introduce system API to get source of user restriction

Change-Id: Iaec13f6b56a138b67a066c9eb1c234a7a653c4bd
 2016-05-17 15:29:25 +00:00
Zoltan Szatmary-Ban
07e232371f Merge "Introduce system API to get source of user restriction" into nyc-dev 
am: 690c2ea117

* commit '690c2ea117f90b7759ac280a1c84f5966b1e7938':
  Introduce system API to get source of user restriction

Change-Id: Iec3a08471bc56a3aec1aff43b3c7361931c13539
 2016-05-17 15:24:20 +00:00
Zoltan Szatmary-Ban
690c2ea117 Merge "Introduce system API to get source of user restriction" into nyc-dev 2016-05-17 15:16:56 +00:00
Michael Wright
56ef817f1e Merge "Remove onUhandledInputEvent API." into nyc-dev am: a1e4cbe211 
am: 9e0ff89010

* commit '9e0ff89010dd2003bc9952ffedcf0f6c8d080cbb':
  Remove onUhandledInputEvent API.

Change-Id: I067333a191a5d581f397f5e9c09f6b7feae8d1f5
 2016-05-16 15:27:37 +00:00
Michael Wright
9e0ff89010 Merge "Remove onUhandledInputEvent API." into nyc-dev 
am: a1e4cbe211

* commit 'a1e4cbe2116bef9fad7c98836926317bde95d33e':
  Remove onUhandledInputEvent API.

Change-Id: I13835ddbe40330694763d34d37e01b8deeb701d7
 2016-05-16 15:24:10 +00:00
TreeHugger Robot
a1e4cbe211 Merge "Remove onUhandledInputEvent API." into nyc-dev 2016-05-16 15:18:20 +00:00
Clara Bayarri
8bccf39875 Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev am: d34396443e 
am: 8184f2e545

* commit '8184f2e5452a8c5133da8c8d9ae957cf5182ce5a':
  Rename requestKeyboardShortcutsHelper

Change-Id: I43fd7494218d2c1662bb3647671a0f02592ffc2d
 2016-05-16 15:11:37 +00:00
Clara Bayarri
8184f2e545 Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev 
am: d34396443e

* commit 'd34396443e712a96572d26c820809a9485e57da3':
  Rename requestKeyboardShortcutsHelper

Change-Id: I0522d4d9bcfdce6b79dc672dcc0c515dc747b99d
 2016-05-16 15:08:15 +00:00
Clara Bayarri
ac6f034f2a Rename requestKeyboardShortcutsHelper 
Per API council feedback

Bug: 28775576
Change-Id: I1c4f98d7ec0d848f0c387aaedf8a0ed80628c64e
 2016-05-16 14:15:14 +01:00
Martijn Coenen
2386212c05 Merge "Address API review comments." into nyc-dev am: 9a32929def 
am: 1ffef9a239

* commit '1ffef9a239a67016607f62dfd023bf7fefb85370':
  Address API review comments.

Change-Id: I1f7da4c07988923b22bfab5689d48531cfb95aa1
 2016-05-16 09:28:57 +00:00
Martijn Coenen
1ffef9a239 Merge "Address API review comments." into nyc-dev 
am: 9a32929def

* commit '9a32929def3425c55a1bc96ea20346bf95357ae4':
  Address API review comments.

Change-Id: Ieb67cdc7846a06d84280e9ea9ca1cbe34dbff78f
 2016-05-16 09:25:58 +00:00
Martijn Coenen
9a32929def Merge "Address API review comments." into nyc-dev 2016-05-16 09:18:36 +00:00
Daniel Nishi
057a101453 Merge "Add an Activity action to go into the Deletion Helper." into nyc-mr1-dev 
am: e8ed2ed331

* commit 'e8ed2ed331a056fe2262ac649f71d781df25f363':
  Add an Activity action to go into the Deletion Helper.

Change-Id: I09b09f645b455c8a2cde7bd0eadb34b2cc704178
 2016-05-14 01:17:24 +00:00
Daniel Nishi
ac62b4b360 Add an Activity action to go into the Deletion Helper. 
Applications may want to jump to the Deletion Helper to free up
storage when the device is under storage pressure.

Bug: 28675265
Change-Id: I709c39f3e699ab5f51f4ad1272468583276ff050
 2016-05-14 00:01:33 +00:00
Adam Powell
bbb2c35902 Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev am: a6c0cc0992 
am: 46ca7d8c28

* commit '46ca7d8c288da4414f40de7e8b1d8f929816bd82':
  Add Fragment#onAttachFragment for parent fragments

Change-Id: I6862300fc5aff480c4215d66eb8c9167ed17e448
 2016-05-13 22:00:46 +00:00
Adam Powell
f1dda81c42 Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev 
am: a6c0cc0992

* commit 'a6c0cc099221a5321505b1343f623e76f52b2ad5':
  Add Fragment#onAttachFragment for parent fragments

Change-Id: I9138e3ee5706cbd35a119843f0007f548021e2f9
 2016-05-13 21:57:57 +00:00
Adam Powell
46ca7d8c28 Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev 
am: a6c0cc0992

* commit 'a6c0cc099221a5321505b1343f623e76f52b2ad5':
  Add Fragment#onAttachFragment for parent fragments

Change-Id: I04c96f7a7ecf73d63b401bb0e1e7d3900fd59310
 2016-05-13 21:57:52 +00:00
Adam Powell
e30299f990 Add Fragment#onAttachFragment for parent fragments 
Framework edition

Add a matching onAttachFragment method to Fragment to match the
fragment host version.

Bug 28760393

Change-Id: I5f50b3446449cae7110da6b4e468ee80f413e1e5
 2016-05-13 13:38:45 -07:00
Adrian Roos
d5bd2b647c Merge "DPM control for remote input when locked" into nyc-dev am: 11c8f5315b 
am: f46fdf877e

* commit 'f46fdf877ef54adc236698635967ff79d7a0dfe2':
  DPM control for remote input when locked

Change-Id: I7eb3cdf17b4a61865bfe85ae6d9c281b113aeb9f
 2016-05-12 21:01:32 +00:00
Adrian Roos
a4f8525fdc Merge "DPM control for remote input when locked" into nyc-dev 
am: 11c8f5315b

* commit '11c8f5315b195d6a63f981a7ff434fa7937ba5d3':
  DPM control for remote input when locked

Change-Id: Id7074ffdc541d53d4607652cefc4bfdecaaaa335
 2016-05-12 20:58:55 +00:00
Adrian Roos
f46fdf877e Merge "DPM control for remote input when locked" into nyc-dev 
am: 11c8f5315b

* commit '11c8f5315b195d6a63f981a7ff434fa7937ba5d3':
  DPM control for remote input when locked

Change-Id: I330777f47f51dee00623ace614271f42b6d4fca7
 2016-05-12 20:58:53 +00:00
Adrian Roos
11c8f5315b Merge "DPM control for remote input when locked" into nyc-dev 2016-05-12 20:52:26 +00:00
Tingting Wang
c8242b22ab Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev am: 752129929f 
am: 2fc6bf3936

* commit '2fc6bf3936951764569bef3256bf41823f3986d4':
  Rename CONTACT_METADATA_SYNC GService Flag.

Change-Id: Ib348fbd43a4071156894045e301554ac2631127f
 2016-05-12 17:24:34 +00:00
Tingting Wang
7531057944 Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev 
am: 752129929f

* commit '752129929fcbe8d7740d25014f7878e835d4f4ef':
  Rename CONTACT_METADATA_SYNC GService Flag.

Change-Id: I93f0b86af829eafa6e8425b360a323c48df67776
 2016-05-12 17:24:20 +00:00
Tingting Wang
2fc6bf3936 Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev 
am: 752129929f

* commit '752129929fcbe8d7740d25014f7878e835d4f4ef':
  Rename CONTACT_METADATA_SYNC GService Flag.

Change-Id: Ibef9e072b3ff5216de1802558d93e66661bd7764
 2016-05-12 17:16:17 +00:00
Tingting Wang
752129929f Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev 2016-05-12 17:11:44 +00:00
Makoto Onuki
82c64a485a Merge "Remove ShortcutManager" into nyc-dev 
am: 26edcba2c9

* commit '26edcba2c950701ff2dd8794687552bc37e4dfc8':
  Remove ShortcutManager

Change-Id: I4b99a5fe6d73400070ba5829573255283c7b7a5c
 2016-05-12 16:36:06 +00:00
Makoto Onuki
26edcba2c9 Merge "Remove ShortcutManager" into nyc-dev 2016-05-12 16:32:56 +00:00
Chris Wren
621b459306 Merge "document the return type of getImportance" into nyc-dev am: 3041d49d88 
am: 08eb83f8b0

* commit '08eb83f8b0498be7f6361113f672eabefbca689b':
  document the return type of getImportance

Change-Id: I9e8522f5a6df34ad12daa43f4ee1502ac6ffc7b7
 2016-05-12 13:03:18 +00:00
Chris Wren
08eb83f8b0 Merge "document the return type of getImportance" into nyc-dev 
am: 3041d49d88

* commit '3041d49d888cf0732c8aafb88d1d931b696b1d41':
  document the return type of getImportance

Change-Id: I03bb7490b62e749e16a417297a672769283aebdd
 2016-05-12 13:00:50 +00:00
Chris Wren
d328afff96 Merge "document the return type of getImportance" into nyc-dev 
am: 3041d49d88

* commit '3041d49d888cf0732c8aafb88d1d931b696b1d41':
  document the return type of getImportance

Change-Id: I3cf45be03a8e62ca48d25d26b9b234bb9f800146
 2016-05-12 13:00:45 +00:00
Chris Wren
3041d49d88 Merge "document the return type of getImportance" into nyc-dev 2016-05-12 12:53:51 +00:00
Makoto Onuki
538c440c33 Remove ShortcutManager 
Bug 28704708

Change-Id: If7b739adeec38d81d554fc1cf34c81194f5d67b9
 2016-05-11 14:25:55 -07:00
Adrian Roos
7f06eed7f5 DPM control for remote input when locked 
Bug: 26981262
Change-Id: I84f26ebe807e89fd56ffc3bbc7fc20f12e2f7391
 2016-05-11 19:54:09 +00:00
Julia Reynolds
35410a4128 Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad 
am: b15ecad14c

* commit 'b15ecad14c8eb9fbf00ffb82c6d5dea37dabcc80':
  Do not bundle cross user.

Change-Id: I54f3d8b36617f5a9294d119a76b19cba0b9793b2
 2016-05-11 17:29:42 +00:00
Julia Reynolds
b15ecad14c Merge "Do not bundle cross user." into nyc-dev 
am: 68a32b5aad

* commit '68a32b5aad77d0e85a877bf0b10caaf3e419d5b2':
  Do not bundle cross user.

Change-Id: Ifa9198643939c69493a0ae406f48437d3bf94bd7
 2016-05-11 17:27:03 +00:00
Julia Reynolds
47e0d29473 Merge "Do not bundle cross user." into nyc-dev 
am: 68a32b5aad

* commit '68a32b5aad77d0e85a877bf0b10caaf3e419d5b2':
  Do not bundle cross user.

Change-Id: I138954f6b417997fd2e6d7f8bd96e8c0ad7ff2a5
 2016-05-11 17:26:59 +00:00
Chris Wren
5ab5c748a8 document the return type of getImportance 
Bug: 28690726
Change-Id: I06508e9e7c38e26e84801b86d6974f01abf5dfc1
 2016-05-11 12:44:58 -04:00
Julia Reynolds
eae43fbd17 Do not bundle cross user. 
Bug: 28665081
Change-Id: I026b8a3a731183f96b45c19b95b4a0d109677a4c
 2016-05-11 10:59:53 -04:00
Joachim Sauer
ba37cf8959 Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev am: 5b40d70ced 
am: 6fcdca255a

* commit '6fcdca255ae055b516fab2c409ce0f2fd573e775':
  Fix AbstractStringBuilder gaining extra APIs.

Change-Id: Id42e935c320e2d57e7f963eef61899e44dd6a66b
 2016-05-11 09:37:52 +00:00
Joachim Sauer
6fcdca255a Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev 
am: 5b40d70ced

* commit '5b40d70ced417f1f29f8ce36bed3ecfb26278486':
  Fix AbstractStringBuilder gaining extra APIs.

Change-Id: I46085f856170dd21069934ce9f7a1b8a991bc84d
 2016-05-11 09:35:16 +00:00
Joachim Sauer
fbba5f6069 Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev 
am: 5b40d70ced

* commit '5b40d70ced417f1f29f8ce36bed3ecfb26278486':
  Fix AbstractStringBuilder gaining extra APIs.

Change-Id: Ia3cba740ca5741033d88443534b075805a153f76
 2016-05-11 09:35:13 +00:00
Joachim Sauer
5b40d70ced Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev 2016-05-11 09:25:09 +00:00
Tyler Gunn
a9cfd5dce3 Merge "Add removeExtras(String...) prototype per API review." into nyc-mr1-dev 
am: e0605a146a

* commit 'e0605a146a97adb5d420c21d3d0430c11789413f':
  Add removeExtras(String...) prototype per API review.

Change-Id: I59113c3ac737b277b422789b328b8307b214ff0d
 2016-05-11 01:23:22 +00:00
Tyler Gunn
e0605a146a Merge "Add removeExtras(String...) prototype per API review." into nyc-mr1-dev 2016-05-11 01:16:36 +00:00
Tingting Wang
e0cbda454c Rename CONTACT_METADATA_SYNC GService Flag. 
Rename it to CONTACT_METADATA_SYNC_ENABLED.

BUG 28295805

Change-Id: Ib1f735b082a2ff6cca93e377b3eaaaf7cd396b8d
 2016-05-10 17:29:00 -07:00
Tyler Gunn
071be6f42b Add removeExtras(String...) prototype per API review. 
Per API review, adding a convenience prototype of the removeExtras method.

Bug: 28295516
Change-Id: Icc0e040516c06205540c5683bde16882a73a89d6
 2016-05-10 14:52:33 -07:00
Antonio Cansado
8b2dd44f2f Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev am: dc5f558640 
am: 7598ac2aa7

* commit '7598ac2aa79f328e52e58bdaa2d8e8d858c2c463':
  Addressing API council comments on NetworkStatsManager.

Change-Id: Ia886e1ce98520c1618ba501097a2c979a628bbb4
 2016-05-10 21:08:25 +00:00
Antonio Cansado
7598ac2aa7 Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev 
am: dc5f558640

* commit 'dc5f558640da8785fabc274167ec37a0fda30cd6':
  Addressing API council comments on NetworkStatsManager.

Change-Id: I952e69e7cfbd8cebcbac7c3b19ede300e26777e8
 2016-05-10 21:05:17 +00:00
Antonio Cansado
de224ba451 Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev 
am: dc5f558640

* commit 'dc5f558640da8785fabc274167ec37a0fda30cd6':
  Addressing API council comments on NetworkStatsManager.

Change-Id: I9d884ed999b507ab172418f068c10483422643d3
 2016-05-10 21:05:16 +00:00