Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,529 Commits 3 Branches 0 Tags
d306fda1c7513768bb80ffb234ee4d03a9fdcfc8
Commit Graph

13369 Commits

Author SHA1 Message Date
Chad Brubaker
be04f7247a Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387 
am: 76d3d8590d

* commit '76d3d8590d1fb9a9c341159fbc06914ef19bdb8d':
  Use an attribute for the network security config resource

Change-Id: I15da47a2cd78dc37019bd20847d13248612c77f5
 2016-05-23 02:38:19 +00:00
Chad Brubaker
76d3d8590d Merge "Use an attribute for the network security config resource" into nyc-dev 
am: 6812bdf387

* commit '6812bdf38797101d3744befe70f3501b75f01ce6':
  Use an attribute for the network security config resource

Change-Id: I2236b69a2af2258e7600a4833fe7be95f64e6260
 2016-05-23 02:32:19 +00:00
TreeHugger Robot
6812bdf387 Merge "Use an attribute for the network security config resource" into nyc-dev 2016-05-23 02:23:26 +00:00
Sanket Padawe
c4a4de836e Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev 
am: 096e99e25c

* commit '096e99e25ce30dbd7a86d6cd543e27a087fbb243':
  Add new TelephonyManager api to query Telephony metrics.

Change-Id: I5ba87e5c4e8c1b901f6ec98c94fed283aab24a36
 2016-05-20 16:52:40 +00:00
Sanket Padawe
096e99e25c Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev 2016-05-20 16:47:05 +00:00
Tony Mak
880f65e852 Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review am: 53b5df43b4 
am: 2a63190228

* commit '2a6319022861f8c2fce74b5657d78c008b33115a':
  Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: Ifdd53fc5fc836fc07239e5ad2f7ba00b5c8b976a
 2016-05-20 16:05:04 +00:00
Tony Mak
2a63190228 Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review 
am: 53b5df43b4

* commit '53b5df43b49b191e442c4d2c7b9a9cba3ebdcf92':
  Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: I24a866a5947a20127f3b79e2e75ba0cf534b450c
 2016-05-20 16:01:00 +00:00
Tony Mak
f8c0ddcddf Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review 
am: 53b5df43b4

* commit '53b5df43b49b191e442c4d2c7b9a9cba3ebdcf92':
  Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: I92a8e1e1452ecc80d422c0905a4b86089d24e80b
 2016-05-20 15:46:19 +00:00
Tony Mak
53b5df43b4 Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review 
TODO: After updating all places that use the SDK, remove/hide the old API

Bug: 28842878

Change-Id: I131be644439080dd0507cd10d8bd6618246ee7ad
 2016-05-20 15:39:38 +00:00
Ta-wei Yen
df858672ba Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913 
am: 93ad8c6b2f

* commit '93ad8c6b2f9b6610989ef8d37e62f7b66e6f6c11':
  Hide VoicemailContract.setQuota()

Change-Id: Ibce8e2d08074ea44e22a0b3a9fc596ebdb78740e
 2016-05-20 01:14:01 +00:00
Ta-wei Yen
f652b1ec42 Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b164f 
am: 621b68a213

* commit '621b68a2136b644734292655228503c42a541576':
  Rename visual voicemail sync intent value

Change-Id: Ia517f7c596e8d1d1dc055ea081950328faf4f34f
 2016-05-20 01:11:34 +00:00
Ta-wei Yen
ba9b910bbc Merge "Hide VoicemailContract.setQuota()" into nyc-dev 
am: 4f2a1d0913

* commit '4f2a1d09133f133ac23b99485713a5ea5b7ea43c':
  Hide VoicemailContract.setQuota()

Change-Id: I11017309443435f9fe840c72deada0c7984f5ce9
 2016-05-20 01:07:56 +00:00
Ta-wei Yen
93ad8c6b2f Merge "Hide VoicemailContract.setQuota()" into nyc-dev 
am: 4f2a1d0913

* commit '4f2a1d09133f133ac23b99485713a5ea5b7ea43c':
  Hide VoicemailContract.setQuota()

Change-Id: Ifc1365650a981130a376ef253e96331595475510
 2016-05-20 01:07:52 +00:00
Ta-wei Yen
7220c75f65 Merge "Rename visual voicemail sync intent value" into nyc-dev 
am: 0f712b164f

* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
  Rename visual voicemail sync intent value

Change-Id: I677dcd6e8261dfdbf4ab203ef1232f9f599a0687
 2016-05-20 01:06:04 +00:00
Ta-wei Yen
621b68a213 Merge "Rename visual voicemail sync intent value" into nyc-dev 
am: 0f712b164f

* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
  Rename visual voicemail sync intent value

Change-Id: I3c842deef20bcc0258affa2ca7d2241502ec49f6
 2016-05-20 01:06:03 +00:00
Ta-wei Yen
4f2a1d0913 Merge "Hide VoicemailContract.setQuota()" into nyc-dev 2016-05-20 01:00:30 +00:00
Ta-wei Yen
0f712b164f Merge "Rename visual voicemail sync intent value" into nyc-dev 2016-05-20 01:00:04 +00:00
Chad Brubaker
c845b2a21c Use an attribute for the network security config resource 
Originally we went with the meta-data approach to make unbundling
easier, however with the amount of platform changes that the config
ended up relying on it would be better to focus on exposing it through
the platform.

Bug:28763009
Change-Id: Iaf80001b1980220cd2e1e05faf2dc86af41700e1
 2016-05-19 17:25:41 -07:00
Christopher Tate
2b2ad77fdb Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev 
am: 9d37bdcb91

* commit '9d37bdcb91dffbfeebc45ef5ae7724c556cb6864':
  Incorporate feedback on new wallpaper-related APIs

Change-Id: I0dce83effbb05d52e2bcfb6f0ff48badbab71655
 2016-05-19 19:44:42 +00:00
Chris Tate
2467a7fe90 Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev am: 9d37bdcb91 
am: 3de573733c

* commit '3de573733c05d204589d9c56fb26fbb985ecc060':
  Incorporate feedback on new wallpaper-related APIs

Change-Id: I7cbca080286f54040782c79eab57f2285cee222d
 2016-05-19 19:44:15 +00:00
Christopher Tate
3de573733c Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev 
am: 9d37bdcb91

* commit '9d37bdcb91dffbfeebc45ef5ae7724c556cb6864':
  Incorporate feedback on new wallpaper-related APIs

Change-Id: Iea24b4a97c72248c185f8756b8b74b8b60f3c05f
 2016-05-19 19:38:48 +00:00
Ta-wei Yen
467f067c8c Hide VoicemailContract.setQuota() 
This method is a helper for internal use only.

+ Updated docs for QUOTA_OCCUPIED, QUOTA_TOTAL, and QUOTA_UNAVAILABLE.

Change-Id: Ib146926cd2bff50affe970a0123bcbec62ac3e70
Fixes:28842445
 2016-05-19 12:02:25 -07:00
Christopher Tate
98d609ce3f Incorporate feedback on new wallpaper-related APIs 
- Documentation
- Method naming
- Throwing exceptions rather than returning zero/null/false on input failures

Bug 28773334

Change-Id: Ia41c1e31c76b7114f3ffeb16033384cac5a1031d
 2016-05-19 10:33:22 -07:00
Michael Wright
5d2ea237d4 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a 
am: 1831ca8f04

* commit '1831ca8f04e117a49227e1b3dc0c8ba1dde06cd5':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: Iebfbc1de1bbf2f86e62ed2105c30e89239368b11
 2016-05-19 15:23:45 +00:00
Michael Wright
1831ca8f04 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I20532a3148a99d4ea91ba7dc050f8669d5f19400
 2016-05-19 15:12:30 +00:00
Michael Wright
ce290a75f2 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I03543851263b7e9e2f84b179d66d3d269c48bf6c
 2016-05-19 15:12:29 +00:00
TreeHugger Robot
a1e0cebf3a Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:36 +00:00
Andrii Kulian
c59e70d520 Merge "Rename minWidth/Height attributes" into nyc-dev am: 42b3acf9d3 
am: 81ce16a2e6

* commit '81ce16a2e690fbe808ae4546e0c9b814a7ff2e3d':
  Rename minWidth/Height attributes

Change-Id: I927c32ddf2522de03c6b5a75aa6b80537adf1d38
 2016-05-19 01:53:09 +00:00
Andrii Kulian
1699b51cbe Merge "Rename minWidth/Height attributes" into nyc-dev 
am: 42b3acf9d3

* commit '42b3acf9d3eed15324bfa67e92ad751a10e45718':
  Rename minWidth/Height attributes

Change-Id: Id7d89884ea46b3900459af10f5b4a4b32139ddd8
 2016-05-19 01:48:29 +00:00
Andrii Kulian
81ce16a2e6 Merge "Rename minWidth/Height attributes" into nyc-dev 
am: 42b3acf9d3

* commit '42b3acf9d3eed15324bfa67e92ad751a10e45718':
  Rename minWidth/Height attributes

Change-Id: I1710ea3bec982917ce0d163f56b07042a5869281
 2016-05-19 01:48:19 +00:00
Andrii Kulian
42b3acf9d3 Merge "Rename minWidth/Height attributes" into nyc-dev 2016-05-19 01:42:15 +00:00
Christopher Tate
3f42e0a3f3 Add default lock wallpaper capability and API am: 5d99d47f39 
am: 8d71edc83d

* commit '8d71edc83de3c695f27967dd3378306654b9953c':
  Add default lock wallpaper capability and API

Change-Id: I676d2ab9526f9e2e47f79a73cbb680673ded50f0
 2016-05-19 00:13:04 +00:00
Christopher Tate
d688617d4f Add default lock wallpaper capability and API 
am: 5d99d47f39

* commit '5d99d47f39d741ebe4a1ede53affc8c6bd198b2f':
  Add default lock wallpaper capability and API

Change-Id: Idf6c51153920e3209b2c86b892c399375c48f721
 2016-05-19 00:11:53 +00:00
Chris Tate
4b8088ea8d Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b100777562 
am: c5bbf34cd9

* commit 'c5bbf34cd940f8fa62662bec3a71f7160983dc06':
  API feedback: rename JobInfo methods for clarity

Change-Id: I4b97e2f581ce0c36d1385a510916b4ad3bc4e1af
 2016-05-19 00:03:45 +00:00
Christopher Tate
d8843b7f68 Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev 
am: b100777562

* commit 'b1007775622f1814c87eef3ee5a325f606adb26c':
  API feedback: rename JobInfo methods for clarity

Change-Id: I2aad59e4126f2025b98051cc348e73be282aad5d
 2016-05-19 00:03:17 +00:00
Christopher Tate
8d71edc83d Add default lock wallpaper capability and API 
am: 5d99d47f39

* commit '5d99d47f39d741ebe4a1ede53affc8c6bd198b2f':
  Add default lock wallpaper capability and API

Change-Id: Ib617878c13d4a6530a12365199742fa7ffb5d590
 2016-05-19 00:02:47 +00:00
Christopher Tate
c5bbf34cd9 Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev 
am: b100777562

* commit 'b1007775622f1814c87eef3ee5a325f606adb26c':
  API feedback: rename JobInfo methods for clarity

Change-Id: I4fb08a73a64233e9d016f520f08944e22ec5ccd3
 2016-05-18 23:58:03 +00:00
Christopher Tate
5d99d47f39 Add default lock wallpaper capability and API 
If present, the system property "ro.config.lock_wallpaper" provides a
filesystem path to a decodeable image file to use as the system's
out-of-the-box lock wallpaper imagery.  In the absence of this
system property, or if the indicated file is absent or unreadable,
then the new framework resource
com.android.internal.R.drawable.default_lock_wallpaper is consulted to
locate a usable asset.  This mechanism parallels the existing one for
the default system wallpaper.

By default there is no specific lock wallpaper asset; the resource is
defined to be @null in the standard config.xml file.  A product that
wants to define such a factory-default lock-only wallpaper image
will provide the asset as part of its framework resource overlay.

Bug 27828056

Change-Id: Iebf3706222370d0a0a4baf88d71a59ead07a25c7
 2016-05-18 23:57:46 +00:00
Sanket Padawe
06e1ae1a51 Add new TelephonyManager api to query Telephony metrics. 
Bug: 28717269
Change-Id: I6f5e88509feda879162049955776cb61dda8c840
 2016-05-18 16:51:49 -07:00
Christopher Tate
a9b4f3f628 API feedback: rename JobInfo methods for clarity 
Bug 28773330

Change-Id: I081fa225380a1966010d41020200fb3b9549a195
 2016-05-18 13:59:16 -07:00
Svetoslav Ganov
891fcc2779 Merge "Hide ephemeral API" into nyc-dev am: 68c2919f70 
am: 1129a0f473

* commit '1129a0f4733514043b3f9240dbe77124260d9d53':
  Hide ephemeral API

Change-Id: I79a26bd67329872b8282d9c0d207ab949d815307
 2016-05-18 20:21:07 +00:00
Svet Ganov
1129a0f473 Merge "Hide ephemeral API" into nyc-dev 
am: 68c2919f70

* commit '68c2919f70299352ae649e1d7a05e9431f8b7aa0':
  Hide ephemeral API

Change-Id: I1de27c7aac1ba488c755d615f039a069928ba7be
 2016-05-18 20:16:38 +00:00
Svet Ganov
75a364eabf Merge "Hide ephemeral API" into nyc-dev 
am: 68c2919f70

* commit '68c2919f70299352ae649e1d7a05e9431f8b7aa0':
  Hide ephemeral API

Change-Id: I033dcf9e551cf3a110aea0b3493e3cdad9a38d80
 2016-05-18 20:16:33 +00:00
Svetoslav Ganov
68c2919f70 Merge "Hide ephemeral API" into nyc-dev 2016-05-18 20:10:28 +00:00
Svet Ganov
2265fddba6 Hide ephemeral API 
bug:28825660

Change-Id: I4e9cdd6e29df44a173136aed13c4039443d944cc
 2016-05-18 07:38:29 -07: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
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