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

254960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
eca2131bb7 Add default lock wallpaper capability and API am: 5d99d47f39 
am: e289467a1e

* commit 'e289467a1ea65b04c7d4a425fefa881c08c04ed4':

Change-Id: Ied99fa8d271dc01fb74131f6c1deb0f0e3d0edae
 2016-05-19 00:23:24 +00:00
Android Build Merger (Role)
6ea9678cfe Merge "Add default lock wallpaper capability and API am: 5d99d47f39 am: d688617d4f" into nyc-mr1-dev-plus-aosp 2016-05-19 00:20:12 +00:00
Christopher Tate
04a7c3cc7a Add default lock wallpaper capability and API am: 5d99d47f39 
am: d688617d4f

* commit 'd688617d4f3ecc09965f12c6cae9d1437615c7c9':

Change-Id: I3cbfeb3cf398d6d2e6ede9c2dcdc4318c2552350
 2016-05-19 00:19:49 +00:00
Andreas Gampe
f466f7bbd5 Merge "Frameworks/base: Add more systrace points" into nyc-dev am: b40bcfb6ad 
am: 54748384ea

* commit '54748384ea3e001cbc97ecdf67501c8592925df7':
  Frameworks/base: Add more systrace points

Change-Id: I4a3b4143a87c5e928d7149d57a899af0c0aecb0b
 2016-05-19 00:19:48 +00:00
Andreas Gampe
e289467a1e Merge "Frameworks/base: Add more systrace points" into nyc-dev 
am: b40bcfb6ad

* commit 'b40bcfb6ad3d60e5606f41c6628c133512e0538e':
  Frameworks/base: Add more systrace points

Change-Id: Id090c0545a17beb45bafd05f5302298e09ea30cd
 2016-05-19 00:18:58 +00:00
Android Build Merger (Role)
0187b10b63 Merge "Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b100777562 am: d8843b7f68" into nyc-mr1-dev-plus-aosp 2016-05-19 00:14:46 +00:00
Andreas Gampe
54748384ea Merge "Frameworks/base: Add more systrace points" into nyc-dev 
am: b40bcfb6ad

* commit 'b40bcfb6ad3d60e5606f41c6628c133512e0538e':
  Frameworks/base: Add more systrace points

Change-Id: I1ede493eaab4a86c67a992c2eb4129f81d903d1c
 2016-05-19 00:14:14 +00:00
Chris Tate
26ff7f6fdd Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b100777562 
am: d8843b7f68

* commit 'd8843b7f68c043c9d053d75100b12d4fd5c78f8e':

Change-Id: I461f4e73d8eb1eab389070e5736a23af43a59314
 2016-05-19 00:13:31 +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
TreeHugger Robot
b40bcfb6ad Merge "Frameworks/base: Add more systrace points" into nyc-dev 2016-05-19 00:09:09 +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
Chris Tate
b100777562 Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev 2016-05-18 23:50:14 +00:00
Android Build Merger (Role)
44bc81e62d Merge "Merge "Lock down networking when waiting for always-on" into nyc-dev am: d171df660e am: 43fbfbf94c" into nyc-mr1-dev-plus-aosp 2016-05-18 23:48:27 +00:00
Robin Lee
a4049e4a5a Merge "Lock down networking when waiting for always-on" into nyc-dev am: d171df660e 
am: 43fbfbf94c

* commit '43fbfbf94c5b8ae4353b73c36d85ff02fd36fc67':
  Lock down networking when waiting for always-on

Change-Id: I883c68faafde99eb00c37962a517dceb4a4f9d32
 2016-05-18 23:47:59 +00:00
Robin Lee
22e9213a1c Merge "Lock down networking when waiting for always-on" into nyc-dev am: d171df660e 
am: 77ab7fc8d4

* commit '77ab7fc8d4f4596b1275a7065f05380e22da3a1a':
  Lock down networking when waiting for always-on

Change-Id: I4160a61ca437d20df4342a44ed24fc6ad47962c6
 2016-05-18 23:47:52 +00:00
Robin Lee
77ab7fc8d4 Merge "Lock down networking when waiting for always-on" into nyc-dev 
am: d171df660e

* commit 'd171df660e19bdba4d188beeb8b6023874712413':
  Lock down networking when waiting for always-on

Change-Id: I7be0a85597936421750d1da0fde3d55d7d4fabc5
 2016-05-18 23:42:43 +00:00
Robin Lee
43fbfbf94c Merge "Lock down networking when waiting for always-on" into nyc-dev 
am: d171df660e

* commit 'd171df660e19bdba4d188beeb8b6023874712413':
  Lock down networking when waiting for always-on

Change-Id: I34fffb119eecef0052be673f307ef63c94fc58ee
 2016-05-18 23:42:40 +00:00
Robin Lee
d171df660e Merge "Lock down networking when waiting for always-on" into nyc-dev 2016-05-18 23:37:24 +00:00
Robin Lee
17e6183b85 Lock down networking when waiting for always-on 
Fix: 26694104
Fix: 27042309
Fix: 28335277
Change-Id: I47a4c9d2b98235195b1356af3dabf7235870e4fa
 2016-05-19 00:26:53 +01:00
Sunny Goyal
fcdbde4caa Merge "Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply." into nyc-mr1-dev 
am: d2d8e9b228

* commit 'd2d8e9b22830a07d12f1542a5dc9476a3ab3d7bb':
  Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply.

Change-Id: I04ca85225233f4165c3c9cd1ab56d9c772b7d7c1
 2016-05-18 23:20:43 +00:00
Sunny Goyal
d2d8e9b228 Merge "Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply." into nyc-mr1-dev 2016-05-18 23:13:00 +00:00
Sunny Goyal
49e6695c5c Store the appropriate layout id for the infrated view, so that 
it can be used for verification during reapply.

Bug: 28815495
Change-Id: I8516661ef97f529851069331a6c2bb64429c7766
 2016-05-18 16:11:11 -07:00
Android Build Merger (Role)
69ead35abd Merge "update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d am: 9de1d192af am: ec82d3e76e am: b003918128" into nyc-mr1-dev-plus-aosp 2016-05-18 23:07:54 +00:00
Android Build Merger (Role)
94b887d9cc Merge "update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d am: 9de1d192af am: ec82d3e76e am: 8034ff14ed" into nyc-mr1-dev-plus-aosp 2016-05-18 23:07:50 +00:00
Android Build Merger (Role)
f113e303c5 Merge "Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9 am: 3fb62d859f am: c4e18f5a38 am: 663bac1fd1" into nyc-mr1-dev-plus-aosp 2016-05-18 23:07:42 +00:00
smain@google.com
29d5eb66ee update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d am: 9de1d192af am: ec82d3e76e 
am: b003918128

* commit 'b003918128ab3f723c9a3cd8a71dfcc8c28d5a3a':
  update sdk/ link to studio/

Change-Id: Ic84499ec42d17517963309f66fe9c107085c0324
 2016-05-18 23:07:13 +00:00
smain@google.com
f821c54439 update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d am: 9de1d192af am: ec82d3e76e 
am: 8034ff14ed

* commit '8034ff14edc289c32550096ac2701e1c2d1e4092':
  update sdk/ link to studio/

Change-Id: Ibf8d48da010e2353d92cd0af923844a3bf0ce154
 2016-05-18 23:07:10 +00:00
Bert McMeen
6e98c9e6ff Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9 am: 3fb62d859f am: c4e18f5a38 
am: 663bac1fd1

* commit '663bac1fd1104dd3b4bac7617509d5cbddcbc729':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: I8aa3c1cb07c8a8e7f5c85ecb833f95dc4dce4fe2
 2016-05-18 23:07:08 +00:00
Bert McMeen
91bdfbf07d Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9 am: 3fb62d859f am: c4e18f5a38 
am: 0cd72d746a

* commit '0cd72d746ad6cb368ae08e87ee18929aca02a829':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: Ice82e233d2293cecee267219e7122b162c32a28c
 2016-05-18 23:07:06 +00:00
smain@google.com
8034ff14ed update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d am: 9de1d192af 
am: ec82d3e76e

* commit 'ec82d3e76e36b4e15835e7b48dff6aa7a861153e':
  update sdk/ link to studio/

Change-Id: Ieeeb96027ed86e5ac7270af79fad06d3b0a9d1b2
 2016-05-18 23:03:42 +00:00
smain@google.com
b003918128 update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d am: 9de1d192af 
am: ec82d3e76e

* commit 'ec82d3e76e36b4e15835e7b48dff6aa7a861153e':
  update sdk/ link to studio/

Change-Id: I29eb64e0d5e2f2d268506aa3cecf818a1a4b2d93
 2016-05-18 23:03:37 +00:00
Bert McMeen
0cd72d746a Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9 am: 3fb62d859f 
am: c4e18f5a38

* commit 'c4e18f5a388a41da5ce3ee55a68d53d9254499c5':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: I2b871710e8c527eea6205a09c15df72469d333f3
 2016-05-18 23:03:37 +00:00
Bert McMeen
663bac1fd1 Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9 am: 3fb62d859f 
am: c4e18f5a38

* commit 'c4e18f5a388a41da5ce3ee55a68d53d9254499c5':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: I700d179e94b7a0c58fe647e169c3b178c5296bf1
 2016-05-18 23:03:33 +00:00
smain@google.com
ec82d3e76e update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d 
am: 9de1d192af

* commit '9de1d192af5761dec4e58837690febc6385874b4':
  update sdk/ link to studio/

Change-Id: I3184c8b697fe96162cb87c17bcf85fc6375127d9
 2016-05-18 22:59:45 +00:00
Bert McMeen
c4e18f5a38 Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9 
am: 3fb62d859f

* commit '3fb62d859f2c3ed0b06dd3d6f7183c838c829c2b':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: I3ad08bb522e3c1ab2fefd2cf7884d69d82f5d394
 2016-05-18 22:59:36 +00:00
Android Build Merger (Role)
7dac5c55b3 Merge "Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb am: 3ddb6d5fe2" into nyc-mr1-dev-plus-aosp 2016-05-18 22:55:18 +00:00
Paul Crowley
47eb5a7d18 Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb 
am: 3ddb6d5fe2

* commit '3ddb6d5fe2ef2c86a70af25ce79849e76efd5674':
  Two phases to set the password for disk encryption

Change-Id: Icc4ede9459833b3c8879514b15fd3b5aba9be812
 2016-05-18 22:54:54 +00:00
smain@google.com
9de1d192af update sdk/ link to studio/ am: 04de2d285e 
am: 2e28ebfc1d

* commit '2e28ebfc1d4ef357968923fc763d1f87ea389ef6':
  update sdk/ link to studio/

Change-Id: I2180d895901a935aa0ebf46cdbfc7b7ab8d2b23e
 2016-05-18 22:54:47 +00:00
Bert McMeen
3fb62d859f Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs 
am: 58fdf82ab9

* commit '58fdf82ab9c21fb6fd3d1d64e1d2c13abb670ba1':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: I0a158cce412a6973b607c2002a490ffa37e72f59
 2016-05-18 22:54:43 +00:00
Paul Crowley
02826bb36b Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb 
am: 2a1076339e

* commit '2a1076339ecb7ba9b7c8829bb3c3285df29a67e3':
  Two phases to set the password for disk encryption

Change-Id: I884dae66b133d8b9312a7793d415964e13ed8105
 2016-05-18 22:54:43 +00:00
Paul Crowley
3ddb6d5fe2 Merge "Two phases to set the password for disk encryption" into nyc-dev 
am: 56a9395aeb

* commit '56a9395aeb198e0a7db5e9666cc81ba7ce5f8e0d':
  Two phases to set the password for disk encryption

Change-Id: Ieac13a4c2775e3d2bc5463f4161c6e8b151bf6c9
 2016-05-18 22:50:37 +00:00
smain@google.com
2e28ebfc1d update sdk/ link to studio/ 
am: 04de2d285e

* commit '04de2d285e6e264f5a7a84de205a30571fcc1c9e':
  update sdk/ link to studio/

Change-Id: I9fbf52b2802c4ae33bfef289c6fceb8484dd8014
 2016-05-18 22:50:05 +00:00
Paul Crowley
2a1076339e Merge "Two phases to set the password for disk encryption" into nyc-dev 
am: 56a9395aeb

* commit '56a9395aeb198e0a7db5e9666cc81ba7ce5f8e0d':
  Two phases to set the password for disk encryption

Change-Id: I76b3b1351ea85d8a5e42da523f57a291b3a1b0d9
 2016-05-18 22:50:02 +00:00
Bert McMeen
58fdf82ab9 Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs 2016-05-18 22:44:54 +00:00
Andreas Gampe
4c8e542f68 Frameworks/base: Add more systrace points 
Add more systrace points for application startup.

Bug: 28625993
Change-Id: I76dca9e842fb43f1b85981ef94582074d31528c8
 2016-05-18 15:43:45 -07:00