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

92426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
70bc9f24ce Fix keyguard dimensions; IME state for password view; layouts 
Fix a bug where ordering during inflation caused us not to set a
keyguard callback early enough to properly modify window flags. Add a
gross hack to work around this for now.

Fix status layouts to scale a bit more gracefully in the presence of
an IME.

Fix password layouts to scale more gracefully in the presence of an
IME

Bug 7343312
Bug 7341795
Bug 7342963
Bug 7343089

Change-Id: Ifb2c06defef11e8f7f9d0e09855632ed491bb31c
 2012-10-13 01:25:51 -07:00
Jim Miller
b8d328866c am b2a50011: am 14c64ab2: am 211a18e2: Merge "Partial fix for blank widget page" into jb-mr1-dev 
* commit 'b2a50011b9d667de7dbbaa94c86461a990915632':
  Partial fix for blank widget page
 2012-10-13 01:22:32 -07:00
Jim Miller
b2a50011b9 am 14c64ab2: am 211a18e2: Merge "Partial fix for blank widget page" into jb-mr1-dev 
* commit '14c64ab214864466dc440d55f3646146119df355':
  Partial fix for blank widget page
 2012-10-13 01:20:01 -07:00
Jim Miller
14c64ab214 am 211a18e2: Merge "Partial fix for blank widget page" into jb-mr1-dev 
* commit '211a18e2d6548ffc4657b8199661a1764f1008e0':
  Partial fix for blank widget page
 2012-10-13 01:18:03 -07:00
Jim Miller
211a18e2d6 Merge "Partial fix for blank widget page" into jb-mr1-dev 2012-10-13 01:16:32 -07:00
Jim Miller
bddc839d86 am 098f4578: am b42bf694: am 28dc64b8: Merge "Disable loading widgets in single-stage keyguard" into jb-mr1-dev 
* commit '098f45784d86b14c8e65fdcade3045a2ea2e7cb1':
  Disable loading widgets in single-stage keyguard
 2012-10-13 00:35:04 -07:00
Jim Miller
098f45784d am b42bf694: am 28dc64b8: Merge "Disable loading widgets in single-stage keyguard" into jb-mr1-dev 
* commit 'b42bf6941156f49fd240607b9ed4163113e9a825':
  Disable loading widgets in single-stage keyguard
 2012-10-13 00:32:43 -07:00
Jim Miller
b42bf69411 am 28dc64b8: Merge "Disable loading widgets in single-stage keyguard" into jb-mr1-dev 
* commit '28dc64b86b6648d8b38eb202531e20560e1298bc':
  Disable loading widgets in single-stage keyguard
 2012-10-13 00:30:47 -07:00
Jim Miller
28dc64b86b Merge "Disable loading widgets in single-stage keyguard" into jb-mr1-dev 2012-10-13 00:29:16 -07:00
Kenny Root
1c3f8affa9 am 58b99bf1: am 82634313: Merge "Reject bad ResXMLTree::setTo calls" 
* commit '58b99bf1d8d203d91a63619a99a8f29911ba58bc':
  Reject bad ResXMLTree::setTo calls
 2012-10-12 23:59:58 -07:00
Kenny Root
58b99bf1d8 am 82634313: Merge "Reject bad ResXMLTree::setTo calls" 
* commit '826343138dfd8666d2263dd82bfdbf657fc1881e':
  Reject bad ResXMLTree::setTo calls
 2012-10-12 23:57:38 -07:00
Kenny Root
826343138d Merge "Reject bad ResXMLTree::setTo calls" 2012-10-12 23:46:14 -07:00
Adam Powell
fa87109c56 am 75cf582c: am eda02c7e: am 308b1a66: Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev 
* commit '75cf582c028ffe179521825a1908cd747f190a33':
  Fix offsets for glowpad on keyguard
 2012-10-12 20:03:44 -07:00
Adam Powell
75cf582c02 am eda02c7e: am 308b1a66: Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev 
* commit 'eda02c7e3204a5e6dfdac8fb84c61a112fdc6823':
  Fix offsets for glowpad on keyguard
 2012-10-12 20:01:45 -07:00
Adam Powell
eda02c7e32 am 308b1a66: Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev 
* commit '308b1a66b2d109feb509998bd50557ac7e6c90f4':
  Fix offsets for glowpad on keyguard
 2012-10-12 19:59:28 -07:00
Adam Powell
308b1a66b2 Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev 2012-10-12 19:57:15 -07:00
Adam Powell
f8b93b5503 Fix offsets for glowpad on keyguard 
Bug 7342491

Change-Id: Id9733070c28a85c47ac8b982768e47a4254bd825
 2012-10-12 19:33:49 -07:00
Jason Sams
1592c79a40 am bc265564: am 08dd6d1f: am 56754193: Merge "Fix cycle detection for SGs." into jb-mr1-dev 
* commit 'bc265564746f7321e1d8277449a90c9e8e4ad824':
  Fix cycle detection for SGs.
 2012-10-12 19:11:54 -07:00
Jason Sams
bc26556474 am 08dd6d1f: am 56754193: Merge "Fix cycle detection for SGs." into jb-mr1-dev 
* commit '08dd6d1f0e92a93b499dd4d63ef0f23c728adc97':
  Fix cycle detection for SGs.
 2012-10-12 19:10:05 -07:00
Jason Sams
2f52e8786b am 3f409268: am d473f83a: am 10542ec3: Merge "Port ImageProcessing to Filterscript." into jb-mr1-dev 
* commit '3f40926804ca72a598e955248348a4d080413e06':
  Port ImageProcessing to Filterscript.
 2012-10-12 19:09:14 -07:00
Jason Sams
5498d13910 am 63dc7337: am 7f2083fe: am 73db36e6: Merge "Fix crash in ImageProcessing blend test" into jb-mr1-dev 
* commit '63dc733775f5ea5eb0bcb491e03ff9ee83c64979':
  Fix crash in ImageProcessing blend test
 2012-10-12 19:09:10 -07:00
Victoria Lease
ab4d6b909c am bfb29465: am 04bb190c: am f402fa46: Merge "Simplify fused location provider." into jb-mr1-dev 
* commit 'bfb294651eb68b20e11ca7e1edd4cd23f1116291':
  Simplify fused location provider.
 2012-10-12 19:07:25 -07:00
Jason Sams
08dd6d1f0e am 56754193: Merge "Fix cycle detection for SGs." into jb-mr1-dev 
* commit '5675419356793a546e58482a51e245ee34500758':
  Fix cycle detection for SGs.
 2012-10-12 19:07:12 -07:00
Jason Sams
3f40926804 am d473f83a: am 10542ec3: Merge "Port ImageProcessing to Filterscript." into jb-mr1-dev 
* commit 'd473f83a3e6591842d66a3d35d916843a9ad25a5':
  Port ImageProcessing to Filterscript.
 2012-10-12 19:07:12 -07:00
Jason Sams
63dc733775 am 7f2083fe: am 73db36e6: Merge "Fix crash in ImageProcessing blend test" into jb-mr1-dev 
* commit '7f2083fe481f7e31d36f9ea96f945273dbd58526':
  Fix crash in ImageProcessing blend test
 2012-10-12 19:05:21 -07:00
Jason Sams
d473f83a3e am 10542ec3: Merge "Port ImageProcessing to Filterscript." into jb-mr1-dev 
* commit '10542ec336f006b5ff311ab53f43750ea9d84838':
  Port ImageProcessing to Filterscript.
 2012-10-12 19:04:26 -07:00
Victoria Lease
bfb294651e am 04bb190c: am f402fa46: Merge "Simplify fused location provider." into jb-mr1-dev 
* commit '04bb190c541a2cecd9bdf33ec35474a2e9f8f95d':
  Simplify fused location provider.
 2012-10-12 19:03:35 -07:00
Jason Sams
5675419356 Merge "Fix cycle detection for SGs." into jb-mr1-dev 2012-10-12 19:02:56 -07:00
Jason Sams
7f2083fe48 am 73db36e6: Merge "Fix crash in ImageProcessing blend test" into jb-mr1-dev 
* commit '73db36e6d8e4ad89c710783b66b99064e483b614':
  Fix crash in ImageProcessing blend test
 2012-10-12 19:02:43 -07:00
Jason Sams
10542ec336 Merge "Port ImageProcessing to Filterscript." into jb-mr1-dev 2012-10-12 19:01:38 -07:00
Victoria Lease
04bb190c54 am f402fa46: Merge "Simplify fused location provider." into jb-mr1-dev 
* commit 'f402fa46257f4ef61ce1e91901dfb44ff5f7f87c':
  Simplify fused location provider.
 2012-10-12 19:01:07 -07:00
Jason Sams
73db36e6d8 Merge "Fix crash in ImageProcessing blend test" into jb-mr1-dev 2012-10-12 19:00:21 -07:00
Victoria Lease
f402fa4625 Merge "Simplify fused location provider." into jb-mr1-dev 2012-10-12 18:58:37 -07:00
Fabrice Di Meglio
58072b573d am df4bcd6a: am b65b5133: am f9307c5c: Merge "Fix bug #7334966 Padding is still broken in RTL languages" into jb-mr1-dev 
* commit 'df4bcd6a36ae2e0248791f35c10f6f100543b2c6':
  Fix bug #7334966 Padding is still broken in RTL languages
 2012-10-12 18:32:29 -07:00
Fabrice Di Meglio
df4bcd6a36 am b65b5133: am f9307c5c: Merge "Fix bug #7334966 Padding is still broken in RTL languages" into jb-mr1-dev 
* commit 'b65b5133e7590e68053bbf4530b31b7206c7b984':
  Fix bug #7334966 Padding is still broken in RTL languages
 2012-10-12 18:29:59 -07:00
Fabrice Di Meglio
b65b5133e7 am f9307c5c: Merge "Fix bug #7334966 Padding is still broken in RTL languages" into jb-mr1-dev 
* commit 'f9307c5c00bd3e8338bd478fec67a0190d515558':
  Fix bug #7334966 Padding is still broken in RTL languages
 2012-10-12 18:28:33 -07:00
Fabrice Di Meglio
f9307c5c00 Merge "Fix bug #7334966 Padding is still broken in RTL languages" into jb-mr1-dev 2012-10-12 18:25:55 -07:00
Jim Miller
ea06c3ed6f Disable loading widgets in single-stage keyguard 
Change-Id: I8975c3a8e6ba060987fda2d0d4b9fc8dc0686d06
 2012-10-12 17:55:07 -07:00
Dianne Hackborn
49c762f79a am 547c20df: am 48f6b7e2: am 59cb2cf1: Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev 
* commit '547c20dfc88c7981449fcfdecf7deaa17d6fedc2':
  Revert fix to issue #6880627: PendingIntent.getService() returns...
 2012-10-12 17:50:32 -07:00
Dianne Hackborn
547c20dfc8 am 48f6b7e2: am 59cb2cf1: Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev 
* commit '48f6b7e228f4b18181756b7c97df094b86a550aa':
  Revert fix to issue #6880627: PendingIntent.getService() returns...
 2012-10-12 17:48:12 -07:00
Dianne Hackborn
48f6b7e228 am 59cb2cf1: Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev 
* commit '59cb2cf15c912280b32292c79c2c0e5bfea49b68':
  Revert fix to issue #6880627: PendingIntent.getService() returns...
 2012-10-12 17:46:39 -07:00
Dianne Hackborn
59cb2cf15c Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev 2012-10-12 17:43:46 -07:00
Robert Greenwalt
53c04bdd35 Monitor the right interface re VPN 
Must remember the outer interface - undoes a change from a
couple months ago that broke things.

bug:7336302
Change-Id: Ia4f60862c60f3078853e151980e09cbf22a57222
 2012-10-12 17:02:45 -07:00
Michael Jurka
f72118446b am 734a68fb: am 3b61f479: am f15005ee: Merge "Use black bg in recents if using live wallpaper" into jb-mr1-dev 
* commit '734a68fb20e2f10cb013066e745151e05d0ce5c2':
  Use black bg in recents if using live wallpaper
 2012-10-12 16:48:21 -07:00
Michael Jurka
734a68fb20 am 3b61f479: am f15005ee: Merge "Use black bg in recents if using live wallpaper" into jb-mr1-dev 
* commit '3b61f479cdc6efc0a181103f14e59ec520f08713':
  Use black bg in recents if using live wallpaper
 2012-10-12 16:45:58 -07:00
Michael Jurka
3b61f479cd am f15005ee: Merge "Use black bg in recents if using live wallpaper" into jb-mr1-dev 
* commit 'f15005ee3926302588d19f1be6ad4a62b3e691b4':
  Use black bg in recents if using live wallpaper
 2012-10-12 16:43:42 -07:00
Michael Jurka
f15005ee39 Merge "Use black bg in recents if using live wallpaper" into jb-mr1-dev 2012-10-12 16:41:48 -07:00
Guang Zhu
8a8881916e am a1672140: am d3036f7e: am d4805af6: Merge "use BufferedInputStream in readTextFile" into jb-mr1-dev 
* commit 'a16721402b20dd0c53e54aa2fe274a283e9d7dbd':
  use BufferedInputStream in readTextFile
 2012-10-12 16:35:16 -07:00
The Android Automerger
4f66a631bf merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 16:34:33 -07:00
Guang Zhu
a16721402b am d3036f7e: am d4805af6: Merge "use BufferedInputStream in readTextFile" into jb-mr1-dev 
* commit 'd3036f7e89747d7347eb8b94c5517162cc71b5af':
  use BufferedInputStream in readTextFile
 2012-10-12 16:33:57 -07:00