Deepanshu Gupta
8bc68f9648
am 52ee9b99: am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit '52ee9b99f55cd17c484fcaf2433c688967284468':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 05:22:40 +00:00
Deepanshu Gupta
66224e2524
am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
...
* commit '12bbbb2bb71a532f3b3ec59fd9232902420cf3d2':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 05:12:31 +00:00
Deepanshu Gupta
52ee9b99f5
am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit 'ffd0e8bf9f803e4881736d1b2e8b54e31888e980':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 05:12:28 +00:00
Deepanshu Gupta
12bbbb2bb7
am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
...
* commit 'd3328343deaff01cfe5eadf57ac27da30832aabe':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 04:59:40 +00:00
Deepanshu Gupta
ffd0e8bf9f
am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit 'a6f32d7ff19319c5ed61d113672f112a6f54c938':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 04:59:34 +00:00
Deepanshu Gupta
d3328343de
am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
...
* commit 'f264080d227617d431804e110e65cc154e8a8d17':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 04:46:39 +00:00
Deepanshu Gupta
a6f32d7ff1
am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit '64d4ef8cf2f9ec6b7af6795fa9feb18cc07ba3d9':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 04:46:28 +00:00
Deepanshu Gupta
338e32ba52
am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit '6c1bf6b161cf3c18b49831eba71811d3fa00d108':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 04:32:46 +00:00
Deepanshu Gupta
a82db08e1d
am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit 'e73e14fd02f50e0e9b3fb3ca890de7cb96d8d48b':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 04:32:42 +00:00
Deepanshu Gupta
f264080d22
am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
...
* commit '3ce96efc2ceeb1666db330ad837409fd494ec108':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 04:31:01 +00:00
Deepanshu Gupta
64d4ef8cf2
am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit '638894803cc8bb57d73ea6aaddd1accbeb52643e':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 04:27:43 +00:00
Deepanshu Gupta
a92f199dcc
am 0ddd915f: am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev
...
* commit '0ddd915fb1d0add3bcab269abc1f8f46e2135b7a':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 04:24:46 +00:00
Deepanshu Gupta
135b820789
am 1c3a8845: am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev
...
* commit '1c3a884519dc5937bf321519d6adafb41a333bc1':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 04:24:04 +00:00
Deepanshu Gupta
0ddd915fb1
am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev
...
* commit '509e5db14908f85c1ad4b93e8bbed5afd4c2c8fe':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 04:14:41 +00:00
Deepanshu Gupta
1c3a884519
am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev
...
* commit '47a400131f026fd4afdf09e77fe82e79201c1458':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 04:14:31 +00:00
Deepanshu Gupta
3ce96efc2c
am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
...
* commit 'd181ffe6881d0a1b49193b5f70dac0cc7cc9aae3':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 03:18:39 +00:00
Deepanshu Gupta
638894803c
am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit '6530cca1edf79ddcd520e2e5bc2695adfb0d3680':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 03:18:27 +00:00
Deepanshu Gupta
6c1bf6b161
am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit '2db4037c628c70f6206a05ade4e606e0b47e9f7c':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 02:15:06 +00:00
Deepanshu Gupta
e73e14fd02
am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit '8ed784e2893c79d943b6184d25167ecf72a9a9ed':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 02:15:02 +00:00
Deepanshu Gupta
2db4037c62
am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit '4f53d92c2f10f774cfdcf17ded82551ea19924be':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 02:02:20 +00:00
Deepanshu Gupta
8ed784e289
am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit 'edc8b8579ba9f47bbca0ac0c2f0eb11d0eadab09':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 02:01:59 +00:00
Deepanshu Gupta
d181ffe688
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
2014-09-04 01:54:08 +00:00
Deepanshu Gupta
4f53d92c2f
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
2014-09-04 01:53:59 +00:00
Deepanshu Gupta
1eb506aa8c
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
2014-09-04 01:53:49 +00:00
Deepanshu Gupta
a780eee462
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev
2014-09-04 01:53:38 +00:00
Deepanshu Gupta
509e5db149
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev
2014-09-04 01:53:17 +00:00
Deepanshu Gupta
edc8b8579b
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
2014-09-04 01:50:46 +00:00
Deepanshu Gupta
9776312a80
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev
2014-09-04 01:50:28 +00:00
Deepanshu Gupta
47a400131f
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev
2014-09-04 01:50:06 +00:00
Scott Rowe
048d8baaff
am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
...
* commit '0ccf80c31dbf236ec8ffafc8c72f036c3137bc5a':
docs: b/15790433 updated for xxhdpi and xxxhdpi
2014-09-03 23:58:25 +00:00
Scott Rowe
0ccf80c31d
Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
2014-09-03 23:52:13 +00:00
Ricardo Cervera
15abafe2c0
am c0393e7f: Merge "docs: Docs for Android project view. Bug: 17108468" into klp-modular-docs
...
* commit 'c0393e7fba742027e2cb4b72cb9e7d9e52887516':
docs: Docs for Android project view. Bug: 17108468
2014-09-03 23:29:38 +00:00
Ricardo Cervera
c0393e7fba
Merge "docs: Docs for Android project view. Bug: 17108468" into klp-modular-docs
2014-09-03 23:22:54 +00:00
Joe Fernandez
9de229527e
am ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs
...
* commit 'ab833be68e3e51f6be032d552bc53802f3fc52f2':
docs: Fix bug with Accessibility Services dev guide
2014-09-03 23:18:16 +00:00
Joe Fernandez
ab833be68e
Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs
2014-09-03 23:12:20 +00:00
Ricardo Cervera
a32f29e225
am a4fe79a4: docs: Adding Sony logo to wear page
...
* commit 'a4fe79a4c4e36770c95f8450b664d7a1fa111004':
docs: Adding Sony logo to wear page
2014-09-03 21:34:17 +00:00
Ricardo Cervera
734ef51380
am 2d80f931: docs: Adding Sony logo to Wear partners
...
* commit '2d80f9317fe69b932d5d9aeb9fc14017fab1af9c':
docs: Adding Sony logo to Wear partners
2014-09-03 21:34:13 +00:00
Ricardo Cervera
a4fe79a4c4
docs: Adding Sony logo to wear page
...
Change-Id: I5e56ca313364d832bb26f7b07891381a0c2b55df
2014-09-03 14:27:50 -07:00
Ricardo Cervera
2d80f9317f
docs: Adding Sony logo to Wear partners
...
Change-Id: I3c4b52d647f0a942ef5d5daad6fb6d5197839f2d
2014-09-03 14:17:06 -07:00
Jean-Michel Trivi
1c9d1485f3
am 6d4873f5: am 0511ba50: Do not persist and restore the media button event receiver
...
* commit '6d4873f577774e5e7427e2675e4c6ff8049646be':
Do not persist and restore the media button event receiver
2014-09-03 21:11:13 +00:00
Jean-Michel Trivi
6d4873f577
am 0511ba50: Do not persist and restore the media button event receiver
...
* commit '0511ba506d30d0a517491a92eda8d001a441d557':
Do not persist and restore the media button event receiver
2014-09-03 20:59:53 +00:00
Michael Wright
da3b43633f
DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve
...
Some devices may contain things like transflective displays where
they actually want the backlight brightness to decrease in the face
of high ambient light scenarios. In the interest of time, just use a
linear interpolation based on the brightness control points for these
cases but in the future we should consider adding a non-monotonic
cubic spline.
Bug: 15611140
Change-Id: I308ad00943d916866ee8d2507a41b7032e6b524e
2014-09-02 14:47:37 -07:00
Joe Fernandez
5632984369
docs: Fix bug with Accessibility Services dev guide
...
b/11448573
Change-Id: I778c26f86c4a2cb3ebef9f3e75b5d544269486dc
2014-08-29 16:44:18 -07:00
Scott Rowe
6208e7b560
am 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs
...
* commit '1014b9aa491d4d7dd4d4fc2510e7b6e6b3b4654d':
docs: remove references to resource browser; point to SDK instead
2014-08-29 21:04:16 +00:00
Scott Rowe
1014b9aa49
Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs
2014-08-29 20:52:54 +00:00
Jean-Michel Trivi
1310a1cdba
am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver
...
* commit 'ec50dfc03ca90e4a8528da77297fe141cc62d3ff':
Do not restore the media button event receiver
2014-08-29 17:34:24 +00:00
Jean-Michel Trivi
ec50dfc03c
am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver
...
* commit '20fc473c69ae9c564ceb7fd357acc09c6b9e1aaf':
Do not restore the media button event receiver
2014-08-29 17:21:43 +00:00
Jean-Michel Trivi
20fc473c69
am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver
...
* commit 'f0336eb87d32414eb14865044be41ea590e7a6ac':
Do not restore the media button event receiver
2014-08-29 17:08:50 +00:00
Jean-Michel Trivi
f0336eb87d
am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver
...
* commit '2cb287f9cc79b0cd9e8ea37adf4b3411253eb244':
Do not restore the media button event receiver
2014-08-29 16:54:22 +00:00
Jean-Michel Trivi
2cb287f9cc
am 9ea996a3: Do not restore the media button event receiver
...
* commit '9ea996a330a21af89f308bdf52e02a470643013b':
Do not restore the media button event receiver
2014-08-29 16:41:10 +00:00