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

169018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
f2235b6a48 resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp. 
Change-Id: I1be708f5a0cd4d64021a57f1063d54330f1d2d7e
 2014-11-20 16:38:06 -08:00
Geoffrey Borggaard
271ddfce2c Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev automerge: e4590cf 
automerge: db1e7fa

* commit 'db1e7fa097972d4cc26447f46abd8d4367d44eb7':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-21 00:35:05 +00:00
Alan Viverette
9eb4ee244b am e0a377f5: Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev 
* commit 'e0a377f50951d51b5ddf3be6f0ce361affdffc56':
  Make DeviceDefault alert dialog themes public
 2014-11-21 00:14:22 +00:00
Andreas Gampe
c1b5483a60 Frameworks/base: Remove unused header 
android_nfc.h is used nowhere.

Change-Id: I3009b3eb122674d3fe7ddb201bac18368b78bc02
 2014-11-20 16:11:57 -08:00
Erik Kline
dedd42a2bd am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev 
* commit '4e9ea5e9aef8e35eaa5a876e726544277c80dec5':
  Rename EXTRA_NETWORK ConnectivityManager constants.
 2014-11-21 00:10:12 +00:00
Alan Viverette
e0a377f509 Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev 2014-11-21 00:08:25 +00:00
Alan Viverette
7d5bcd7990 Update scrollbars to match Material spec 
Adds a minimum touch target size to the fast scroller so that we can
edge-align an 8dp thumb but still maintain a 48dp touch target.

BUG: 18467743
Change-Id: I31e9cf1948856f5fce7d75383b84a9359684ebe5
 2014-11-20 16:07:59 -08:00
Erik Kline
4e9ea5e9ae Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev 2014-11-21 00:04:23 +00:00
John Reck
d3e5777e79 am 83fb64e8: Merge "If the surface is lost, release it" into lmp-mr1-dev 
* commit '83fb64e8ec4c6bc0930f50b24bd1c36a81f6a1c2':
  If the surface is lost, release it
 2014-11-21 00:04:18 +00:00
John Reck
83fb64e8ec Merge "If the surface is lost, release it" into lmp-mr1-dev 2014-11-21 00:00:08 +00:00
Chih-hung Hsieh
cd24a6d70b am 43b8643e: am f926d71b: Merge "Fix format strings mismatching the parameters passed to them" 
* commit '43b8643e86d7c5d0d5cf536336126232454f361a':
  Fix format strings mismatching the parameters passed to them
 2014-11-20 23:57:35 +00:00
Chih-hung Hsieh
43b8643e86 am f926d71b: Merge "Fix format strings mismatching the parameters passed to them" 
* commit 'f926d71b8ef2790da067550144860705c1a61fe5':
  Fix format strings mismatching the parameters passed to them
 2014-11-20 23:53:33 +00:00
Chih-hung Hsieh
f926d71b8e Merge "Fix format strings mismatching the parameters passed to them" 2014-11-20 23:50:04 +00:00
Dan Albert
3a091b7997 resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp 
Change-Id: I068d2a0fb118d4e2b4c1e546bebfcbc2cb120d36
 2014-11-20 15:41:25 -08:00
John Reck
9b5d427fe0 am 0b2dac34: Merge "Rename callDrawGLFunction" into lmp-mr1-dev 
* commit '0b2dac3452a58e76be7379b85e7505c531842b57':
  Rename callDrawGLFunction
 2014-11-20 23:29:31 +00:00
John Reck
0b2dac3452 Merge "Rename callDrawGLFunction" into lmp-mr1-dev 2014-11-20 23:26:07 +00:00
Bernhard Rosenkränzer
09993f768b Fix format strings mismatching the parameters passed to them 
Change-Id: Ia0d33aec9edadac60508fb422e0821e6d8f28afa
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-20 15:24:46 -08:00
Alan Viverette
8513453e37 Make DeviceDefault alert dialog themes public 
BUG: 18426645
Change-Id: Icd93dd4b153285e7636a59bec193b2fdf2d21da8
 2014-11-20 15:24:36 -08:00
ztenghui
e9dbfe5afd am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev 
* commit '002bc810882c0a322a09d0e4527ab8083547e145':
  ASLD: ASLD's XML reversible flag can turn off the reverse behavior now.
 2014-11-20 23:16:23 +00:00
ztenghui
002bc81088 Merge "ASLD: ASLD's XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev 2014-11-20 23:11:38 +00:00
Jaewan Kim
52dcc7fb0a am 18ab5c21: Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev 
* commit '18ab5c216c62d90a4b86f37a4c993c1c8b56835d':
  Add an API to check availability of Ethernet interface.
 2014-11-20 23:10:27 +00:00
Jaewan Kim
18ab5c216c Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev 2014-11-20 23:07:43 +00:00
Dan Albert
8e0cfe7c9e am 8e357bf5: Merge "Fix clang warnings in core/jni." 
* commit '8e357bf54173c3f83584c10983392f0d87e0b2b3':
  Fix clang warnings in core/jni.
 2014-11-20 23:02:29 +00:00
Ignacio Solla
a8f7a40b4b am 57ad8255: (-s ours) [WebView] Interface to access hidden APIs. (DO NOT MERGE) 
* commit '57ad825546d9cb802577f9a1a68213fcd978fb17':
  [WebView] Interface to access hidden APIs. (DO NOT MERGE)
 2014-11-20 23:01:06 +00:00
Dan Albert
582bdf9a59 am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
  Add appropriate casts for char16_t.
 2014-11-20 23:00:56 +00:00
Dan Albert
8e357bf541 Merge "Fix clang warnings in core/jni." 2014-11-20 22:58:47 +00:00
ztenghui
5b84eace6c ASLD: ASLD's XML reversible flag can turn off the reverse behavior now. 
Previously, the android:reversible flag behaves like a suggestion.
Now it is used to enforce no reverse when set to false. In this way, user can
safely setup one direction animation only.
When set to true, but AVD can't reverse , then it will show a warning.

At the same time, update the tests to show different cases, including
AnimationDrawable.

b/18413484

Change-Id: I5552c49dcbd76b0724b4d5593bce8388b27bd905
 2014-11-20 14:41:33 -08:00
John Reck
680df8d60e Rename callDrawGLFunction 
Bug: 18471503
Change-Id: I00cb356ff2338da7fd07b9ba30b5b3dcbdffdb2e
 2014-11-20 14:40:52 -08:00
Ignacio Solla
57ad825546 [WebView] Interface to access hidden APIs. (DO NOT MERGE) 
The WeView provider implementation needs access to
these APIs to implement the WebView functionality.

BUG:18152150

Change-Id: I6b41c623b1e8a776dcee8977d0d17259cb4b34f1
(cherry picked from commits 94ef789f0cf0387df20c2c602857ada1e5abfdd6
 and 53f256948724b8d4009d8a8a47da96a06402f9a2)
 2014-11-20 22:29:33 +00:00
Dan Albert
d8c169fedf am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit '0c437fd3a79ba5f9118ec10940a3398665690587':
  Add appropriate casts for char16_t.
 2014-11-20 22:25:07 +00:00
Dan Albert
0c437fd3a7 Merge "Add appropriate casts for char16_t." 2014-11-20 22:19:38 +00:00
Eino-Ville Talvala
b22de13fdb am df84cb90: Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev 
* commit 'df84cb90df6f4a98c853dd61e858f62a584cdac5':
  Camera: Add one more requirement to BURST_CAPTURE
 2014-11-20 22:04:54 +00:00
Jean-Michel Trivi
14b909241f am 09ff9125: Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev 
* commit '09ff91255e945f2588c377614bf7b7c0d512118e':
  Convert record channel mask for dynamic mix
 2014-11-20 22:04:49 +00:00
Eino-Ville Talvala
df84cb90df Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev 2014-11-20 22:03:07 +00:00
Jean-Michel Trivi
09ff91255e Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev 2014-11-20 22:02:15 +00:00
Chris Craik
5b41215b16 am 93ef9639: Merge "Improve ColorMatrix docs" into lmp-mr1-dev 
* commit '93ef96395a95317bec4f27423ade1ce0d6aa07d8':
  Improve ColorMatrix docs
 2014-11-20 21:41:50 +00:00
Adrian Roos
62a7d53343 am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 
* commit '4e312d81c18b286170c904659e78cab4fdf27200':
  Add device locked API for TrustAgentService
 2014-11-20 21:41:46 +00:00
Adrian Roos
866bae50b7 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 
* commit 'af6e657ab873623ed0e94bc8bcf8ed03f6bbe167':
  Update KeyguardManager.isDeviceLocked API
 2014-11-20 21:41:41 +00:00
Chris Craik
93ef96395a Merge "Improve ColorMatrix docs" into lmp-mr1-dev 2014-11-20 21:39:47 +00:00
Adrian Roos
4e312d81c1 Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 2014-11-20 21:38:17 +00:00
Adrian Roos
af6e657ab8 Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 2014-11-20 21:38:14 +00:00
Jorim Jaggi
c51fdd1bbf am bf1960ce: Merge "Fade notifications when exiting dozing" into lmp-mr1-dev 
automerge: 6456513

* commit '6456513f6ff844fd15f3453a66fcc8fb439e1ef7':
  Fade notifications when exiting dozing
 2014-11-20 21:31:41 +00:00
Selim Cinek
8e78110795 am b18cbb9a: Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev 
automerge: c9a39c7

* commit 'c9a39c7dd1e50bea6b6ba9abc20dafe3204aece7':
  Fixed a bug where the notifications were not animating
 2014-11-20 21:30:17 +00:00
George Mount
b986f82cff am 41975454: Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev 
automerge: bf50b88

* commit 'bf50b88ed70c2f34b2426ce80213698e46d09eb0':
  Reset the transitionAlpha after the transition completes.
 2014-11-20 21:28:33 +00:00
Chris Craik
db7cc60eb2 Improve ColorMatrix docs 
bug:18415632

Clean up some text, and add a sample.

Change-Id: I39fdda2004e1932831058701f95f67355786ad9d
 2014-11-20 13:28:01 -08:00
George Mount
e8a4055a09 am 485ac778: Merge "Slide supports Gravity.START and Gravity.END." into lmp-mr1-dev 
automerge: b883579

* commit 'b8835791e2d2fab41277597008010a5681dacb41':
  Slide supports Gravity.START and Gravity.END.
 2014-11-20 21:27:17 +00:00
Adrian Roos
4533e197bf am cbd48c72: Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev 
automerge: 71cf9e5

* commit '71cf9e58a14b942ad313d0c5c280e207933e9841':
  Honey I shrunk the navigation bar
 2014-11-20 21:26:00 +00:00
John Spurlock
224a0640c9 am ef86a828: Merge "QS: Inversion tile: Don\'t consider initial 0 setting trackable." into lmp-mr1-dev 
automerge: ae08003

* commit 'ae08003115488e08b69e0db2e75eca56405bd928':
  QS: Inversion tile: Don't consider initial 0 setting trackable.
 2014-11-20 21:24:31 +00:00
Wonsik Kim
fa8276c3ed am 59d36695: Merge "TIF: set audio gain properly" into lmp-mr1-dev 
automerge: b429c01

* commit 'b429c01558c65b12e2c4ebec59f146e86aa460bb':
  TIF: set audio gain properly
 2014-11-20 21:22:45 +00:00
Tyler Gunn
2fefd7acf5 am d4340f89: Merge "Change Connections to allow setting conferenceable with conferences." into lmp-mr1-dev 
automerge: ce5a8e8

* commit 'ce5a8e861d16814e1d452f4512f05b258b95de1d':
  Change Connections to allow setting conferenceable with conferences.
 2014-11-20 21:20:30 +00:00