drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,885 Commits 1 Branch 0 Tags
Commit Graph

122885 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joe Fernandez
cafad30176 am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs 
* commit '825211712c2af5a2b9190662adf3fc93264eefd4':
  docs: add warning to redirects file
 2014-08-27 16:04:47 +00:00
Joe Fernandez
825211712c Merge "docs: add warning to redirects file" into klp-modular-docs 2014-08-27 15:57:05 +00:00
Ricardo Cervera
df139acff1 am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit '1cf6ff306e992711c1d6682ed5d69701669fdce3':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 15:54:28 +00:00
Ricardo Cervera
37e3f10174 am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit '4f0fedd5017563408436c8fa7702766a487e724f':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 15:54:25 +00:00
Ricardo Cervera
1cf6ff306e Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 2014-08-27 15:49:34 +00:00
Ricardo Cervera
4f0fedd501 Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 2014-08-27 15:44:27 +00:00
Ricardo Cervera
facad7d9a9 docs: Changed studio links to HTTPS from HTTP. Bug: 17295924 
Change-Id: Icafcdba235a22912780253003182479619e16ca1
 2014-08-27 08:41:52 -07:00
Ricardo Cervera
cde64643f9 am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 
* commit 'd91deea5ec151d53e3640db791948fbe2480f433':
  docs: Fixed notification background bug. Bug: 16801684
 2014-08-27 15:40:35 +00:00
Ricardo Cervera
d91deea5ec Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 2014-08-27 15:30:41 +00:00
Ricardo Cervera
aa0009ec6e docs: Fixed Google Play Services version number. Bug: 17195954 
Change-Id: I7a71aa5f600ae11cce388183fc20e4537864122d
 2014-08-27 08:19:26 -07:00
Ricardo Cervera
69e9fcbffc docs: Fixed notification background bug. Bug: 16801684 
Change-Id: Ibd42a52fd46d324a6f706bab69a23f8521b7b36b
 2014-08-26 15:44:32 -07:00
Andrew Solovay
8d8cf0b22f am e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular-docs 
* commit 'e7c7993e4d490b67b329ef2502e35c8aad763ca1':
  docs: Fixed error in code sample.
 2014-08-26 18:36:23 +00:00
Andrew Solovay
e7c7993e4d Merge "docs: Fixed error in code sample." into klp-modular-docs 2014-08-26 18:25:33 +00:00
Tim Murray
cb16b55b5e am 2a866f07: Update RenderScript docs. 
* commit '2a866f075d9b23f835d27d4d46f8ccdc60c1fa6e':
  Update RenderScript docs.
 2014-08-26 17:39:06 +00:00
Jean-Michel Trivi
0511ba506d Do not persist and restore the media button event receiver 
Do not persist the media button event receiver.
Do not restore the media button event receiver on behalf of the
  application that registered. Prevents reported vulnerability.

Bug 15428797

Change-Id: I7ca3e7fccb165c55b23f471c00e0ed77436f7dc1
 2014-08-25 18:29:01 -07:00
Deepanshu Gupta
6530cca1ed Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit c9cd725f1013bed27e6f6594b176c10a6a4c0f16)
 2014-08-26 00:51:54 +00:00
Deepanshu Gupta
c39afe45d4 Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit c9cd725f1013bed27e6f6594b176c10a6a4c0f16)
 2014-08-26 00:48:59 +00:00
Deepanshu Gupta
6a9c6c6bae Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
(cherry picked from commit c9cd725f1013bed27e6f6594b176c10a6a4c0f16)
 2014-08-26 00:48:37 +00:00