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

64177 Commits

Author SHA1 Message Date
Wink Saville
771e952ebc am 07fb2457: am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 68c21d6 
* commit '07fb24576a5a425798a2aa004dd49682f414cbf7':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:56:45 +00:00
Adam Lesinski
68976003f0 am 36671b92: am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev automerge: b7ce6d6 
* commit '36671b925c6b5b9e547561c5bacf3419cf71897f':
  Fix race when cleaning up receivers/services in Context
 2014-11-21 02:42:23 +00:00
Eric Rowe
97bc736e34 am 37368d7a: am 79de0066: Merge "Fix wifi tethering tests." into lmp-mr1-dev automerge: d2fd1bd 
* commit '37368d7ae493ad39c5ec8bb70afe64fcb0f6c31f':
  Fix wifi tethering tests.
 2014-11-21 02:42:18 +00:00
Wink Saville
07fb24576a am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
automerge: 68c21d6

* commit '68c21d6736a2ec54d36c8b33b815062c568e4707':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:39:23 +00:00
Adam Lesinski
36671b925c am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev 
automerge: b7ce6d6

* commit 'b7ce6d6db1409ec785d2d7146cbcc897fd02d85b':
  Fix race when cleaning up receivers/services in Context
 2014-11-21 02:36:57 +00:00
Eric Rowe
37368d7ae4 am 79de0066: Merge "Fix wifi tethering tests." into lmp-mr1-dev 
automerge: d2fd1bd

* commit 'd2fd1bd9d631e822b03bfabd41853cc3075f61bf':
  Fix wifi tethering tests.
 2014-11-21 02:35:36 +00:00
Alan Viverette
4d6b1549a7 am a19f0577: am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev 
automerge: aed1268

* commit 'aed12685b0e6e8146f3f22f5c938a4e3d6ca9b38':
  Move default token handling into WindowManagerImpl
 2014-11-21 02:23:47 +00:00
Alan Viverette
d250fc5915 am 05275a2c: am 93da37a0: Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev 
automerge: 16c5d25

* commit '16c5d2547b1fc1e15f6d2b62bf5c8c706506a16e':
  Add padding above and below dialog lists to match Material spec
 2014-11-21 02:22:40 +00:00
Dianne Hackborn
f8c3691425 am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev 
automerge: 377d6f0

* commit '377d6f00dc2ab42df501fd12b23e1dab54cea6b7':
  Fix issue with call backs from media process.
 2014-11-21 01:52:23 +00:00
Martijn Coenen
51041cb7da am a603f083: am 2bf6529b: Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev 
automerge: 0d4a4e6

* commit '0d4a4e6e59267ed58d9fe44303e400877aa1caab':
  Verify NFC permission immediately on API calls.
 2014-11-21 01:51:04 +00:00
RoboErik
fdc7f747f2 am 50b02d61: am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev 
automerge: 216c089

* commit '216c089834e92733055a17bcade7ca1971677b49':
  Scale bitmaps in metadata sent to the system
 2014-11-21 01:48:44 +00:00
Alan Viverette
aed12685b0 am a19f0577: am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev 
* commit 'a19f057792e21879f0f071f361c13bc9e41f6a9d':
  Move default token handling into WindowManagerImpl
 2014-11-21 01:38:26 +00:00
Alan Viverette
16c5d2547b am 05275a2c: am 93da37a0: Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev 
* commit '05275a2cbd2f31dbb098dc45a79379f1b7b964db':
  Add padding above and below dialog lists to match Material spec
 2014-11-21 01:38:21 +00:00
Chris Craik
06e7fe5a70 resolve merge conflicts of f2235b6 to master. 
Change-Id: Ibcef3a37ca0749931d509b53bd52e53a7d30ddbb
 2014-11-20 17:27:36 -08:00
Dianne Hackborn
377d6f00dc am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev 
* commit '42fec57f3addfb1958f814b5d6772ff81341ba20':
  Fix issue with call backs from media process.
 2014-11-21 00:43:51 +00:00
Martijn Coenen
0d4a4e6e59 am a603f083: am 2bf6529b: Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev 
* commit 'a603f083ff8dbbc5ed2803d8f402accac135d891':
  Verify NFC permission immediately on API calls.
 2014-11-21 00:43:45 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
John Spurlock
00c9de816a am 4adb8d49: am c70a4ccf: Merge "BatterySaver: Update disclosure string." into lmp-mr1-dev automerge: 61f4f68 
* commit '4adb8d496d14cdad83eed0a6972eade7979250ff':
  BatterySaver: Update disclosure string.
 2014-11-20 21:07:46 +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
Wink Saville
68c21d6736 am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '4a57e908177c86819ade1ebb813677698f1a526a':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-20 20:23:17 +00:00
Wink Saville
4a57e90817 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-20 20:20:02 +00:00
Adam Lesinski
b7ce6d6db1 am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev 
* commit '825e0da22a672ada95da2175bb2d48579bf88a0d':
  Fix race when cleaning up receivers/services in Context
 2014-11-20 20:18:51 +00:00
Eric Rowe
d2fd1bd9d6 am 79de0066: Merge "Fix wifi tethering tests." into lmp-mr1-dev 
* commit '79de00662be774328f4b3598c6effbf49474cc0b':
  Fix wifi tethering tests.
 2014-11-20 20:18:46 +00:00
Adam Lesinski
825e0da22a Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev 2014-11-20 20:13:54 +00:00