Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,733 Commits 3 Branches 0 Tags
216c089834e92733055a17bcade7ca1971677b49
Commit Graph

168733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RoboErik
216c089834 am 50b02d61: am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev 
* commit '50b02d61dca310dc8acaf83d25d919b436f6da43':
  Scale bitmaps in metadata sent to the system
 2014-11-21 00:43:33 +00:00
Shishir Agrawal
84b988e6ee am 0783a61d: am a9b67771: Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev 
* commit '0783a61d8a6f17ca0fe3d0e55a3c48aceec823d4':
  Carrierprivileges: Addressing API council suggestions.
 2014-11-21 00:43:23 +00: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
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
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
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 94ef789f0c
 and 53f2569487)
 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
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
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
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
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
Alan Viverette
ee53586acb am 552eca1a: Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev 
automerge: 6a6b828

* commit '6a6b828090de26aeef7d11a7cc0513a813cbf3a9':
  Implement Material-style delegate for CalendarView
 2014-11-20 21:09:34 +00:00
Alan Viverette
499ea6b6d6 am d8dd5100: Merge "Fix several small layout and color issues" into lmp-mr1-dev 
automerge: 21aaf98

* commit '21aaf98f6fc666dcd2dad43c368038d441fefbb2':
  Fix several small layout and color issues
 2014-11-20 21:08:32 +00:00
xinhe
e013f5eace 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 '29b90ae5fdca54e5438a192fa810e0e35983b1e0':
  Add configuration to control converting sms destination number
 2014-11-20 21:07:07 +00:00
John Spurlock
4adb8d496d am c70a4ccf: Merge "BatterySaver: Update disclosure string." into lmp-mr1-dev 
automerge: 61f4f68

* commit '61f4f685719b14f14479ebb6e7234ad30d320a7a':
  BatterySaver: Update disclosure string.
 2014-11-20 21:03:54 +00:00
Mathieu Chartier
fff5e0a051 am 7fc9176c: Add zygote space to Dalvik Heap 
automerge: 78f235d

* commit '78f235db2dcd09ace3efe785af0ee0bf88bb99a8':
  Add zygote space to Dalvik Heap
 2014-11-20 21:02:47 +00:00
Jason Monk
16b03c9a73 am 2e982258: Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 
automerge: bdf37b7

* commit 'bdf37b714d4c3e3fb0ac27c625fdcffbd616b4f9':
  SysUI: Refactor the NetworkControllerImpl
 2014-11-20 21:00:19 +00:00
Dan Albert
6698749dd4 Add appropriate casts for char16_t. 
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.

Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
 2014-11-20 11:47:40 -08:00
Dan Albert
46d8444631 Fix clang warnings in core/jni. 
There are a few bugs in here too (mostly people expecting + to
concatenate C strings) :(

Change-Id: I0a243c05c4ea8b56e84896f37814d0fbea4c39d5
 2014-11-20 11:47:00 -08:00
RoboErik
50b02d61dc am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev 
* commit '5b881d43ece280fdf46455a45393c3341e1feae7':
  Scale bitmaps in metadata sent to the system
 2014-11-20 18:04:54 +00:00
RoboErik
5b881d43ec Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev 2014-11-20 17:58:36 +00:00
Shishir Agrawal
0783a61d8a am a9b67771: Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev 
* commit 'a9b67771547a89ad08ffb5008adb89dde4009d9a':
  Carrierprivileges: Addressing API council suggestions.
 2014-11-20 17:50:25 +00:00
Chris Craik
57b641a2ed am 3b2ba44b: Merge "Improve logging around performance critical events" into lmp-mr1-dev 
* commit '3b2ba44be3699a4e133d7a09cb4ed182405d7ff9':
  Improve logging around performance critical events
 2014-11-20 17:50:20 +00:00
Shishir Agrawal
a9b6777154 Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev 2014-11-20 17:44:36 +00:00
Chris Craik
3b2ba44be3 Merge "Improve logging around performance critical events" into lmp-mr1-dev 2014-11-20 17:36:26 +00:00
Jorim Jaggi
6456513f6f am bf1960ce: Merge "Fade notifications when exiting dozing" into lmp-mr1-dev 
* commit 'bf1960ce9c353267490d65cc1b8beacc7dd85347':
  Fade notifications when exiting dozing
 2014-11-20 17:31:55 +00:00
Jorim Jaggi
bf1960ce9c Merge "Fade notifications when exiting dozing" into lmp-mr1-dev 2014-11-20 17:25:49 +00:00
Selim Cinek
c9a39c7dd1 am b18cbb9a: Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev 
* commit 'b18cbb9a19d2213c0a5b1feecee5e9d4e88125c4':
  Fixed a bug where the notifications were not animating
 2014-11-20 17:06:08 +00:00
Selim Cinek
b18cbb9a19 Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev 2014-11-20 17:01:24 +00:00
George Mount
bf50b88ed7 am 41975454: Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev 
* commit '419754545ea0768a7fa715daddedef75b7b31bfa':
  Reset the transitionAlpha after the transition completes.
 2014-11-20 15:33:13 +00:00
George Mount
419754545e Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev 2014-11-20 15:29:26 +00:00
George Mount
b8835791e2 am 485ac778: Merge "Slide supports Gravity.START and Gravity.END." into lmp-mr1-dev 
* commit '485ac7782ed7605507bf2186246f59c537f8b578':
  Slide supports Gravity.START and Gravity.END.
 2014-11-20 15:27:38 +00:00
George Mount
485ac7782e Merge "Slide supports Gravity.START and Gravity.END." into lmp-mr1-dev 2014-11-20 15:23:55 +00:00