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

191594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Diego Perez
263e6dfa6a Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev 2015-05-06 23:52:06 +00:00
Diego Perez
19dbe50bb5 Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev 2015-05-06 23:45:41 +00:00
Diego Perez
bc47abe4b4 Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev 2015-05-06 23:43:50 +00:00
Deepanshu Gupta
1f8e3de40c Merge "More layoutlib tests." into lmp-mr1-dev 2015-05-06 23:43:15 +00:00
Deepanshu Gupta
b4ca896f05 Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev 2015-05-06 23:42:56 +00:00
Diego Perez
1bc7fb2dcc Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev 2015-05-06 23:42:35 +00:00
Deepanshu Gupta
4f8a999682 Merge "Nullity annotations to some tests." into lmp-mr1-dev 2015-05-06 23:42:20 +00:00
Deepanshu Gupta
92e798682b Merge "Fix title bar showing when not required." into lmp-mr1-dev 2015-05-06 23:42:01 +00:00
Deepanshu Gupta
9aa600e79f Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev 2015-05-06 23:41:36 +00:00
George Mount
8261a3f5ed Fix crash during Activity Transition with TextureView. 
Bug 20675857

GhostView was synchronously forcing the View's parent to get
the display list when it was created. TextureView's cannot
create a display list until a surface is available and will
crash if it is attempted. This change moves the request to
an invalidate to get it to execute at a later time.

Change-Id: I12afebdfd57eb29c1a35b23a63d045e319547faf
 2015-05-06 16:24:07 -07:00
Seigo Nonaka
7afd01e2f1 Merge "Do nothing if hideSoftInput is called from not focused client." into mnc-dev 2015-05-06 23:08:05 +00:00
Jeff Brown
4244ce6a17 Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS. 
Bug: 20641986
Change-Id: I137dfc7ef41bdda2ce3e81c164767319c88159f1
 2015-05-06 16:02:22 -07:00
Jeff Brown
c05c1aeedf Revert "Initial draft of new MediaRouter APIs." 
This reverts commit 1a937b04e63539cb1fab1bde601031d415c7156f.

Bug: 20641986
Change-Id: I035d945d1561e5fc7c914aa9362635f763c83cfd
 2015-05-06 16:02:21 -07:00
Alex Klyubin
4d5443f37f Define String constants for AndroidKeyStore crypto. 
This defines the String enum values based on JCA standard names for
key algorithm, block mode, padding schemes, and digests. This should
make it safer to interact with AndroidKeyStore code that uses JCA
strings. This was requested by API Council.

Bug: 18088752
Change-Id: I241d9225a13b85479d0a84e49d0a98cbc77e5817
 2015-05-06 15:59:56 -07:00
Seigo Nonaka
ccee75966a Do nothing if hideSoftInput is called from not focused client. 
IMMS#hideSoftInput calls IMMS#setImeWindowVisibilityStatusHiddenLocked
if it is called from not focused client.  However this function changes
IMS visibility state and also changes the back key indicator wrongly.
IMMS should just ignore IMMS#hideSoftInput from not-focused client.

As a preparation to fix b/20764441, this CL partially reverts
Ife3a8733b1a1bf43b195ecf4b8c5082b6538d0a0 but shouldn't have any
user-visible UX regressions.

Bug: 20764441

Change-Id: I60963f1474457ff37cca85e262460dca8105acff
 2015-05-06 22:58:28 +00:00
Adam Powell
6711f3b34c Move PhoneWindow and friends back into internal package 
PhoneWindow, PhoneLayoutInflater and PhoneFallbackEventHandler decided
to @hide out over in the android.view package after the policy jar was
disbanded. Give them a more appropriate home over in framework that
doesn't imply that they should be accessed from other internal layers
of abstraction.

Bug 19606548

Change-Id: Id07b791d178fa447010b49b24726b52208838e88
 2015-05-06 15:57:09 -07:00
John Spurlock
c2ec334079 Merge "Add setting to mute wireless charging sound." into mnc-dev 2015-05-06 22:49:05 +00:00
John Reck
ae2e8b4891 Add warning if an in-use Bitmap is reconfigured 
Bug: 18928352

Also fix an issue around re-configure not properly handling
mPinnedCount in android::Bitmap

Change-Id: I1815b121f1474ad931060771bb1d52ef31d2aac7
 2015-05-06 15:30:16 -07:00
Yorke Lee
9a7db1a6f5 Merge "Fix potential NPE in TelecomManager.placeCall" into mnc-dev 2015-05-06 22:29:25 +00:00
John Spurlock
51a871d48a Add setting to mute wireless charging sound. 
Bug: 19538553
Change-Id: I1af971b35ae9eeb38d8ec38c57b22152095e2725
 2015-05-06 18:22:40 -04:00
Nicolas Prevot
2665fdfd61 Merge "Fetch DISALLOW_CONFIG_VPN for the current user." into mnc-dev 2015-05-06 22:18:36 +00:00
John Reck
4862e973a6 Merge "Annotate Application with @CallSuper" into mnc-dev 2015-05-06 22:09:59 +00:00
Jinsuk Kim
e184a6b9ac Merge "CEC: Reset active source/path before going into standby" into mnc-dev 2015-05-06 22:07:23 +00:00
Matthew Williams
41fe5292fd Merge "Delay all syncing until the device is provisioned" into mnc-dev 2015-05-06 21:46:22 +00:00
Raph Levien
6402dc7e4a Merge "Clear all StaticLayout.Builder fields on pool recycle" into mnc-dev 2015-05-06 21:35:13 +00:00