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

64213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
b69c8cab56 am 0235016a: am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1 
* commit '0235016acb241556f24689e3d818db6973b5ad4f':
  Insert into user dict with the correct locale
 2011-12-07 19:03:30 -08:00
John Wang
2de0b07f47 am ca0a68cc: Merge "Correct the dialing number of structured MMI." into ics-mr1 
* commit 'ca0a68cc8afd023c94bcd5a1f3f2b2f9407fbe3b':
  Correct the dialing number of structured MMI.
 2011-12-07 18:51:11 -08:00
John Wang
ca0a68cc8a Merge "Correct the dialing number of structured MMI." into ics-mr1 2011-12-07 18:49:28 -08:00
Gilles Debunne
0235016acb am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1 
* commit '2df13452e05745a3da624c34018da983173c32c4':
  Insert into user dict with the correct locale
 2011-12-07 18:42:04 -08:00
Gilles Debunne
2df13452e0 Merge "Insert into user dict with the correct locale" into ics-mr1 2011-12-07 18:41:04 -08:00
Adam Powell
243657993c resolved conflicts for merge of db81dc72 to master 
Change-Id: Ie7e1d9a255934e45d8b241b15e9674046cff2444
 2011-12-07 18:18:58 -08:00
Jaikumar Ganesh
a544d467f2 Reduce likelihood of crash in state machine. 
Reduce likelihood of crash when state machine has quit and someone
sends a message using one of the public functions.

Bug: 5724844

Change-Id: I6582a1d19113e6ed545c8ab20adb0a414d8784a7
 2011-12-07 18:07:29 -08:00
Adam Powell
db81dc7233 am cf6a6522: Merge "Raise touch slop value from previous experiment" into ics-mr1 
* commit 'cf6a6522fdbce05896d3a551f7cd6243857ceced':
  Raise touch slop value from previous experiment
 2011-12-07 17:57:08 -08:00
Adam Powell
cf6a6522fd Merge "Raise touch slop value from previous experiment" into ics-mr1 2011-12-07 17:55:35 -08:00
Adam Powell
6720a87ad1 Raise touch slop value from previous experiment 
Change-Id: I7681c401803643f309fd988824602169a830de29
 2011-12-07 17:53:46 -08:00
Daniel Sandler
fa0a5c84d3 am 1ba22cc3: am b490d8d6: am 29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1 
* commit '1ba22cc33d0a87154e8ab94b8d4883e4c7083f8c':
  Improve handling of small largeIcons in tablet ticker.
 2011-12-07 17:45:52 -08:00
Daniel Sandler
1ba22cc33d am b490d8d6: am 29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1 
* commit 'b490d8d6214114391622b4302ca2f5f39b2166c6':
  Improve handling of small largeIcons in tablet ticker.
 2011-12-07 17:43:39 -08:00
Daniel Sandler
b490d8d621 am 29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1 
* commit '29933fb26a4294a9bd30f9227809e28949252833':
  Improve handling of small largeIcons in tablet ticker.
 2011-12-07 17:42:07 -08:00
Daniel Sandler
29933fb26a Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1 2011-12-07 17:40:07 -08:00
Joe Malin
f56042afac am 84a0060e: am bea42859: am aa2719df: am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0 
* commit '84a0060ea1379eec2f6f2a9e48fa7e1ada3a4fa9':
  DOC CHANGE: Add text for android.os.storage
 2011-12-07 17:19:02 -08:00
Dianne Hackborn
967baafe51 am 7e05b4a3: am 7377e593: am 0e385ee4: am b32785c6: Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0 
* commit '7e05b4a3097a8e2254de3c9bf7cbba28926c9cf9':
  More fixing for issue #5366535: Lockscreen has wrong layout...
 2011-12-07 17:19:00 -08:00
Joe Malin
84a0060ea1 am bea42859: am aa2719df: am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0 
* commit 'bea4285934b4cd5bab21f7c69ac82d871b6ee05f':
  DOC CHANGE: Add text for android.os.storage
 2011-12-07 17:17:09 -08:00
Dianne Hackborn
7e05b4a309 am 7377e593: am 0e385ee4: am b32785c6: Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0 
* commit '7377e59314885b8ef65bd19d04984998cb2e5ff4':
  More fixing for issue #5366535: Lockscreen has wrong layout...
 2011-12-07 17:17:07 -08:00
Dianne Hackborn
71a2968e29 am 41e0b205: am 2657d889: (-s ours) am b259c04d: Merge "Merge commit \'eee12419\' into manualmerge" into ics-mr1 
* commit '41e0b205c4ac28b2ca583d9de5ea1676786ba882':
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...
 2011-12-07 17:16:49 -08:00
Dianne Hackborn
41e0b205c4 am 2657d889: (-s ours) am b259c04d: Merge "Merge commit \'eee12419\' into manualmerge" into ics-mr1 
* commit '2657d889ea7e60f5d97926dc7720e9780b6796e0':
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...
 2011-12-07 17:14:48 -08:00
Joe Malin
bea4285934 am aa2719df: am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0 
* commit 'aa2719df72225402737009b1cc2e3cfea8e74bc7':
  DOC CHANGE: Add text for android.os.storage
 2011-12-07 17:14:47 -08:00
Dianne Hackborn
7377e59314 am 0e385ee4: am b32785c6: Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0 
* commit '0e385ee4de901f4c509374fad5bc040a2ac80721':
  More fixing for issue #5366535: Lockscreen has wrong layout...
 2011-12-07 17:14:46 -08:00
Robert Greenwalt
1deceb8fb6 am 7776da1b: am 4741163c: am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 
* commit '7776da1b79851d7a794b1ecb5bf990a5161a68c1':
  Fix NPE in trimV4AddrZeros.
 2011-12-07 17:14:36 -08:00
Robert Greenwalt
7776da1b79 am 4741163c: am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 
* commit '4741163cd719ce88eddf17ebb0a3ffd6a8044fbe':
  Fix NPE in trimV4AddrZeros.
 2011-12-07 17:12:47 -08:00
Dianne Hackborn
2657d889ea am b259c04d: Merge "Merge commit \'eee12419\' into manualmerge" into ics-mr1 
* commit 'b259c04d4321536ef9f5cc9b55079d3bd450eef7':
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...
 2011-12-07 17:12:43 -08:00
Joe Malin
aa2719df72 am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0 
* commit '3937e055708a8618f184feab204fed4bb41f3f6e':
  DOC CHANGE: Add text for android.os.storage
 2011-12-07 17:11:59 -08:00
Dianne Hackborn
0e385ee4de am b32785c6: Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0 
* commit 'b32785c6e893743956e28b285b8e6f6fc7aa8edb':
  More fixing for issue #5366535: Lockscreen has wrong layout...
 2011-12-07 17:11:57 -08:00
Robert Greenwalt
4741163cd7 am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 
* commit 'fbb09ea84f7a9df94358f05f4e680cb363bae663':
  Fix NPE in trimV4AddrZeros.
 2011-12-07 17:10:37 -08:00
Dianne Hackborn
b259c04d43 Merge "Merge commit 'eee12419' into manualmerge" into ics-mr1 2011-12-07 17:10:34 -08:00
Robert Greenwalt
fbb09ea84f Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 2011-12-07 17:09:05 -08:00
Amith Yamasani
f1f026f283 am 7029f19d: am 675a5ba8: am 3b5555fc: Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1 
* commit '7029f19dc8d55e56f5f27458e2d763546dad81e9':
  Make new ringer toggles on power menu accessible and navigable with keyboard.
 2011-12-07 17:01:31 -08:00
Amith Yamasani
7029f19dc8 am 675a5ba8: am 3b5555fc: Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1 
* commit '675a5ba82f886d8a5f954219b6544a97acb17e29':
  Make new ringer toggles on power menu accessible and navigable with keyboard.
 2011-12-07 16:58:45 -08:00
Amith Yamasani
675a5ba82f am 3b5555fc: Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1 
* commit '3b5555fc4483f6813f3df4787d98dd5357851566':
  Make new ringer toggles on power menu accessible and navigable with keyboard.
 2011-12-07 16:56:17 -08:00
Robert Greenwalt
0faacf0658 Fix NPE in trimV4AddrZeros. 
Change-Id: Id6ab91dabce4a2adba02f2601bc1157e87b782c3
 2011-12-07 16:55:38 -08:00
Amith Yamasani
3b5555fc44 Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1 2011-12-07 16:54:31 -08:00
Eric Laurent
c1bbada232 am 71087709: Merge "Fix audio effect tests" 
* commit '71087709aad07cc6492f64444acf9acc48495003':
  Fix audio effect tests
 2011-12-07 16:46:56 -08:00
Eric Laurent
71087709aa Merge "Fix audio effect tests" 2011-12-07 16:45:07 -08:00
Dianne Hackborn
185d0e7f0a More fixing for issue #5366535: Lockscreen has wrong layout... 
...but corrects itself

Change upgrade window to not allow the device to rotate while it is shown.

Change-Id: I75b126ab8806b84a0351e2706ebea10570bde575
 2011-12-07 16:42:14 -08:00
Dianne Hackborn
260fdd35c3 DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen... 
...has wrong layout but corrects itself

Maybe fix issue #5405788: Device continuously opening and closing...

...the "Complete action using" dialog

I have never been able to reproduce this consistently, but here is
another stab in the twilight.  It looks like during boot we have
a potential race where we could reset the config sequence number after
we had gone through a config change, causing ActivityThread to ignore
a following config change.  Maybe this change will help.

Change-Id: I7199b6de370488e8d897d6a78ff6f15624da862c
 2011-12-07 16:42:13 -08:00
Daniel Sandler
f6c2961830 am 0a290984: am 940a49c8: am dc8cb9aa: Merge "Invalidate the whole status bar after layout transitions." into ics-mr1 
* commit '0a2909840fae6d16efc5f7afb313b03fd401cbd9':
  Invalidate the whole status bar after layout transitions.
 2011-12-07 16:40:49 -08:00
John Wang
2690817815 Correct the dialing number of structured MMI. 
According to TS 22.030 6.5.2 "Structure of the MMI", the dialing number
can not end with #. The format is like *SC*SI#DN. Correct the mmi pattern
to exclude DN# case. With this fix, processCode() will tread *NNN#DN#,
e.g. *400#16 digit number# in bug 5622718, as USSD and send via
RIL_REQUEST_SEND_USSD.

bug:5622718
Change-Id: Ifc8d0edff4308602a5f3fc651cf116bf6bad3cbc
 2011-12-07 16:38:56 -08:00
Daniel Sandler
0a2909840f am 940a49c8: am dc8cb9aa: Merge "Invalidate the whole status bar after layout transitions." into ics-mr1 
* commit '940a49c89c0ccca8ba38028c209a4a135b23dd8f':
  Invalidate the whole status bar after layout transitions.
 2011-12-07 16:38:12 -08:00
Daniel Sandler
940a49c89c am dc8cb9aa: Merge "Invalidate the whole status bar after layout transitions." into ics-mr1 
* commit 'dc8cb9aa7e8f341ab88ae57e9d2cb99502844e5b':
  Invalidate the whole status bar after layout transitions.
 2011-12-07 16:35:46 -08:00
Daniel Sandler
dc8cb9aa7e Merge "Invalidate the whole status bar after layout transitions." into ics-mr1 2011-12-07 16:33:31 -08:00
Dianne Hackborn
b50c768a8a Merge commit 'eee12419' into manualmerge 2011-12-07 16:33:15 -08:00
Russell Brenner
935c571663 am 0d8e8117: am 9a8a7be7: am 1662a874: Merge "Update Armenian and Georgian fonts" into ics-mr1 
* commit '0d8e8117830cb6ae450efd69b641795ff264dff8':
  Update Armenian and Georgian fonts
 2011-12-07 16:26:58 -08:00
Russell Brenner
0d8e811783 am 9a8a7be7: am 1662a874: Merge "Update Armenian and Georgian fonts" into ics-mr1 
* commit '9a8a7be701b42cefc8da464c1d1436c78383095f':
  Update Armenian and Georgian fonts
 2011-12-07 16:24:06 -08:00
Russell Brenner
9a8a7be701 am 1662a874: Merge "Update Armenian and Georgian fonts" into ics-mr1 
* commit '1662a874fb65b915b6c3d8a213c1bd0c718059b5':
  Update Armenian and Georgian fonts
 2011-12-07 16:22:24 -08:00
Russell Brenner
1662a874fb Merge "Update Armenian and Georgian fonts" into ics-mr1 2011-12-07 16:20:15 -08:00
Jeff Brown
5481718085 am 0c5c2884: am 03be4d9c: am ff3b5a82: Merge "Make the dock orientation override the HDMI orientation." into ics-mr1 
* commit '0c5c2884542be5313007cb2ba22c409133e5ec5a':
  Make the dock orientation override the HDMI orientation.
 2011-12-07 16:08:08 -08:00