Commit Graph

277484 Commits

Author SHA1 Message Date
Android Build Merger (Role)
83f6414527 Merge "Merge "docs: update docs for uses-feature element" into nyc-dev am: dc24613bf3 am: 229daadefc" into nyc-mr1-dev-plus-aosp 2016-09-23 22:27:21 +00:00
Mark Lu
5344c7df8f docs: update docs for uses-feature element am: b463a6db08
am: a6f0c7f99f

Change-Id: I3eab318c16f240fe9787fdd2c6e750ddfa8343b1
2016-09-23 22:27:02 +00:00
Mark Lu
b7ca62e1bf Merge "docs: update docs for uses-feature element" into nyc-dev am: dc24613bf3
am: 229daadefc

Change-Id: I2e3ee08a0afce2a517f637e2c7315c7a300837ac
2016-09-23 22:26:30 +00:00
Android Build Merger (Role)
5f2585ce80 Merge "docs: update docs for uses-feature element am: b463a6db08 am: 1beb4c4cc3" into nyc-mr1-dev-plus-aosp 2016-09-23 22:26:19 +00:00
Mark Lu
362db8e6a5 Merge "docs: Add param info to TextView.setTextColor" into nyc-dev am: 7df8927691
am: f5eeb28a42

Change-Id: Icce28df30d250c752e5605d3ced3a7f904a904a8
2016-09-23 22:26:05 +00:00
Mark Lu
3ed2e79292 docs: update docs for uses-feature element am: b463a6db08
am: 1beb4c4cc3

Change-Id: I909b3ec60b6af4bdd73da61c4bc2ed44e0e2158a
2016-09-23 22:25:39 +00:00
Android Build Merger (Role)
a154cba6e6 Merge "Merge "docs: Add param info to TextView.setTextColor" into nyc-dev am: 7df8927691 am: 5a418d40ba" into nyc-mr1-dev-plus-aosp 2016-09-23 22:25:24 +00:00
Mark Lu
d1bb5fad4e docs: Add param info to TextView.setTextColor am: 193879a8b6
am: 544e899559

Change-Id: Ic4506ceaf5c34c93b3d937137f9a4756508ff189
2016-09-23 22:25:17 +00:00
Android Build Merger (Role)
e055d54715 Merge "Fix wake lock logic during Dream startup am: 9ede1d2602 am: 042c2349c6" into nyc-mr1-dev-plus-aosp 2016-09-23 22:25:15 +00:00
Mark Lu
a199bf4f88 Merge "docs: Add param info to TextView.setTextColor" into nyc-dev am: 7df8927691
am: 5a418d40ba

Change-Id: Ie3f032fc490cd68b896847c5b8f22ef750a64366
2016-09-23 22:24:42 +00:00
Adrian Roos
4ffff73947 Fix wake lock logic during Dream startup am: 9ede1d2602
am: 042c2349c6

Change-Id: I6c8a9119fd841b071dfb9f0e54680eb3dd7a1ef1
2016-09-23 22:24:32 +00:00
Android Build Merger (Role)
69ed95d1a3 Merge "docs: Add param info to TextView.setTextColor am: 193879a8b6 am: 5080a2c5e1" into nyc-mr1-dev-plus-aosp 2016-09-23 22:24:28 +00:00
Mark Lu
430e8edd64 Merge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev am: c6a1076e40 am: 95ca35f4ff am: 824fc38439
am: d1cd0a23d2

Change-Id: I0a4c11c6cad29a9eaa8fc691a40356bee4a66d51
2016-09-23 22:23:38 +00:00
Mark Lu
7bfb1e7f46 docs: Add param info to TextView.setTextColor am: 193879a8b6
am: 5080a2c5e1

Change-Id: Ifd7511c801047b96edb389ac4455ddb877236aef
2016-09-23 22:23:27 +00:00
Mark Lu
ad75e714b6 docs: Mention SwitchCompat in Switch and toggle documentation am: 3404032dfc am: 902fb28784 am: a744c8c25a
am: ed68ee67c2

Change-Id: Id8a721102be8e2eddc33575245bbc162263a2b2e
2016-09-23 22:22:35 +00:00
Adrian Roos
3217986886 Merge "Fix wake lock logic during Dream startup" into nyc-mr1-dev
am: 27eb169db0

Change-Id: I169706cac13e20f21c2cdf42156f32095f3a107b
2016-09-23 22:20:00 +00:00
Adrian Roos
042c2349c6 Fix wake lock logic during Dream startup
am: 9ede1d2602

Change-Id: If4bbf9e3242946a352eedbba3d8610964b505c29
2016-09-23 22:19:57 +00:00
Mark Lu
f2f2d48a0e Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev
am: d91c303e6c

Change-Id: I63e930d5d3e0e6da2af44a62d2e4f781719b4028
2016-09-23 22:19:50 +00:00
Mark Lu
66192078c5 docs: update javadoc description for View.setVisibility() method
am: ae0459f532

Change-Id: Ie217e46288a11e86b2e5b6e56d8ce5cb2a214861
2016-09-23 22:19:47 +00:00
Selim Cinek
ad6be91357 Merge changes If9baf6db,Idc6c5d7d into nyc-mr1-dev am: 7f53b9bcb5
am: 64d0e2d807

Change-Id: Ib56ca376723d1412768a5cab4804e906ab6fbb62
2016-09-23 22:19:16 +00:00
Mark Lu
92391ed7e2 Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev
am: d91c303e6c

Change-Id: Ieaf7e14ac25bab608ec5e67d9d768aa91f97b880
2016-09-23 22:18:40 +00:00
Mark Lu
56be5c1ae0 docs: update javadoc description for View.setVisibility() method
am: ae0459f532

Change-Id: I3c9d70fc6fc2b6770076454cdfbb1ed1b619dfb9
2016-09-23 22:18:35 +00:00
Dong-wan Kim
a3ecfe6bdf Fix DismissView cannot be clicked sometimes after boot am: b926666a76
am: 2e61103c5e

Change-Id: Iba79909cfb5f2dc2770b6d7086c061d125ee0888
2016-09-23 22:18:29 +00:00
Mark Lu
83e283b22f Merge "docs: update docs for uses-feature element" into nyc-dev
am: dc24613bf3

Change-Id: I9ea4800646bbe165551d6782beb6cc337ffa7055
2016-09-23 22:18:20 +00:00
Mark Lu
a6f0c7f99f docs: update docs for uses-feature element
am: b463a6db08

Change-Id: I51394b88aec2716551ddfe329bf9a9726e156739
2016-09-23 22:18:17 +00:00
dongwan0605.kim
d986cfd62d Fix RTL issue of ImageFloatingTextView am: dd8611fc5a
am: 4d590a91c2

Change-Id: I6a563e996bc93dd8f3a53b48c185319fdd1886de
2016-09-23 22:17:33 +00:00
Mark Lu
229daadefc Merge "docs: update docs for uses-feature element" into nyc-dev
am: dc24613bf3

Change-Id: I4a9b85554ee2a744adda9f3e4bc3d76788d7d3c1
2016-09-23 22:17:05 +00:00
Mark Lu
1beb4c4cc3 docs: update docs for uses-feature element
am: b463a6db08

Change-Id: I82dbfdda1c642016ed63d95f77ee69aebc08d25f
2016-09-23 22:17:00 +00:00
Mark Lu
f5eeb28a42 Merge "docs: Add param info to TextView.setTextColor" into nyc-dev
am: 7df8927691

Change-Id: Ibcb55559a05d383182870e5f38fe9432e22cf526
2016-09-23 22:16:40 +00:00
Mark Lu
544e899559 docs: Add param info to TextView.setTextColor
am: 193879a8b6

Change-Id: I5b157858dd056b2510486ad7546ab74e1287005c
2016-09-23 22:16:37 +00:00
Selim Cinek
b70c68f330 Merge changes If7c3a55e,I68dcba41,Ib96a15da into nyc-mr1-dev am: a05719a278
am: b8306d0f54

Change-Id: Ic0b7909342b1d96a2c7450e730c42dd1c7fdd273
2016-09-23 22:15:16 +00:00
Mark Lu
5a418d40ba Merge "docs: Add param info to TextView.setTextColor" into nyc-dev
am: 7df8927691

Change-Id: I8ed21e40b96aa913b70fb24c649f3a310e99f2aa
2016-09-23 22:15:13 +00:00
Mark Lu
5080a2c5e1 docs: Add param info to TextView.setTextColor
am: 193879a8b6

Change-Id: I8c903627670c946bd421b3e77bbd2a372f21adf0
2016-09-23 22:15:10 +00:00
Selim Cinek
c04b945862 Fixed a bug where the dimmed background could be invisible am: 3334a182a6
am: 53d7b67290

Change-Id: I1acae36d41732e2b1df9d0c8b65a646e8f35f229
2016-09-23 22:14:13 +00:00
Adrian Roos
27eb169db0 Merge "Fix wake lock logic during Dream startup" into nyc-mr1-dev 2016-09-23 22:13:57 +00:00
Selim Cinek
29f40afd9b Fixed an issue where the inline controls where not usable am: fc7086ef65
am: 8f88867ba1

Change-Id: Ida51f45dc0fa31ec4ceb7761ca313e46fc6b7836
2016-09-23 22:13:32 +00:00
Selim Cinek
10691456b8 Added Emergency affordance feature am: 705442fa7d
am: 0e1f78da65

Change-Id: I6f8220b18bce7889e3b9efe1b075a680a0ae7187
2016-09-23 22:12:33 +00:00
Adrian Roos
9ede1d2602 Fix wake lock logic during Dream startup
Fixes a crash that would happen in all dreams
that did not have permission to acquire wake locks.
Instead moves the wake lock logic into the system
process. Also fixes a bug in DozeService where the
wake lock was not held until dozing was actually
properly initialized.

Fixes: 31612287
Bug: 31044352
Related-CL: I85955a2b7d6bad5171accbc336117a9660b1b198
Test: adb shell settings put secure screensaver_components com.android.dreams.basic/.Colors; adb shell service call dreams 1

Change-Id: Idb3f921ee71b6da6c2ab0c44c332ef91f93ddbc0
2016-09-23 15:11:15 -07:00
Mark Lu
d91c303e6c Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev 2016-09-23 22:10:39 +00:00
Mark Lu
d1cd0a23d2 Merge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev am: c6a1076e40 am: 95ca35f4ff
am: 824fc38439

Change-Id: I173b8bce5f155065179806f8013ba0879f3beee5
2016-09-23 22:10:25 +00:00
Mark Lu
dc24613bf3 Merge "docs: update docs for uses-feature element" into nyc-dev 2016-09-23 22:10:23 +00:00
Mark Lu
ed68ee67c2 docs: Mention SwitchCompat in Switch and toggle documentation am: 3404032dfc am: 902fb28784
am: a744c8c25a

Change-Id: I401a87f3d1a013e61e0d5a65797ce7dc1b58162d
2016-09-23 22:09:35 +00:00
Mark Lu
7df8927691 Merge "docs: Add param info to TextView.setTextColor" into nyc-dev 2016-09-23 22:09:34 +00:00
Ajay Panicker
74fa2d6846 Prevent NPE if someone creates a bad BluetoothHealthAppConfig object
Bug: 28271086
Change-Id: Ic8ebe3152e2b06c070316acc7e6a1f89763cd2a3
2016-09-23 22:08:26 +00:00
Selim Cinek
64d0e2d807 Merge changes If9baf6db,Idc6c5d7d into nyc-mr1-dev
am: 7f53b9bcb5

Change-Id: Ibaa6083c367cb1bac177a038573b748204300548
2016-09-23 22:05:24 +00:00
Dong-wan Kim
2e61103c5e Fix DismissView cannot be clicked sometimes after boot
am: b926666a76

Change-Id: I1f9a91b04dfc7b1bbaff3243e383c6b26dd4dcf4
2016-09-23 22:05:21 +00:00
dongwan0605.kim
4d590a91c2 Fix RTL issue of ImageFloatingTextView
am: dd8611fc5a

Change-Id: I101527b922604640fef684c6216b99289ac97f25
2016-09-23 22:04:42 +00:00
Dimitry Ivanov
9e9061f608 Relax namespace restriction on system server classloader
Add java.library.path to list of permitted paths
for system server classloader. This allows libraries
loaded in system server classloader namespace to
dlopen libraries under /system/lib/somedir

Test: m
Bug: http://b/31652397
Change-Id: Ief70aaa81cde4983c8de1e07b4ef23e1fadf35a0
2016-09-23 15:03:27 -07:00
Selim Cinek
b8306d0f54 Merge changes If7c3a55e,I68dcba41,Ib96a15da into nyc-mr1-dev
am: a05719a278

Change-Id: I9ec03aad7067080423e27ab8158e82ba103c1a15
2016-09-23 22:02:20 +00:00
Selim Cinek
53d7b67290 Fixed a bug where the dimmed background could be invisible
am: 3334a182a6

Change-Id: I30cfda47616d2b365113d9d05f7483e239b973e1
2016-09-23 22:02:16 +00:00