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

122687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
be3056050d am ee209289: am dd5b4cc9: am 3b9b40f7: am 31db1bba: am cf010ab9: add google cast feature page 
* commit 'ee20928913889eace0388f348c09f1f801272fd6':
  add google cast feature page
 2014-01-29 12:49:15 +00:00
Scott Main
1406a2203f am 92424e46: am 66b6ae35: am c510adb7: am 2d27da36: am 3781318f: add Cast to the sidenav 
* commit '92424e46ef6247e78c31d0f3dc68b62c78d12117':
  add Cast to the sidenav
 2014-01-29 12:20:54 +00:00
Mark Salyzyn
97cae3eae6 am c0b540dc: am 8bb5e662: am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db 
* commit 'c0b540dc8744eceabfcf09a45ec964cb9709027a':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
 2014-01-29 12:20:15 +00:00
Scott Main
ee20928913 am dd5b4cc9: am 3b9b40f7: am 31db1bba: am cf010ab9: add google cast feature page 
* commit 'dd5b4cc9ad1c95ec6819744a4878947acd2932cc':
  add google cast feature page
 2014-01-29 04:11:13 +00:00
Scott Main
dd5b4cc9ad am 3b9b40f7: am 31db1bba: am cf010ab9: add google cast feature page 
* commit '3b9b40f712f01c88f64f842529abd32f0e4277fe':
  add google cast feature page
 2014-01-29 04:08:47 +00:00
Scott Main
3b9b40f712 am 31db1bba: am cf010ab9: add google cast feature page 
* commit '31db1bbaa1f69600fe82b4691717772d08785364':
  add google cast feature page
 2014-01-29 04:05:24 +00:00
Scott Main
31db1bbaa1 am cf010ab9: add google cast feature page 
* commit 'cf010ab9c5df8896c57a722137ac3b4306ef1ca5':
  add google cast feature page
 2014-01-29 04:02:03 +00:00
Scott Main
cf010ab9c5 add google cast feature page 
Change-Id: Ie46b8ecdccea5ab3069176d15562d69aacc2d831
 2014-01-28 19:54:46 -08:00
Scott Main
92424e46ef am 66b6ae35: am c510adb7: am 2d27da36: am 3781318f: add Cast to the sidenav 
* commit '66b6ae359a552bb8b1d6ec20a9dff18500f0a820':
  add Cast to the sidenav
 2014-01-29 00:11:03 +00:00
Scott Main
66b6ae359a am c510adb7: am 2d27da36: am 3781318f: add Cast to the sidenav 
* commit 'c510adb7e6c7ab8c77beb6aff340511aeb644f14':
  add Cast to the sidenav
 2014-01-29 00:08:48 +00:00
Scott Main
c510adb7e6 am 2d27da36: am 3781318f: add Cast to the sidenav 
* commit '2d27da36489668d2fedce0bbdcfe50e96206bdd1':
  add Cast to the sidenav
 2014-01-29 00:06:11 +00:00
Scott Main
2d27da3648 am 3781318f: add Cast to the sidenav 
* commit '3781318fefba28699e7713b231c9591bf29eadac':
  add Cast to the sidenav
 2014-01-29 00:02:52 +00:00
Scott Main
3781318fef add Cast to the sidenav 
Change-Id: I7bb04e523363ad4964eb5bef405d9e2e4456e2d0
 2014-01-28 15:58:48 -08:00
Jim Miller
2b033dce9f Merge "Clean up KeyguardSecurityCallback documentation and add copyright header." 2014-01-28 23:25:47 +00:00
Jim Miller
5a8daad469 Clean up KeyguardSecurityCallback documentation and add copyright header. 
Bug 12135931

Change-Id: I9f2e20fb4c1a2cb6a9fb49f4b6939fd7687ef262
 2014-01-28 15:23:24 -08:00
Chris Craik
5e1814e2eb Merge "Remove logging of DisplayList staleness" 2014-01-28 23:18:05 +00:00
Fabrice Di Meglio
ab5e089585 Merge "Fix bug #12467741 Java crash in com.android.settings: java.lang.IllegalStateException: The content of the adapter has changed but ListView did not receive a notification." 2014-01-28 23:16:08 +00:00
Fabrice Di Meglio
ef4aad220f Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API" 2014-01-28 23:15:24 +00:00
Fabrice Di Meglio
fa55105137 Merge "Fix new TimePicker accessibility" 2014-01-28 23:14:49 +00:00
Jim Miller
e143e58cfd Merge "Move majority of security-related logic from KeyguardHostView to KeyguardSecurityContainer." 2014-01-28 23:13:31 +00:00
Svetoslav Ganov
c0877962b3 Adding the print and accessibility pacelables to framework.aidl 
1. There are a few parcelable classes related to printing and accessibility
   which are public but not added in the framework.aidl list so third parties
   cannot write aidl interfaces that pass these classes. As these classes
   are public it is resonable for devepers to be able to pass them between
   processes.

Change-Id: I85da1de5198902b74f19d23e3fe16b45b4a11051
 2014-01-28 23:00:14 +00:00
Fabrice Di Meglio
ba4d2a08f9 Fix bug #12467741 Java crash in com.android.settings: java.lang.IllegalStateException: The content of the adapter has changed but ListView did not receive a notification. 
- add missing notifyDataSetChanged() call

Change-Id: I633b78be3805bc8610b4aaeb70b1988768f764b7
 2014-01-28 14:55:17 -08:00
Mark Salyzyn
c0b540dc87 am 8bb5e662: am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db 
* commit '8bb5e66295f4f0f53dce13a877b922dead4639e8':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
 2014-01-28 21:45:16 +00:00
Mark Salyzyn
8bb5e66295 am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db 
* commit 'd732f561b24e643676812855396d0c9b9138b4c8':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
 2014-01-28 21:42:07 +00:00
Mark Salyzyn
d732f561b2 am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db 
* commit '2c6b048bed296949878318a7c60faf247f538e67':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
 2014-01-28 21:38:43 +00:00
Mark Salyzyn
2c6b048bed am 967c5d00: Merge changes I3659193f,I8b78e4db 
* commit '967c5d00dfcd890820c3ca82bc608814ebfe1cc1':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
 2014-01-28 13:36:14 -08:00
Mark Salyzyn
967c5d00df Merge changes I3659193f,I8b78e4db 
* changes:
  jni: Resolve build warnings
  jni: Incorporate liblog reading API
 2014-01-28 21:30:40 +00:00
Mike J. Chen
5dadeba229 am 1ece04f3: Merge "BluetoothInputJava: Add broadcast action REPORT" into klp-modular-dev 
* commit '1ece04f37fc93983ee058916e9913b6341e6de83':
  BluetoothInputJava: Add broadcast action REPORT
 2014-01-28 20:44:25 +00:00
Mike J. Chen
1ece04f37f Merge "BluetoothInputJava: Add broadcast action REPORT" into klp-modular-dev 2014-01-28 20:41:22 +00:00
Narayan Kamath
7f9a9bc7bf resolved conflicts for merge of e9febcc0 to master 
Resolved with "-s ours" because this change has already
been cherry-picked to master.
 2014-01-28 20:09:22 +00:00
Narayan Kamath
e9febcc02e am fa970bb1: am 8773d51e: resolved conflicts for merge of b82b2f98 to klp-dev-plus-aosp 
* commit 'fa970bb1e8ab3cd734f1719ac8590b43d1e40962':
  Track 64bit changes to android/graphics.
 2014-01-28 20:01:44 +00:00
Narayan Kamath
fa970bb1e8 am 8773d51e: resolved conflicts for merge of b82b2f98 to klp-dev-plus-aosp 
* commit '8773d51eae2a40d95adfe517476e9098eec14166':
  Track 64bit changes to android/graphics.
 2014-01-28 19:58:27 +00:00
Narayan Kamath
8773d51eae resolved conflicts for merge of b82b2f98 to klp-dev-plus-aosp 
Change-Id: Ia110056e5fdd2387c207748b17c5c17d1a18ac5b
 2014-01-28 19:47:58 +00:00
Narayan Kamath
8f5c89c46e am a35ca0ad: am 8697dc67: am be674bf6: am 23abbfbb: am 154614ab: Merge "AArch64: Use long for pointers in graphics/Camera" 
* commit 'a35ca0ada33757164003cd7aee635e6066d83893':
  AArch64: Use long for pointers in graphics/Camera
 2014-01-28 19:40:08 +00:00
Narayan Kamath
de22998fdd resolved conflicts for merge of 583b7b16 to master 
merged with "-s ours" since this change has already
been cherry-picked to master.
 2014-01-28 19:37:23 +00:00
Narayan Kamath
a35ca0ada3 am 8697dc67: am be674bf6: am 23abbfbb: am 154614ab: Merge "AArch64: Use long for pointers in graphics/Camera" 
* commit '8697dc674c7c5f33201d037e1c3ae59d9893a22d':
  AArch64: Use long for pointers in graphics/Camera
 2014-01-28 19:26:36 +00:00
Narayan Kamath
583b7b1671 am 39a789bf: am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible" 
* commit '39a789bf6efd5c3478a442e60e896cae371fd04c':
  AArch64: Make graphics classes 64-bit compatible
 2014-01-28 19:26:29 +00:00
Narayan Kamath
8697dc674c am be674bf6: am 23abbfbb: am 154614ab: Merge "AArch64: Use long for pointers in graphics/Camera" 
* commit 'be674bf688fec9ce4ec04e77c93644be8253d273':
  AArch64: Use long for pointers in graphics/Camera
 2014-01-28 19:22:12 +00:00
Narayan Kamath
39a789bf6e am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible" 
* commit '7ae1726d0b962878cce4c1fe6c814a315f253293':
  AArch64: Make graphics classes 64-bit compatible
 2014-01-28 19:22:07 +00:00
Narayan Kamath
be674bf688 am 23abbfbb: am 154614ab: Merge "AArch64: Use long for pointers in graphics/Camera" 
* commit '23abbfbb814501b825edc056027270f03f39506b':
  AArch64: Use long for pointers in graphics/Camera
 2014-01-28 19:18:45 +00:00
Narayan Kamath
7ae1726d0b am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible" 
* commit 'aa9ba887371e875ffbde49f43fa12bb5f123425b':
  AArch64: Make graphics classes 64-bit compatible
 2014-01-28 19:18:40 +00:00
Narayan Kamath
b82b2f9851 am 9b0f4be0: Merge "Track 64bit changes to android/graphics." 
* commit '9b0f4be0a20ee48a3ddf56438e846231955bd557':
  Track 64bit changes to android/graphics.
 2014-01-28 11:16:00 -08:00
Narayan Kamath
23abbfbb81 am 154614ab: Merge "AArch64: Use long for pointers in graphics/Camera" 
* commit '154614abbcc819c265bfb79b2626fcee66333ac2':
  AArch64: Use long for pointers in graphics/Camera
 2014-01-28 11:15:57 -08:00
Narayan Kamath
aa9ba88737 am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible" 
* commit '6e09eb4c6753f8e5cbd04f9b0c7b65046d27afdb':
  AArch64: Make graphics classes 64-bit compatible
 2014-01-28 11:15:47 -08:00
Narayan Kamath
9b0f4be0a2 Merge "Track 64bit changes to android/graphics." 2014-01-28 19:12:33 +00:00
Narayan Kamath
154614abbc Merge "AArch64: Use long for pointers in graphics/Camera" 2014-01-28 19:12:30 +00:00
Narayan Kamath
6e09eb4c67 Merge "AArch64: Make graphics classes 64-bit compatible" 2014-01-28 19:12:17 +00:00
Craig Mautner
e0d1e295f1 am af17925f: am 45b68ac3: am 09325627: am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager" 
* commit 'af17925f94c3a293022a4c41fc284a0a9312dcb6':
  [ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
 2014-01-28 18:19:50 +00:00
Craig Mautner
af17925f94 am 45b68ac3: am 09325627: am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager" 
* commit '45b68ac3a7acb7af95fdfc5c0e31560b3c28c9f8':
  [ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
 2014-01-28 18:17:31 +00:00
Craig Mautner
45b68ac3a7 am 09325627: am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager" 
* commit '093256279c308fd3cad290a1b01c5d313bace8af':
  [ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager
 2014-01-28 18:13:55 +00:00