Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
191,371 Commits 3 Branches 0 Tags
c87fe129e5ce33b03c570ce34184395a3011135c
Commit Graph

191371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Raph Levien
3bd60c7b11 Clear all StaticLayout.Builder fields on pool recycle 
When returning a StaticLayout.Builder object to the pool, it is
important to clear everything out. If not, then the object may have
stale state from a previous layout operation. This was causing CTS
test failures and probably other mischief.

Bug: 20636917
Change-Id: I76fb20076ee954fcb476131a8fbe8833d72fbc0d
 2015-05-06 14:26:35 -07:00
John Spurlock
03dbaf15ee Merge "Volume a11y: Resize zen footer text when changed." into mnc-dev 2015-05-06 21:20:31 +00:00
John Spurlock
0c467064e2 Merge "Volume a11y: Rename introduction 'confirm' button to 'close'." into mnc-dev 2015-05-06 21:20:13 +00:00