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

174478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
06e7fe5a70 resolve merge conflicts of f2235b6 to master. 
Change-Id: Ibcef3a37ca0749931d509b53bd52e53a7d30ddbb
 2014-11-20 17:27:36 -08:00
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
Chih-hung Hsieh
b946358bb5 am cd24a6d7: am 43b8643e: am f926d71b: Merge "Fix format strings mismatching the parameters passed to them" 
* commit 'cd24a6d70b54c79605e51fcc6a249313e9c25a51':
  Fix format strings mismatching the parameters passed to them
 2014-11-21 00:01:44 +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
4bac6e11ae am 3a091b79: resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp 
* commit '3a091b79978caa9b5d58ae19f693279e5a717c2a':
  Fix clang warnings in core/jni.
 2014-11-20 23:47:07 +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
Jeff Tinker
2670d5ad59 Merge "Fix Crash when sending null in HashMap to getKeyRequest" 2014-11-20 23:29:08 +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
Neil Fuller
670ec764bf Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2014-11-20 23:20:06 +00:00
Ignacio Solla
107b710113 am a8f7a40b: (-s ours) am 57ad8255: (-s ours) [WebView] Interface to access hidden APIs. (DO NOT MERGE) 
* commit 'a8f7a40b4b98f19b5ee99a8dfb4177d430707623':
  [WebView] Interface to access hidden APIs. (DO NOT MERGE)
 2014-11-20 23:19:10 +00:00
Dan Albert
47249598cb am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit '582bdf9a5961a32de27556832e23e0611c4d1cbb':
  Add appropriate casts for char16_t.
 2014-11-20 23:19:06 +00:00
Dan Albert
f9ef207e81 am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
automerge: 582bdf9

* commit '582bdf9a5961a32de27556832e23e0611c4d1cbb':
  Add appropriate casts for char16_t.
 2014-11-20 23:17:55 +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
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
Jorim Jaggi
87f0819327 am c51fdd1b: am bf1960ce: Merge "Fade notifications when exiting dozing" into lmp-mr1-dev automerge: 6456513 
* commit 'c51fdd1bbf507862c10686458d2486f57a5b9585':
  Fade notifications when exiting dozing
 2014-11-20 21:34:40 +00:00
Selim Cinek
230dc9dfc8 am 8e781107: am b18cbb9a: Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev automerge: c9a39c7 
* commit '8e7811079576040207377e9063ad68c757f61d9a':
  Fixed a bug where the notifications were not animating
 2014-11-20 21:34:35 +00:00
George Mount
d3a6338cfb am b986f82c: am 41975454: Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev automerge: bf50b88 
* commit 'b986f82cff447fa7f76796d03f210cbfb48291ab':
  Reset the transitionAlpha after the transition completes.
 2014-11-20 21:34:31 +00:00
George Mount
6bc03efd12 am e8a4055a: am 485ac778: Merge "Slide supports Gravity.START and Gravity.END." into lmp-mr1-dev automerge: b883579 
* commit 'e8a4055a0910538ec9b4c2959d3bbdf8d7ef6fc1':
  Slide supports Gravity.START and Gravity.END.
 2014-11-20 21:34:20 +00:00
Adrian Roos
d1d88bc8c6 am 4533e197: am cbd48c72: Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev automerge: 71cf9e5 
* commit '4533e197bf999c6b68bdb04cad7d4bdee80b6448':
  Honey I shrunk the navigation bar
 2014-11-20 21:34:15 +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
John Spurlock
6775a97389 am 224a0640: am ef86a828: Merge "QS: Inversion tile: Don\'t consider initial 0 setting trackable." into lmp-mr1-dev automerge: ae08003 
* commit '224a0640c988a33aace9b2a81548613067fb7ca8':
  QS: Inversion tile: Don't consider initial 0 setting trackable.
 2014-11-20 21:29:32 +00:00
Wonsik Kim
a6b1bf2394 am fa8276c3: am 59d36695: Merge "TIF: set audio gain properly" into lmp-mr1-dev automerge: b429c01 
* commit 'fa8276c3edb1b71d8e49bb8be1066e86a0d8abb2':
  TIF: set audio gain properly
 2014-11-20 21:29:27 +00:00
Tyler Gunn
1bbd8a6ee1 am 2fefd7ac: am d4340f89: Merge "Change Connections to allow setting conferenceable with conferences." into lmp-mr1-dev automerge: ce5a8e8 
* commit '2fefd7acf55f5caf6a4bf564e1a25fa8e4904713':
  Change Connections to allow setting conferenceable with conferences.
 2014-11-20 21:29:23 +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
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
Wale Ogunwale
892d43bad6 am 1e910d17: am 70273e05: Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev automerge: 005080e 
* commit '1e910d17cef3ef21c09ead282b829ab7bb7bdedb':
  Stop activity onVisibleBehindCanceled()
 2014-11-20 21:24:09 +00:00
Pavel Zhamaitsiak
44412936ff am 950daf58: am c7ffe5e2: Merge "TTY over IMS: Add messages about change of TTY mode in the repote device" into lmp-mr1-dev automerge: 0208d3c 
* commit '950daf58af87044b245c33fef6abcefc314ca676':
  TTY over IMS: Add messages about change of TTY mode in the repote device
 2014-11-20 21:24:05 +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
Chet Haase
ab11cfa2d3 am a2b3a75c: am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev automerge: a79d2e8 
* commit 'a2b3a75ca599c3a2334b9c81a5abd6f544615d2f':
  Fix seeking and scaled duration behavior
 2014-11-20 21:19:27 +00:00
Eric Laurent
9f7fbcc3a5 am 112437d9: am a582bd4b: Merge "AudioSystem JNI: fix AudioPortConfig mask usage" into lmp-mr1-dev automerge: 4624080 
* commit '112437d9d65722ecdf83238a8736543e5dfe484d':
  AudioSystem JNI: fix AudioPortConfig mask usage
 2014-11-20 21:19:22 +00:00
Alan Viverette
8c359de059 am 8ee7fcd2: am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev automerge: 4247f06 
* commit '8ee7fcd28bf54a4cc3d89a08bf48508d9a82cc58':
  Remove underline and search icon from ActionBar search view
 2014-11-20 21:19:17 +00:00
Alan Viverette
51c1803c2b am ee53586a: am 552eca1a: Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev automerge: 6a6b828 
* commit 'ee53586acb0e4b64d25313ccbab7e9310cdd9e2c':
  Implement Material-style delegate for CalendarView
 2014-11-20 21:19:12 +00:00
Wale Ogunwale
1e910d17ce am 70273e05: Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev 
automerge: 005080e

* commit '005080e5f8c3cfd7918bb9a62e36384d6a08351e':
  Stop activity onVisibleBehindCanceled()
 2014-11-20 21:17:45 +00:00
Pavel Zhamaitsiak
950daf58af am c7ffe5e2: Merge "TTY over IMS: Add messages about change of TTY mode in the repote device" into lmp-mr1-dev 
automerge: 0208d3c

* commit '0208d3c8236af7c72d47c9c04ae1a79d0343559d':
  TTY over IMS: Add messages about change of TTY mode in the repote device
 2014-11-20 21:14:39 +00:00
Alan Viverette
e77158de03 am 499ea6b6: am d8dd5100: Merge "Fix several small layout and color issues" into lmp-mr1-dev automerge: 21aaf98 
* commit '499ea6b6d67609624d85d8ffe2df2f5d435ab895':
  Fix several small layout and color issues
 2014-11-20 21:13:34 +00:00
xinhe
1886e5e01f am e013f5ea: (-s ours) am 77bfacc6: Merge "resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE)" into lmp-mr1-dev automerge: 29b90ae -s ours 
* commit 'e013f5eace84c3847a89fbbb1869a9d0d54b6f7e':
  Add configuration to control converting sms destination number
 2014-11-20 21:13:30 +00:00
Chet Haase
a2b3a75ca5 am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev 
automerge: a79d2e8

* commit 'a79d2e86649dfb96159c2aebd94b4a5e19d66eb1':
  Fix seeking and scaled duration behavior
 2014-11-20 21:13:10 +00:00
Eric Laurent
112437d9d6 am a582bd4b: Merge "AudioSystem JNI: fix AudioPortConfig mask usage" into lmp-mr1-dev 
automerge: 4624080

* commit '46240800f19b11bb3635a1d8c00a5c7584c0e556':
  AudioSystem JNI: fix AudioPortConfig mask usage
 2014-11-20 21:11:58 +00:00
Alan Viverette
8ee7fcd28b am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev 
automerge: 4247f06

* commit '4247f06ba43becfcdf7713b4b9fbc347c5b3361d':
  Remove underline and search icon from ActionBar search view
 2014-11-20 21:10:56 +00:00