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

153931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
102ecc0e11 am 73c10aa4: am 82f7dc78: am c6273338: Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev 
* commit '73c10aa477896d0b46b223613e34781bb98589ff':
  Fix issue #16953886: History and batterystats checkin summary...
 2014-08-28 19:32:33 +00:00
Dianne Hackborn
93d0678e80 am 82f7dc78: am c6273338: Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev 
* commit '82f7dc780dc2fb1c877fce19bea9a9e92b0a0bac':
  Fix issue #16953886: History and batterystats checkin summary...
 2014-08-28 19:23:14 +00:00
Andrew Lee
1e8332a0e1 am 8a04e239: am 8cbe36c1: am 3968fc0e: Merge "Add CallProperties class, and use to on ParcelableCall." into lmp-dev 
* commit '8a04e23962ada20ef34fac2aa8c92c609441f06f':
  Add CallProperties class, and use to on ParcelableCall.
 2014-08-28 19:07:34 +00:00
John Spurlock
2ce182384a am 89649d1b: am da347330: am 682806ce: Merge "QS: Don\'t collapse the panel when turning location on." into lmp-dev 
* commit '89649d1bd764d9cf884a16786b1565eb171a01cc':
  QS: Don't collapse the panel when turning location on.
 2014-08-28 19:07:30 +00:00
Dianne Hackborn
3077ecee73 am c6273338: Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev 
* commit 'c6273338e904b1b391757a4604325eea35784931':
  Fix issue #16953886: History and batterystats checkin summary...
 2014-08-28 19:07:19 +00:00
Andrew Lee
13bc789607 am 8cbe36c1: am 3968fc0e: Merge "Add CallProperties class, and use to on ParcelableCall." into lmp-dev 
* commit '8cbe36c1a495aa29d358d9b96f53366b2ebdaa0b':
  Add CallProperties class, and use to on ParcelableCall.
 2014-08-28 19:01:39 +00:00
Dianne Hackborn
7e7f9a3f7c Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev 2014-08-28 18:58:16 +00:00
John Spurlock
8bcb0bad5c am da347330: am 682806ce: Merge "QS: Don\'t collapse the panel when turning location on." into lmp-dev 
* commit 'da34733065190feba7db6db43dc1714f95f7c15b':
  QS: Don't collapse the panel when turning location on.
 2014-08-28 18:54:35 +00:00
Andrew Lee
14be2fd3ea am 3968fc0e: Merge "Add CallProperties class, and use to on ParcelableCall." into lmp-dev 
* commit '3968fc0e453b206fb94581c4b9b9e34b961d790f':
  Add CallProperties class, and use to on ParcelableCall.
 2014-08-28 18:53:44 +00:00
Alan Viverette
3e53d52a9f am 6ddb2467: am 8a319757: am a5a9c6e0: Merge "Rename StatusBar.Material styles to Material.Notification" into lmp-dev 
* commit '6ddb2467b46a1c32a738a2082800cc9c19e9c053':
  Rename StatusBar.Material styles to Material.Notification
 2014-08-28 18:43:29 +00:00
George Mount
297a940edb am bc231f74: am fc83d404: am 077805bf: Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev 
* commit 'bc231f74ffb488a5b559c9d5603819273ea30898':
  Call SharedElementListener#setSharedElementEnd on back.
 2014-08-28 18:43:24 +00:00
George Mount
fbc0a6b385 am d91a4566: am 7ffe01f2: am b0333ac9: Merge "Allow arbitrarily-added shared elements." into lmp-dev 
* commit 'd91a4566b14eecd672194a6cbce813ae9f5c6ecb':
  Allow arbitrarily-added shared elements.
 2014-08-28 18:43:19 +00:00
John Spurlock
764173c1fd am 682806ce: Merge "QS: Don\'t collapse the panel when turning location on." into lmp-dev 
* commit '682806ceafad1389ac78e3df7d39a48ca739af7d':
  QS: Don't collapse the panel when turning location on.
 2014-08-28 18:40:38 +00:00
Andrew Lee
81289efcae Merge "Add CallProperties class, and use to on ParcelableCall." into lmp-dev 2014-08-28 18:39:16 +00:00
Nancy Chen
c39c6f06a8 am a13366b6: am 48add9d4: am 2ead90e0: Merge "Add field for sub_id in call log for sprout database." into lmp-dev 
* commit 'a13366b6279b047ad7bb4e0b2e8ef5e997e02b8a':
  Add field for sub_id in call log for sprout database.
 2014-08-28 18:30:39 +00:00
Jose Lima
b420cd132a am 639df5f0: am 0cdcdf5c: am 61c45885: Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 
* commit '639df5f03738f244d1d1ef10f099e5784ee1b3e8':
  Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()
 2014-08-28 18:30:34 +00:00
John Spurlock
832d351ca5 Merge "QS: Don't collapse the panel when turning location on." into lmp-dev 2014-08-28 18:30:29 +00:00
Alan Viverette
5f0d931d05 am 8a319757: am a5a9c6e0: Merge "Rename StatusBar.Material styles to Material.Notification" into lmp-dev 
* commit '8a3197576e89643df760357032ab847c3433342f':
  Rename StatusBar.Material styles to Material.Notification
 2014-08-28 18:27:52 +00:00
George Mount
05951ddc63 am fc83d404: am 077805bf: Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev 
* commit 'fc83d40438a331a6f06da4b4cb27c85621ef3019':
  Call SharedElementListener#setSharedElementEnd on back.
 2014-08-28 18:27:48 +00:00
George Mount
bc1d08849a am 7ffe01f2: am b0333ac9: Merge "Allow arbitrarily-added shared elements." into lmp-dev 
* commit '7ffe01f2158212c6b9c46e23e3167e832fe53c5f':
  Allow arbitrarily-added shared elements.
 2014-08-28 18:27:43 +00:00
John Spurlock
d21df6076f QS: Don't collapse the panel when turning location on. 
Bug:17127158
Change-Id: Ide92c2bd134a84dea796a62710a9016a679b0b74
 2014-08-28 14:25:05 -04:00
Nancy Chen
389eda0398 am 48add9d4: am 2ead90e0: Merge "Add field for sub_id in call log for sprout database." into lmp-dev 
* commit '48add9d40e014cd585058358bbbb2e48fc10fe74':
  Add field for sub_id in call log for sprout database.
 2014-08-28 18:18:44 +00:00
Jose Lima
7fa75c1d58 am 0cdcdf5c: am 61c45885: Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 
* commit '0cdcdf5cd1517760dcff30004a3e0f5686e68440':
  Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()
 2014-08-28 18:18:39 +00:00
Alan Viverette
e454802769 am a5a9c6e0: Merge "Rename StatusBar.Material styles to Material.Notification" into lmp-dev 
* commit 'a5a9c6e03b11d502c0b1e845611aad0171e51d9f':
  Rename StatusBar.Material styles to Material.Notification
 2014-08-28 18:15:55 +00:00
George Mount
0a0740b9f9 am 077805bf: Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev 
* commit '077805bfb0efe05654d136a2f3986f9f6e5b83ec':
  Call SharedElementListener#setSharedElementEnd on back.
 2014-08-28 18:15:51 +00:00
George Mount
9d039f7f8e am b0333ac9: Merge "Allow arbitrarily-added shared elements." into lmp-dev 
* commit 'b0333ac93c012fc389c3e66b3d6ce3e89f2db022':
  Allow arbitrarily-added shared elements.
 2014-08-28 18:15:46 +00:00
Alan Viverette
b712458362 Merge "Rename StatusBar.Material styles to Material.Notification" into lmp-dev 2014-08-28 18:13:21 +00:00
Yigit Boyar
b304c42e11 am f7347ee4: am 9662e6de: am 129ca22e: Merge "Use a weak observable in AutoCompleteTextView" into lmp-dev 
* commit 'f7347ee497a07669a73968efecee3c6622258070':
  Use a weak observable in AutoCompleteTextView
 2014-08-28 18:08:27 +00:00
Chris Craik
8ef4bf20e5 am da573fa7: am c00a7298: am 19b7a03f: Merge "Update transform isolation to handle command chunks" into lmp-dev 
* commit 'da573fa7f1701359839cbf2659e171e4f7938a9b':
  Update transform isolation to handle command chunks
 2014-08-28 18:08:22 +00:00
George Mount
de18420aff Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev 2014-08-28 18:05:40 +00:00
George Mount
01abcaa295 Merge "Allow arbitrarily-added shared elements." into lmp-dev 2014-08-28 18:02:27 +00:00
Nancy Chen
9a966397b9 am 2ead90e0: Merge "Add field for sub_id in call log for sprout database." into lmp-dev 
* commit '2ead90e02a70771d063e58b6ff42500327ddcd28':
  Add field for sub_id in call log for sprout database.
 2014-08-28 18:02:16 +00:00
Jose Lima
3a1c665a0e am 61c45885: Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 
* commit '61c45885bf335e32cc3509fd79762f72c7a46935':
  Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()
 2014-08-28 18:02:00 +00:00
Nancy Chen
d1a5a46368 Merge "Add field for sub_id in call log for sprout database." into lmp-dev 2014-08-28 17:55:50 +00:00
Yigit Boyar
4286fa20f5 am 9662e6de: am 129ca22e: Merge "Use a weak observable in AutoCompleteTextView" into lmp-dev 
* commit '9662e6ded368d0eeaca0ca857be3c32eeb5f3f40':
  Use a weak observable in AutoCompleteTextView
 2014-08-28 17:51:58 +00:00
Chris Craik
cdf4813881 am c00a7298: am 19b7a03f: Merge "Update transform isolation to handle command chunks" into lmp-dev 
* commit 'c00a7298d10781ee009f4f240e761bf84eccbe1b':
  Update transform isolation to handle command chunks
 2014-08-28 17:51:53 +00:00
Jose Lima
d3458a9c34 Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 2014-08-28 17:49:32 +00:00
John Reck
f76acc5ce3 am 22ad4f00: am d4e0267a: am f29b2624: Merge "Fix log line" into lmp-dev 
* commit '22ad4f00bf3a2e9aedf2c2a771b98a72f77df6f2':
  Fix log line
 2014-08-28 17:48:49 +00:00
Yigit Boyar
7167c1f763 am 129ca22e: Merge "Use a weak observable in AutoCompleteTextView" into lmp-dev 
* commit '129ca22eb526fa875465e06ed0ee39cee0065e51':
  Use a weak observable in AutoCompleteTextView
 2014-08-28 17:44:48 +00:00
Andrew Lee
223ad1455a Add CallProperties class, and use to on ParcelableCall. 
Bug: 17304243
Change-Id: I3ef6862391a9b96c70f4b12412160116e094ed34
 2014-08-28 10:42:01 -07:00
John Reck
1e1d8a5e15 am d4e0267a: am f29b2624: Merge "Fix log line" into lmp-dev 
* commit 'd4e0267a61d2af8d275f59faea74a3e68945b1fd':
  Fix log line
 2014-08-28 17:36:44 +00:00
Chris Craik
383d157175 am 19b7a03f: Merge "Update transform isolation to handle command chunks" into lmp-dev 
* commit '19b7a03fa697c8b0b850666ab7a2831ec8eac743':
  Update transform isolation to handle command chunks
 2014-08-28 17:34:34 +00:00
Yigit Boyar
3e92d2ec47 Merge "Use a weak observable in AutoCompleteTextView" into lmp-dev 2014-08-28 17:33:36 +00:00
Chris Craik
bf939b2671 Merge "Update transform isolation to handle command chunks" into lmp-dev 2014-08-28 17:27:24 +00:00
John Reck
4d46ce77e6 am f29b2624: Merge "Fix log line" into lmp-dev 
* commit 'f29b2624f648cde1de186cd6685c4ce67bcb0d53':
  Fix log line
 2014-08-28 17:26:05 +00:00
John Spurlock
1bb69d0688 am f1e0b838: am dcd367d2: am 70dcf487: Merge "Enhance audio service dumpsys." into lmp-dev 
* commit 'f1e0b838cefefe48130b2aa3e4461a37ea55b6a7':
  Enhance audio service dumpsys.
 2014-08-28 17:22:21 +00:00
John Reck
8df7949d48 am 0ed484c5: am 16c66174: am 2b21f462: Merge "Actually end animators on tree destruction" into lmp-dev 
* commit '0ed484c59b308080617037e11a6100e8176dc974':
  Actually end animators on tree destruction
 2014-08-28 17:22:17 +00:00
Chet Haase
fb609eacf0 am d8646c8d: am b6c2cf70: am f223babb: Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev 
* commit 'd8646c8d31e55ff4dd2fbf80f13a545c65925d72':
  Canceling ViewPropertyAnimator now removes pending actions
 2014-08-28 17:22:12 +00:00
John Reck
86469f5962 Merge "Fix log line" into lmp-dev 2014-08-28 17:13:24 +00:00
Robert Greenwalt
6afc1ac0d7 am 65ce2f17: am 709b9740: am 97733309: Merge "Clean up Connectivity Logging." into lmp-dev 
* commit '65ce2f1703a9e150e08cf3424e5e88bb84cae81c':
  Clean up Connectivity Logging.
 2014-08-28 17:10:53 +00:00