Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206,505 Commits 3 Branches 0 Tags
39ed6e76613dee074f06e4e890e02fda470c661c
Commit Graph

50838 Commits

Author SHA1 Message Date
Seigo Nonaka
39ed6e7661 Merge "Update fullscreen state on hiding window." 2015-07-14 06:17:47 +00:00
Seigo Nonaka
93c47eab2b Update fullscreen state on hiding window. 
Need to update fullscreen state on hiding window as well as showing
window, otherwise IMM#isFullscreenWindow reports obsolete state after
hiding window by back key or device rotation.

Bug: 22238567
Change-Id: Ic8de161cd5d2ee161f32b9942cdc2c331ea4d48e
 2015-07-14 15:08:52 +09:00
Derek Sollenberger
1f4fb3c468 Merge "Move drawRegion from DisplayList to Canvas" 2015-07-13 17:53:28 +00:00
Derek Sollenberger
94394b3fb0 Move drawRegion from DisplayList to Canvas 
Change-Id: I9f401dc5b24732938ac2ca7ed829796e2d7ef3e8
 2015-07-13 13:48:08 -04:00
Neil Fuller
fcd6558370 am b662579e: am 3ecbca50: am 886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown." 
* commit 'b662579ec04c69bfd79ab7f9beaceca9135da57d':
  Switch shutdownInput / shutdownOutput to using Os.shutdown.
 2015-07-13 15:37:53 +00:00
Neil Fuller
b662579ec0 am 3ecbca50: am 886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown." 
* commit '3ecbca5081f26ca03ef6b8b68767753343e67f38':
  Switch shutdownInput / shutdownOutput to using Os.shutdown.
 2015-07-13 15:26:09 +00:00
Derek Sollenberger
1d69248667 Merge "Remove unused functions and variables from DisplayListCanvas" 2015-07-13 12:06:08 +00:00
Robin Lee
ec4b8c8f27 am f8b96edf: am 81093dd0: am 51cfb3a4: am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev 
* commit 'f8b96edf47b4d54ccc91842c16cc505901459cae':
  Legacy VPN calls to require a userID
 2015-07-10 20:17:52 +00:00
Robin Lee
f8b96edf47 am 81093dd0: am 51cfb3a4: am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev 
* commit '81093dd04bc1fdfe1f7389baefb891122e232ff9':
  Legacy VPN calls to require a userID
 2015-07-10 20:03:02 +00:00
Raph Levien
bcedba1149 am 8b21d785: am c10176a4: am dbcd049a: am 9320bb08: am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev 
* commit '8b21d785af995cac02eab53644f03bda90f4c383':
  Fix StaticLayout crash when maxLines = 0
 2015-07-10 19:47:11 +00:00
Raph Levien
8b21d785af am c10176a4: am dbcd049a: am 9320bb08: am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev 
* commit 'c10176a419b4b95a64d9d20e5137c545a4472747':
  Fix StaticLayout crash when maxLines = 0
 2015-07-10 19:33:05 +00:00
Robin Lee
51cfb3a4d6 am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev 
* commit '2164cf4f4043b4892db5688ed53624af758fcdaa':
  Legacy VPN calls to require a userID
 2015-07-10 19:32:40 +00:00
Derek Sollenberger
cc882b6518 Remove unused functions and variables from DisplayListCanvas 
This also moves some functions that are only called when creating/completing
a displayList into the appropriate constructors and endRecording calls.

Change-Id: I9f6add156d7f476a52766934af713b0f852c8dea
 2015-07-10 19:32:30 +00:00
Robert Greenwalt
fc9f21f701 am cc5cd900: am e84c6b37: am 2cef47ff: am 66f59dc1: am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev 
* commit 'cc5cd90029a1968ec3126f73735fef3234a31678':
  Enable EMERGENCY mobile connections.
 2015-07-10 19:32:12 +00:00
Robert Greenwalt
cc5cd90029 am e84c6b37: am 2cef47ff: am 66f59dc1: am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev 
* commit 'e84c6b37f4859371e274b30035a1a5ec04307f66':
  Enable EMERGENCY mobile connections.
 2015-07-10 19:17:55 +00:00
Robin Lee
f180fe31de Merge "Legacy VPN calls to require a userID" into mnc-dev 2015-07-10 19:05:38 +00:00
Raph Levien
dbcd049ac8 am 9320bb08: am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev 
* commit '9320bb082f53dfdf34881907a736527b3bdd9b45':
  Fix StaticLayout crash when maxLines = 0
 2015-07-10 19:04:51 +00:00
John Reck
07957aa476 am 5159f778: am f01a4710: am 1e2063fb: am d1b16386: am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev 
* commit '5159f778f0ea497327bc6efc6029ae95a1d1af05':
  Improve ImageView drawable re-use
 2015-07-10 18:57:03 +00:00
Robert Greenwalt
2cef47ff86 am 66f59dc1: am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev 
* commit '66f59dc1bde15be207d49fafb97db372cb01d977':
  Enable EMERGENCY mobile connections.
 2015-07-10 18:52:25 +00:00
John Reck
5159f778f0 am f01a4710: am 1e2063fb: am d1b16386: am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev 
* commit 'f01a471060df22ee5c92acdf8effa340b5f568b3':
  Improve ImageView drawable re-use
 2015-07-10 18:42:54 +00:00
Raph Levien
5d1654a943 Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev 2015-07-10 18:37:49 +00:00
Robert Greenwalt
1570b6b3c7 Merge "Enable EMERGENCY mobile connections." into mnc-dev 2015-07-10 18:23:24 +00:00
John Reck
1e2063fb22 am d1b16386: am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev 
* commit 'd1b16386e7a2c793bb0fc3d19708f1c2853e92da':
  Improve ImageView drawable re-use
 2015-07-10 18:14:19 +00:00
John Reck
2c7ed6e80a Merge "Improve ImageView drawable re-use" into mnc-dev 2015-07-10 17:50:28 +00:00
John Reck
5a1356916d Improve ImageView drawable re-use 
Bug 22403868

Initial attempt only helped if setImageBitmap() was the only
thing called but during new-loading content it's common for a
placeholder to be set via setImageDrawable.

Tweak ImageView slightly to just have a BitmapDrawable that it
lazy-creates but will hold on to for any subsequent calls
to setImageBitmap

Change-Id: I7380521c7b363d458e4cda041f1f8b2b1fb3a93a
 2015-07-10 10:08:01 -07:00
Paul Jensen
a6d97a575f am 851bcaf2: am ca36baaf: am 2cb16d2e: am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev 
* commit '851bcaf2edc88d3d193304d64415a50613f46141':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
 2015-07-10 15:57:45 +00:00
Paul Jensen
851bcaf2ed am ca36baaf: am 2cb16d2e: am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev 
* commit 'ca36baafef8024973ab8aebb54913a96db3d0e77':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
 2015-07-10 15:46:28 +00:00
Paul Jensen
2cb16d2e71 am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev 
* commit '75a43340b675fd13eac05965438aaac2a7164658':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
 2015-07-10 15:19:43 +00:00
Paul Jensen
00c64f7ca5 Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev 2015-07-10 14:57:13 +00:00
Neil Fuller
a7f7c248c7 Switch shutdownInput / shutdownOutput to using Os.shutdown. 
Bug: 3106438
Change-Id: I2c4817e435c6b253d6c507ea57bdfdfe45df8862
 2015-07-10 12:30:07 +01:00
Bart Sears
f65166af52 am 1893e12f: am 19dd9c9c: am 6d583ad9: am 1773f2df: am 1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev 
* commit '1893e12f9cdc9d1caa54e773241803f9e5777c30':
  Revert "Security: AccountChooser shouldn't auto reveal accounts."
 2015-07-10 04:15:23 +00:00
Eino-Ville Talvala
e9f09e4f3d am 440cfa88: am 9bc8438e: am 9dbe6b1f: am 3aa7069b: am a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev 
* commit '440cfa88769641d12566918df4901d5a6c8c193e':
  Camera2: Reorganize high-speed recording API slightly
 2015-07-10 04:15:16 +00:00
Bart Sears
1893e12f9c am 19dd9c9c: am 6d583ad9: am 1773f2df: am 1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev 
* commit '19dd9c9c99fed36562747b0da856c8aca606a7e5':
  Revert "Security: AccountChooser shouldn't auto reveal accounts."
 2015-07-10 04:03:50 +00:00
Eino-Ville Talvala
440cfa8876 am 9bc8438e: am 9dbe6b1f: am 3aa7069b: am a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev 
* commit '9bc8438e39e220b33a76382e6d54ed15cef3fe42':
  Camera2: Reorganize high-speed recording API slightly
 2015-07-10 04:03:43 +00:00
Bart Sears
6d583ad921 am 1773f2df: am 1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev 
* commit '1773f2df50d0d36d688b9721b6c7aca4c9b3cd6e':
  Revert "Security: AccountChooser shouldn't auto reveal accounts."
 2015-07-10 03:38:58 +00:00
Eino-Ville Talvala
9dbe6b1f61 am 3aa7069b: am a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev 
* commit '3aa7069b60ff41b5047382d64a941a6aff23de58':
  Camera2: Reorganize high-speed recording API slightly
 2015-07-10 03:38:53 +00:00
Bart Sears
1aa4049286 Merge "Revert "Security: AccountChooser shouldn't auto reveal accounts."" into mnc-dev 2015-07-10 03:15:57 +00:00
Eino-Ville Talvala
a2cd9c56f8 Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev 2015-07-10 03:14:35 +00:00
Baligh Uddin
f2d248db80 Revert "Security: AccountChooser shouldn't auto reveal accounts." 
This reverts commit c3b3f46d5f.

Change-Id: I6d156e1ad82c052606f76644fe6085f14e82a734
 2015-07-10 03:01:47 +00:00
Carlos Valdivia
3380518c66 am fa644238: am 5338a34b: am ce31576d: am be8c3eb1: am 319883c8: Merge "Security: AccountChooser shouldn\'t auto reveal accounts." into mnc-dev 
* commit 'fa6442389765f1a53382d050722e3b92ad4a6b55':
  Security: AccountChooser shouldn't auto reveal accounts.
 2015-07-10 02:39:04 +00:00
Dianne Hackborn
7b3aa5019b am 8e697eb1: am 04efda69: am 6b335380: am 47306086: am a681d7d9: Merge "Improve alarm manager docs." into mnc-dev 
* commit '8e697eb1312bb975d7b7eee5cee71ca3c56e1d26':
  Improve alarm manager docs.
 2015-07-10 02:38:38 +00:00
John Reck
8a76fc5c1a am 66e86347: am 035e1b94: am 19cb0685: am 31ff4513: am b7ba1220: Teach ImageView to recycle internal drawables 
* commit '66e86347875abec395c84337767553e101c5a633':
  Teach ImageView to recycle internal drawables
 2015-07-10 02:38:22 +00:00
Svet Ganov
5a9a85d3d2 am 0bdfb97a: am 88c3918d: am 3ceb043f: am b7cf986e: am 171fe6ac: Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev 
* commit '0bdfb97a0acb8b40c78b1f40151b334d5401a2d1':
  Add an API for apps to query if a permisison is denied by policy.
 2015-07-10 02:38:11 +00:00
John Reck
070b7125c1 am 12c62e11: am 0739ebcb: am f8a504fc: am 1a51a136: am 4ee9b23a: Merge "Delete dead code" into mnc-dev 
* commit '12c62e117c17911baa32678e562206d88bb355e5':
  Delete dead code
 2015-07-10 02:38:03 +00:00
Carlos Valdivia
fa64423897 am 5338a34b: am ce31576d: am be8c3eb1: am 319883c8: Merge "Security: AccountChooser shouldn\'t auto reveal accounts." into mnc-dev 
* commit '5338a34b4dbdc0c095937b572240b9ad9ebea51f':
  Security: AccountChooser shouldn't auto reveal accounts.
 2015-07-10 02:23:57 +00:00
Dianne Hackborn
8e697eb131 am 04efda69: am 6b335380: am 47306086: am a681d7d9: Merge "Improve alarm manager docs." into mnc-dev 
* commit '04efda693713243a47afb193ae389d5d36ff5dfa':
  Improve alarm manager docs.
 2015-07-10 02:23:46 +00:00
John Reck
66e8634787 am 035e1b94: am 19cb0685: am 31ff4513: am b7ba1220: Teach ImageView to recycle internal drawables 
* commit '035e1b94ea25d78be562add377ee85a952caafa3':
  Teach ImageView to recycle internal drawables
 2015-07-10 02:23:30 +00:00
Svet Ganov
0bdfb97a0a am 88c3918d: am 3ceb043f: am b7cf986e: am 171fe6ac: Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev 
* commit '88c3918d00ba7eed22ce20e80dde44b34f552d76':
  Add an API for apps to query if a permisison is denied by policy.
 2015-07-10 02:23:25 +00:00
John Reck
12c62e117c am 0739ebcb: am f8a504fc: am 1a51a136: am 4ee9b23a: Merge "Delete dead code" into mnc-dev 
* commit '0739ebcbcf7cca4c6f1bb05ed0eb762c1d3a9b93':
  Delete dead code
 2015-07-10 02:23:19 +00:00
Carlos Valdivia
ce31576df0 am be8c3eb1: am 319883c8: Merge "Security: AccountChooser shouldn\'t auto reveal accounts." into mnc-dev 
* commit 'be8c3eb19465a2bc5162b4a26c97574f110760be':
  Security: AccountChooser shouldn't auto reveal accounts.
 2015-07-10 01:54:25 +00:00