Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
261,999 Commits 3 Branches 0 Tags
d4e70720ef7ada2d5e040dcadd2ba47b87fdead4
Commit Graph

13834 Commits

Author SHA1 Message Date
Jim Miller
e3a46d8e81 Merge "Add fingerprint navigation to enable pulling down the statusbar" into nyc-mr1-dev am: 0991ba5b01 
am: a6ae8004c5

* commit 'a6ae8004c501f998818dc4af727b81dcc20de3f9':
  Add fingerprint navigation to enable pulling down the statusbar

Change-Id: Ie28b7098c298daeabd35af3c0bfb6b88976ddc7a
 2016-05-18 03:35:41 +00:00
Jim Miller
a6ae8004c5 Merge "Add fingerprint navigation to enable pulling down the statusbar" into nyc-mr1-dev 
am: 0991ba5b01

* commit '0991ba5b01da4560116bebaa92e30fc97e7f2879':
  Add fingerprint navigation to enable pulling down the statusbar

Change-Id: I52de480ef1a1efc335b215fdf21d9d29c05aa951
 2016-05-18 03:19:58 +00:00
Jim Miller
0991ba5b01 Merge "Add fingerprint navigation to enable pulling down the statusbar" into nyc-mr1-dev 2016-05-18 02:55:10 +00:00
Yohei Yukawa
af15c8bcae Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681 
am: bf4c8f730b

* commit 'bf4c8f730b167e5ee65ed7c59dfa1d7867b63fcc':
  Move LocaleList to avoid layering violation.

Change-Id: I78fee5269f7428e34b196573575784fc15cb1372
 2016-05-18 02:25:10 +00:00
Yohei Yukawa
bf4c8f730b Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 
am: ddaf3f4681

* commit 'ddaf3f468195e5aa47617317c08e9e2c35bcfeee':
  Move LocaleList to avoid layering violation.

Change-Id: I7dbe5c3d552a7350ab61c929f431e2a3cffdee5b
 2016-05-18 02:22:07 +00:00
Yohei Yukawa
ddaf3f4681 Merge "Move LocaleList to avoid layering violation." into nyc-dev 
am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I9132fe456a8d79569c651dac0a0bce0153444767
 2016-05-18 02:18:38 +00:00
Yohei Yukawa
13fa6b7c48 Merge "Move LocaleList to avoid layering violation." into nyc-dev 
am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I45e9b7e834d2c5e515eb6c60885296358e7d786e
 2016-05-18 02:18:29 +00:00
Yohei Yukawa
31884efd13 Merge "Move LocaleList to avoid layering violation." into nyc-dev 2016-05-18 02:14:26 +00:00
Jim Miller
f4c0a13170 Add fingerprint navigation to enable pulling down the statusbar 
Change-Id: If0584358fd615ebd9df11614c662f4f287abf5c4
 2016-05-17 18:11:52 -07:00
Andrii Kulian
5417ca597a Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev am: 47aa3f61ac 
am: 06a325c3e3

* commit '06a325c3e3b1925c2208892f13570f08e180b12c':
  DO NOT MERGE Hide decor caption APIs

Change-Id: I6eb614317b520e5a902dbc7533f3f08b68ed4861
 2016-05-18 01:00:50 +00:00
Joe Onorato
160d5c57cf Merge changes If51568c3,Idd434c19 into nyc-dev am: 45165c9373 am: 6b10cec210 
am: 269f64079b

* commit '269f64079b34eb178a33dba306d610c8dfb322c4':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: I9d6419d9c587eaca1577cef82a1ec054a6bb3d6c
 2016-05-18 00:55:42 +00:00
Hangyu Kuang
47389bce2c Merge "Hide HdrCapabilities constructor." into nyc-dev am: c189934573 am: 993f685045 
am: c936ef8af2

* commit 'c936ef8af23ae78e0f50a71c566f4d0fa1b56ea8':
  Hide HdrCapabilities constructor.

Change-Id: I168da49d4044cca71ae423813044682c17e692f7
 2016-05-18 00:55:35 +00:00
Andrii Kulian
06a325c3e3 Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev 
am: 47aa3f61ac

* commit '47aa3f61ac26195e11d7244c84bce3a1ea2dfb3f':
  DO NOT MERGE Hide decor caption APIs

Change-Id: I7654435d1b251d1349125beb0b5d4a35c81855b1
 2016-05-18 00:55:12 +00:00
Andrii Kulian
88a2a7be72 Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev 
am: 47aa3f61ac

* commit '47aa3f61ac26195e11d7244c84bce3a1ea2dfb3f':
  DO NOT MERGE Hide decor caption APIs

Change-Id: I588355b4e5ac95e4f872bf06d77fd3d3346cddac
 2016-05-18 00:55:12 +00:00
Joe Onorato
269f64079b Merge changes If51568c3,Idd434c19 into nyc-dev am: 45165c9373 
am: 6b10cec210

* commit '6b10cec2108746e15388125fdd6fa0cbfd6cb28d':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: Ifc94199cc5ad69af73871cc012aa2dac31b6f67b
 2016-05-18 00:52:32 +00:00
Joe Onorato
6f04fef272 Merge changes If51568c3,Idd434c19 into nyc-dev 
am: 45165c9373

* commit '45165c9373f1bf2dbe0c3f11b271daa24414ea35':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: Ibb36bb8d2c32c0fa8ec85eb093b8281f349158fb
 2016-05-18 00:52:11 +00:00
Andrii Kulian
47aa3f61ac Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev 2016-05-18 00:51:17 +00:00
Joe Onorato
6b10cec210 Merge changes If51568c3,Idd434c19 into nyc-dev 
am: 45165c9373

* commit '45165c9373f1bf2dbe0c3f11b271daa24414ea35':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: Id56c7ee80254eac26132956ef62b83c405a0e2f8
 2016-05-18 00:49:54 +00:00
Hangyu Kuang
c936ef8af2 Merge "Hide HdrCapabilities constructor." into nyc-dev am: c189934573 
am: 993f685045

* commit '993f68504528cffd32b5ab06998ba4bd43c3203b':
  Hide HdrCapabilities constructor.

Change-Id: I19746caa1081f6e37b8c055b1c571618ec38b93b
 2016-05-18 00:49:39 +00:00
TreeHugger Robot
45165c9373 Merge changes If51568c3,Idd434c19 into nyc-dev 
* changes:
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from
 2016-05-18 00:46:47 +00:00
Hangyu Kuang
993f685045 Merge "Hide HdrCapabilities constructor." into nyc-dev 
am: c189934573

* commit 'c1899345730ab3c4504cb314b371b4fa43ca0702':
  Hide HdrCapabilities constructor.

Change-Id: Id3e15f6d3f26634dc632caa8f775071516436cd5
 2016-05-18 00:46:35 +00:00
Hangyu Kuang
8f3e14bc92 Merge "Hide HdrCapabilities constructor." into nyc-dev 
am: c189934573

* commit 'c1899345730ab3c4504cb314b371b4fa43ca0702':
  Hide HdrCapabilities constructor.

Change-Id: I55e8a10631507c6022a68467401f66ca70cfa0be
 2016-05-18 00:46:31 +00:00
Hangyu Kuang
c189934573 Merge "Hide HdrCapabilities constructor." into nyc-dev 2016-05-18 00:42:55 +00:00
Adrian Roos
d7c7d1466a Merge "Adjust Notification APIs per API council" into nyc-dev am: 718ba309cf am: 3a0f4f4b64 
am: 16e54ef2ff

* commit '16e54ef2ffb49fe090a8059bce6494e9fba2d4fb':
  Adjust Notification APIs per API council

Change-Id: Iad10ffc7346eb3b2d3d8f9b8478f2e67bc6c641c
 2016-05-18 00:21:12 +00:00
Adrian Roos
16e54ef2ff Merge "Adjust Notification APIs per API council" into nyc-dev am: 718ba309cf 
am: 3a0f4f4b64

* commit '3a0f4f4b642087138b59a18612be437376652c92':
  Adjust Notification APIs per API council

Change-Id: I20a1e1a542f48532be1b9d71bb5fb2eb0498b395
 2016-05-18 00:17:47 +00:00
Adrian Roos
3a0f4f4b64 Merge "Adjust Notification APIs per API council" into nyc-dev 
am: 718ba309cf

* commit '718ba309cfc9bbc3bbf785bbe5dfc1049ce02d20':
  Adjust Notification APIs per API council

Change-Id: I282bb2b6e4718f7b1afb3eb418a8d37deaa457b0
 2016-05-18 00:13:14 +00:00
Adrian Roos
6cb72ee2eb Merge "Adjust Notification APIs per API council" into nyc-dev 
am: 718ba309cf

* commit '718ba309cfc9bbc3bbf785bbe5dfc1049ce02d20':
  Adjust Notification APIs per API council

Change-Id: Ic85fdd92c691f7b30cd73a9e1a7f147fcf55c3c5
 2016-05-18 00:13:07 +00:00
Yohei Yukawa
23cbe85610 Move LocaleList to avoid layering violation. 
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.

Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
 2016-05-17 16:42:58 -07:00
Adrian Roos
96b7e20ba6 Adjust Notification APIs per API council 
Also fixes a slight bug where a CharSequence extra
was retrieved as a string.

Change-Id: I8a40ab1934b8a20355c3cd4afd66a4a7b91fb517
Fixes: 28775580
Fixes: 28775582
 2016-05-17 15:35:33 -07:00
Joe Onorato
22cfef381d @hide SystemHealthManager.from 
Bug: 28820055
Change-Id: Idd434c196428178e2c66facea36a7e010246611c
 2016-05-17 15:29:51 -07:00
Hangyu Kuang
1e7d1aa6a6 Hide HdrCapabilities constructor. 
Bug:25684127
Change-Id: I1a30ab3c162d8891c8aea1447757c85942033a0d
 2016-05-17 14:21:01 -07:00
Andrii Kulian
5c96320e40 DO NOT MERGE Hide decor caption APIs 
Hiding the APIs for now since we're not releasing freeform yet and it's
better not to expose them now in case we'll decide to change them later.

Bug: 28774476
Change-Id: Ic2de33c5a611a515fc1c72535587ebf2e0a03a7f
 2016-05-17 20:56:24 +00:00
Jae Seo
7128f82cea Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev am: 7996b96311 am: 3488ed71d2 
am: d0006f584f

* commit 'd0006f584fb8c5ff2283d6211bbc957b96065243':
  TIF: Throw a more appropriate runtime exception when building TvInputInfo

Change-Id: Ifc07ec617b326bc29e7126116aa2a33a9d635bee
 2016-05-17 19:10:29 +00:00
Jae Seo
d0006f584f Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev am: 7996b96311 
am: 3488ed71d2

* commit '3488ed71d26b62ec7f4f5f6e8a02a19ba4440ab6':
  TIF: Throw a more appropriate runtime exception when building TvInputInfo

Change-Id: Iac43c8b1fb1484ea0b66080f941d247b116dcff5
 2016-05-17 18:58:53 +00:00
Jae Seo
b2e2d2686d Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev 
am: 7996b96311

* commit '7996b96311eec2343c16d3677fb834d2ec7cf082':
  TIF: Throw a more appropriate runtime exception when building TvInputInfo

Change-Id: I99540dd3060f1fe8467ac8207976e420c8b7635f
 2016-05-17 18:55:39 +00:00
Jae Seo
3488ed71d2 Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev 
am: 7996b96311

* commit '7996b96311eec2343c16d3677fb834d2ec7cf082':
  TIF: Throw a more appropriate runtime exception when building TvInputInfo

Change-Id: Ic7a930eb85984bab3e4a83ffa02ad30c30a568cf
 2016-05-17 18:51:02 +00:00
TreeHugger Robot
7996b96311 Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev 2016-05-17 18:45:44 +00:00
Makoto Onuki
1b537cc623 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev am: 8295332d83 
am: 37d5cb3181

* commit '37d5cb3181b4fc94b5e180f1a011330b893fcd84':
  ShortcutManager: API changes for DR

Change-Id: Id585b05388cb487aba19f5c7fee3e13bd467e808
 2016-05-17 18:20:19 +00:00
Makoto Onuki
37d5cb3181 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev 
am: 8295332d83

* commit '8295332d83d1e664a7ef3a731370ae71242688a1':
  ShortcutManager: API changes for DR

Change-Id: I0006667d4bbe2fa92015ac442ae1e8362cbcacbd
 2016-05-17 18:14:39 +00:00
Makoto Onuki
8295332d83 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev 2016-05-17 18:01:29 +00:00
Phil Weaver
2a72e8b390 Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7 am: 11ece94702 
am: 3070a2a97c

* commit '3070a2a97c40f78b0f716a92b8428ea9815d3d83':
  Hide UiAutomation#destroy as test api.

Change-Id: I81b65ece02a7b48bbc93d12f032af2bc8cced820
 2016-05-17 17:41:19 +00:00
Phil Weaver
bcaaac3ea1 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 
am: 89d3ba72b7

* commit '89d3ba72b7f3318d8911b136af306375051c828a':
  Hide UiAutomation#destroy as test api.

Change-Id: Ie68602fc2b301430dcfa98d4b61515f2014db71a
 2016-05-17 17:36:17 +00:00
Phil Weaver
3070a2a97c Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7 
am: 11ece94702

* commit '11ece94702f68f96af44cf7aafca462709bf4937':
  Hide UiAutomation#destroy as test api.

Change-Id: I06c78c7bb99268ea3fd559990d2acde3e611f3ab
 2016-05-17 17:35:24 +00:00
Phil Weaver
11ece94702 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 
am: 89d3ba72b7

* commit '89d3ba72b7f3318d8911b136af306375051c828a':
  Hide UiAutomation#destroy as test api.

Change-Id: I91cbc4571a110be81f1c25fc0f19fed81d3b2819
 2016-05-17 17:32:24 +00:00
Phil Weaver
89d3ba72b7 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 2016-05-17 17:27:01 +00:00
Jae Seo
18c0cfb075 TIF: Throw a more appropriate runtime exception when building TvInputInfo 
Bug: 28775591
Change-Id: I934c8d7fed3dda356cdc3bafe51a79f585918ed0
 2016-05-17 10:06:36 -07:00
Zoltan Szatmary-Ban
e0267426c2 Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117 am: 07e232371f 
am: 96489e0c2a

* commit '96489e0c2a370b970fc243a23ccfb3e0a73d0298':
  Introduce system API to get source of user restriction

Change-Id: Id368f8b1a096a86195097ba87a18539f0558a72a
 2016-05-17 15:33:28 +00:00
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
fc66ec971c 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: Iab98753f85774d741c5126395d56af194c8b0ca8
 2016-05-17 15:23:59 +00:00