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

89754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Cohen
819a194768 am 48b3e306: am c4c56222: Merge "Fix blank clock (issue 7344512)" into jb-mr1-dev 
* commit '48b3e3063b323952f25920856a20483a062a1437':
  Fix blank clock (issue 7344512)
 2012-10-13 19:39:04 -07:00
Adam Cohen
48b3e3063b am c4c56222: Merge "Fix blank clock (issue 7344512)" into jb-mr1-dev 
* commit 'c4c562223b0246d2cbb973d0b0ab63f860798475':
  Fix blank clock (issue 7344512)
 2012-10-13 19:36:58 -07:00
Adam Cohen
c4c562223b Merge "Fix blank clock (issue 7344512)" into jb-mr1-dev 2012-10-13 19:34:45 -07:00
Adam Cohen
c8a8dc40cb am 2e71e3f1: am 33387b1b: Merge "Fix edge case with status message (issue 7343848)" into jb-mr1-dev 
* commit '2e71e3f167ea1bc1016e562f66619843a0743b5e':
  Fix edge case with status message (issue 7343848)
 2012-10-13 19:28:42 -07:00
Adam Cohen
2e71e3f167 am 33387b1b: Merge "Fix edge case with status message (issue 7343848)" into jb-mr1-dev 
* commit '33387b1bee6813ea2f5cf82c7244dc90453a7c2c':
  Fix edge case with status message (issue 7343848)
 2012-10-13 19:26:45 -07:00
Adam Cohen
33387b1bee Merge "Fix edge case with status message (issue 7343848)" into jb-mr1-dev 2012-10-13 19:23:49 -07:00
Adam Cohen
7e39410f95 Fix blank clock (issue 7344512) 
Change-Id: Iad23f049fcc31ad8f08c99e7c3088e1523de1d45
 2012-10-13 19:10:56 -07:00
Adam Cohen
61ccc162a0 Fix edge case with status message (issue 7343848) 
-> When an unimportant message is set, we need to clear the security string
   so that battery / owner info takes precedence at that point.

Change-Id: I3f86b0c2cc8fb2fb0023fce77a7725d8ada96d9e
 2012-10-13 17:04:44 -07:00
Adam Cohen
138ff8dc9b am 30621122: am 32f9e8ff: Merge "Only showing important security messages in status area (issue 7341795)" into jb-mr1-dev 
* commit '30621122e57efa8717de58a35ccc21f62fb6637d':
  Only showing important security messages in status area (issue 7341795)
 2012-10-13 16:43:10 -07:00
Adam Cohen
30621122e5 am 32f9e8ff: Merge "Only showing important security messages in status area (issue 7341795)" into jb-mr1-dev 
* commit '32f9e8ffdd552aef550cd21c97d792b421cb12f9':
  Only showing important security messages in status area (issue 7341795)
 2012-10-13 16:41:21 -07:00
Adam Cohen
32f9e8ffdd Merge "Only showing important security messages in status area (issue 7341795)" into jb-mr1-dev 2012-10-13 16:38:48 -07:00
Adam Cohen
0a4f900463 Only showing important security messages in status area (issue 7341795) 
Change-Id: Ie2fcd4dd7130b4684223d0442f50e76435f61768
 2012-10-13 16:33:27 -07:00
Daniel Sandler
cdb5086b92 am 7fcc9b17: am e111ad30: No, that\'s German for "The Quick Settings, The". 
* commit '7fcc9b17811ae9ece8a27831f1891a935257b1e5':
  No, that's German for "The Quick Settings, The".
 2012-10-13 15:13:56 -07:00
Daniel Sandler
7fcc9b1781 am e111ad30: No, that\'s German for "The Quick Settings, The". 
* commit 'e111ad300d614a0f94e30f96ae664a1de578c48a':
  No, that's German for "The Quick Settings, The".
 2012-10-13 15:11:01 -07:00
Daniel Sandler
e111ad300d No, that's German for "The Quick Settings, The". 
Bug: ???????
Change-Id: I24ffb21b1566d98c9df6db48c4062390757cd8bc
 2012-10-13 17:23:47 -04:00
Adam Powell
57ca4d85be am 13b82d66: am 85341a76: Merge "Fix keyguard dimensions; IME state for password view; layouts" into jb-mr1-dev 
* commit '13b82d668db5013ff9aa6a2e471a821d31799bfe':
  Fix keyguard dimensions; IME state for password view; layouts
 2012-10-13 01:47:53 -07:00
Adam Powell
13b82d668d am 85341a76: Merge "Fix keyguard dimensions; IME state for password view; layouts" into jb-mr1-dev 
* commit '85341a76677abcccee757f7982b48b3bec2dcf63':
  Fix keyguard dimensions; IME state for password view; layouts
 2012-10-13 01:46:14 -07:00
Adam Powell
85341a7667 Merge "Fix keyguard dimensions; IME state for password view; layouts" into jb-mr1-dev 2012-10-13 01:44:13 -07:00
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
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
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
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
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
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
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
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
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