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

191670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Perez
33e54563da am 4b125836: Merge "Added function to render a drawable in all available states" into lmp-mr1-dev 
* commit '4b12583653561f69a5780126485380cac187c478':
  Added function to render a drawable in all available states
 2015-05-07 02:37:28 +00:00
Diego Perez
4b12583653 Merge "Added function to render a drawable in all available states" into lmp-mr1-dev 2015-05-07 02:28:51 +00:00
Fabrice Di Meglio
1f09b8c0c2 Add IntentFilter auto verification - part 8 
- fix clearing of Intent Verification Status: now do it at the correct
time when the PackageSettings info is still there
- reduce writing of Settings

See bug #19628909

Change-Id: I9113333c330964249342108fa1ca7b8ec89c3322
 2015-05-06 19:11:17 -07:00
Bart Sears
1b0888fe8e Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev 2015-05-07 01:52:08 +00:00
Bart Sears
d130bdc462 Revert "Always show auxiliary subtypes from NavBar keyboard icon." 
CL is breaking the build.  Discussed with Seigo and verting until he can take a look at it.

This reverts commit 80ff4ed6bb8dbdad7192d679a01096aa888e090b.

Change-Id: I3decaf37198e5864a1763a059df4a36ebc70c5a7
 2015-05-07 01:51:28 +00:00
Jeff Brown
ee2e8fbe71 Merge changes from topic 'mr' into mnc-dev 
* changes:
  Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
  Revert "Initial draft of new MediaRouter APIs."
 2015-05-07 01:31:28 +00:00
Adam Powell
e960030f75 Add Build.VERSION.PREVIEW_SDK_INT 
Add a constant to the SDK that apps may use to detect incremental API
changes across prerelease preview builds. APIs newer than the latest
official API level are not guaranteed to be stable or even present
across preview revisions.

Change-Id: I14341e55a3ebc3d872977970b9440c400e71f588
 2015-05-06 18:13:09 -07:00
Andrew Shulaev
681c7d142a Added function to render a drawable in all available states 
This reverts commit 01cdf8b135be3bf67b9386dc929109c3db82c730.

Change-Id: I596855047d78c3c718744ad61432fc45e1239634
(cherry picked from commit 1f158819bc7cf58f97e47fabfaf23b2fb838f2eb)
 2015-05-07 02:05:48 +01:00
Diego Perez
f7f6fd2c0c am c2ba7391: am 613aef87: am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev 
* commit 'c2ba7391704cd4025c890b37148c16bf32b55a93':
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.
 2015-05-07 01:02:41 +00:00
Diego Perez
c000db78d7 am 9af506fb: am 143eaa81: am 2ea82244: am 263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev 
* commit '9af506fb5b5f1c7f36fb439c2b120ad2b0cda602':
  Make status and navigation bars widgets and usable from layouts
 2015-05-07 00:49:57 +00:00
Diego Perez
9207b8567a am ae4619dd: am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev 
* commit 'ae4619dd7f3d48cae2e9b83681849a77a8201142':
  Move StatusBar to use statusBarColor theme attribute
 2015-05-07 00:49:51 +00:00
Diego Perez
c87fe129e5 am 52ef7fce: am ffeb8117: am 9c13c8de: am bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev 
* commit '52ef7fce1626868d6be34f4038cd852259ad6a26':
  Make sure shaders use a color model compatible with the destination.
 2015-05-07 00:49:46 +00:00
Deepanshu Gupta
790f6925a7 am a131bfe0: am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev 
* commit 'a131bfe094c007721d006fc9ca21cfa74f41dfef':
  More layoutlib tests.
 2015-05-07 00:49:40 +00:00
Diego Perez
c2ba739170 am 613aef87: am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev 
* commit '613aef87cf6a5958ff2fd255348f92f8d3de152e':
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.
 2015-05-07 00:47:08 +00:00
Deepanshu Gupta
2ab7b46056 resolved conflicts for merge of a663e012 to mnc-dev 
Change-Id: I279cad7db6e9b5e97da3ea3c3bb91e09cabc7076
 2015-05-06 17:45:29 -07:00
Diego Perez
d7a53dab44 am 9efcb308: am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev 
* commit '9efcb308615c0adaf418d430adabea3d271bcbb4':
  Fix isThemeAppCompat NPE when using an invalid theme
 2015-05-07 00:34:32 +00:00
Deepanshu Gupta
15432daa6e am 9c9bcd34: am cae76a70: am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev 
* commit '9c9bcd3486d9f7557329dea90b3c5fa1bdace91c':
  Nullity annotations to some tests.
 2015-05-07 00:34:26 +00:00
Deepanshu Gupta
dbcedeea20 am b2951490: am b19325be: am 2e3c41a4: am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev 
* commit 'b2951490eabf71e14c8fc5d50397adf869a2a291':
  Fix title bar showing when not required.
 2015-05-07 00:34:21 +00:00
Deepanshu Gupta
c49b8f9d1b am 88b193d7: am 047a28ec: am 96437fb4: am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev 
* commit '88b193d717bb73cbe555e4e621f7b6efdf49cdaa':
  LayoutLib: fix crash when shadow size <=0.
 2015-05-07 00:34:14 +00:00
Diego Perez
613aef87cf am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev 
* commit '86bff0bb63f3667f0b450420514c931b1f4d25d2':
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.
 2015-05-07 00:33:51 +00:00
Diego Perez
9af506fb5b am 143eaa81: am 2ea82244: am 263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev 
* commit '143eaa81934e47c8acb8338d1a2383eb79b690ef':
  Make status and navigation bars widgets and usable from layouts
 2015-05-07 00:21:35 +00:00
Diego Perez
ae4619dd7f am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev 
* commit 'df4c977d760ccfcf929c77b100faa5f8f38df158':
  Move StatusBar to use statusBarColor theme attribute
 2015-05-07 00:21:29 +00:00
Diego Perez
52ef7fce16 am ffeb8117: am 9c13c8de: am bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev 
* commit 'ffeb8117b139f61dd7c92bda6a7d47b83871cb66':
  Make sure shaders use a color model compatible with the destination.
 2015-05-07 00:21:24 +00:00
Diego Perez
86bff0bb63 am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev 
* commit '0e20bd8e50724ab264425ba830cdf1beb96f7404':
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.
 2015-05-07 00:21:19 +00:00
Deepanshu Gupta
a131bfe094 am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev 
* commit '3dbd18cdfe6af1a9c36261551ef98d39e849d389':
  More layoutlib tests.
 2015-05-07 00:21:19 +00:00
Deepanshu Gupta
a663e01204 am 9abe4232: am 7e4c1a92: am b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev 
* commit '9abe42324f2252460b003e6fcdb097910e16178a':
  RecyclerView in LayoutLib: better XML attrs.
 2015-05-07 00:21:14 +00:00
Diego Perez
9efcb30861 am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev 
* commit '21246bd92f54be468496848b659bf47f2522430a':
  Fix isThemeAppCompat NPE when using an invalid theme
 2015-05-07 00:21:09 +00:00
Deepanshu Gupta
9c9bcd3486 am cae76a70: am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev 
* commit 'cae76a70bfca9f37a10f34582cddbe0792625f26':
  Nullity annotations to some tests.
 2015-05-07 00:21:03 +00:00
Deepanshu Gupta
b2951490ea am b19325be: am 2e3c41a4: am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev 
* commit 'b19325be074e466c39e86fd4418726a7c305546c':
  Fix title bar showing when not required.
 2015-05-07 00:20:59 +00:00
Deepanshu Gupta
88b193d717 am 047a28ec: am 96437fb4: am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev 
* commit '047a28ec506bb40081eef6eaf8434884157709ce':
  LayoutLib: fix crash when shadow size <=0.
 2015-05-07 00:20:53 +00:00
Diego Perez
0e20bd8e50 Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev 
* changes:
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.
 2015-05-07 00:14:26 +00:00
Diego Perez
143eaa8193 am 2ea82244: am 263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev 
* commit '2ea82244f0b4396444ec891ab664f9ac40c0b55b':
  Make status and navigation bars widgets and usable from layouts
 2015-05-07 00:09:11 +00:00
Diego Perez
df4c977d76 am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev 
* commit '24e10c0bad54bdd3b37f6f7effea8f76b687ce3f':
  Move StatusBar to use statusBarColor theme attribute
 2015-05-07 00:09:00 +00:00
Diego Perez
ffeb8117b1 am 9c13c8de: am bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev 
* commit '9c13c8de8291aac69958a106248d3229ff90609f':
  Make sure shaders use a color model compatible with the destination.
 2015-05-07 00:08:53 +00:00
Deepanshu Gupta
3dbd18cdfe am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev 
* commit '872e9950a227128d323c24eb369863e16964493a':
  More layoutlib tests.
 2015-05-07 00:08:45 +00:00
Deepanshu Gupta
9abe42324f am 7e4c1a92: am b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev 
* commit '7e4c1a92b8f3ce02df0a1502be45c450308d81b7':
  RecyclerView in LayoutLib: better XML attrs.
 2015-05-07 00:08:36 +00:00
Diego Perez
21246bd92f am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev 
* commit '8e75e307373a03dcbc55ce71be5b50f80e0474db':
  Fix isThemeAppCompat NPE when using an invalid theme
 2015-05-07 00:08:29 +00:00
Deepanshu Gupta
cae76a70bf am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev 
* commit '4624107185135db9db6bfbfb3d0c3a0951c19ee1':
  Nullity annotations to some tests.
 2015-05-07 00:08:22 +00:00
Deepanshu Gupta
b19325be07 am 2e3c41a4: am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev 
* commit '2e3c41a4e4fbb811cdafc754708d62cba7c6c1b6':
  Fix title bar showing when not required.
 2015-05-07 00:08:01 +00:00
Deepanshu Gupta
047a28ec50 am 96437fb4: am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev 
* commit '96437fb4b05be2602bb0fa215988be646aec28fc':
  LayoutLib: fix crash when shadow size <=0.
 2015-05-07 00:07:54 +00:00
Diego Perez
2ea82244f0 am 263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev 
* commit '263e6dfa6aa3286b71ef908c8b2f06206e747ab1':
  Make status and navigation bars widgets and usable from layouts
 2015-05-07 00:02:08 +00:00
Adam Powell
90ae4553fe Merge "Move PhoneWindow and friends back into internal package" into mnc-dev 2015-05-06 23:55:56 +00:00
Diego Perez
24e10c0bad am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev 
* commit '19dbe50bb534db6fa46f0df47f589a69212e9458':
  Move StatusBar to use statusBarColor theme attribute
 2015-05-06 23:53:45 +00:00
Diego Perez
9c13c8de82 am bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev 
* commit 'bc47abe4b444d0386d1d939e4a223a976fade565':
  Make sure shaders use a color model compatible with the destination.
 2015-05-06 23:53:41 +00:00
Deepanshu Gupta
872e9950a2 am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev 
* commit '1f8e3de40c0aed9fa8b9216ddd3224b7ac94acf1':
  More layoutlib tests.
 2015-05-06 23:53:37 +00:00
Deepanshu Gupta
7e4c1a92b8 am b4ca896f: Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev 
* commit 'b4ca896f05eed9d36ac9971810d102a9139502f9':
  RecyclerView in LayoutLib: better XML attrs.
 2015-05-06 23:53:32 +00:00
Diego Perez
8e75e30737 am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev 
* commit '1bc7fb2dcc954caac78d3fc02eb98ec30658d4d0':
  Fix isThemeAppCompat NPE when using an invalid theme
 2015-05-06 23:53:27 +00:00
Deepanshu Gupta
4624107185 am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev 
* commit '4f8a999682fdb8b38ee5671b8a8f527569ebb5ff':
  Nullity annotations to some tests.
 2015-05-06 23:53:23 +00:00
Deepanshu Gupta
2e3c41a4e4 am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev 
* commit '92e798682b5e45a05bffecb40a9b9f473420ea79':
  Fix title bar showing when not required.
 2015-05-06 23:53:18 +00:00
Deepanshu Gupta
96437fb4b0 am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev 
* commit '9aa600e79f8f68115e8e95f02933376e3da7d194':
  LayoutLib: fix crash when shadow size <=0.
 2015-05-06 23:53:14 +00:00