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

64901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaikumar Ganesh
ddf8a0e629 am d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1 
* commit 'd426c338a66f63f8e5528ac38ec5b61625f2c897':
  Reduce likelihood of crash in state machine.
 2011-12-07 19:51:26 -08:00
Jaikumar Ganesh
d426c338a6 Merge "Reduce likelihood of crash in state machine." into ics-mr1 2011-12-07 19:50:03 -08:00
John Wang
7be6a4fd7f 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:20 -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
035b9c4099 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:07 -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
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
b723999beb 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:16 -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
751004993f 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:09 -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
549b55ba70 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:44 -08:00
Dianne Hackborn
289df55523 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:42 -08:00
Dianne Hackborn
36246f4c4e 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:39 -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
Dianne Hackborn
b259c04d43 Merge "Merge commit 'eee12419' into manualmerge" into ics-mr1 2011-12-07 17:10:34 -08:00
Robert Greenwalt
12bee3b3e2 am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 
* commit 'fbb09ea84f7a9df94358f05f4e680cb363bae663':
  Fix NPE in trimV4AddrZeros.
 2011-12-07 17:10:26 -08:00
Robert Greenwalt
fbb09ea84f Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 2011-12-07 17:09:05 -08:00
Amith Yamasani
423900850f 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
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
a50bbcd179 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:34: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
bf19243cf5 am 1662a874: Merge "Update Armenian and Georgian fonts" into ics-mr1 
* commit '1662a874fb65b915b6c3d8a213c1bd0c718059b5':
  Update Armenian and Georgian fonts
 2011-12-07 16:21:52 -08:00
Russell Brenner
1662a874fb Merge "Update Armenian and Georgian fonts" into ics-mr1 2011-12-07 16:20:15 -08:00
Joe Malin
3937e05570 Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0 2011-12-07 16:07:49 -08:00
Jeff Brown
e407f5d871 am ff3b5a82: Merge "Make the dock orientation override the HDMI orientation." into ics-mr1 
* commit 'ff3b5a828ea1f7409af4475898689804bed10ede':
  Make the dock orientation override the HDMI orientation.
 2011-12-07 16:04:30 -08:00
Dianne Hackborn
1a4822d6cc am 87e06ec2: Merge "Fix issue #5144065: Tap on Music icon from Home screen..." into ics-mr1 
* commit '87e06ec2fa57a54b92fe82f2cacfbf8a44e47baf':
  Fix issue #5144065: Tap on Music icon from Home screen...
 2011-12-07 16:04:29 -08:00
Russell Brenner
602d6393d4 Update Armenian and Georgian fonts 
New versions do not contain BCI hints, which were deleterious to
rendering in TextView with these particular fonts. WebView does not
use hints, and so TextView and WebView now render the same.

Font versions are updated from 1.00 to 1.01.

Bug: 5727604
Change-Id: Ib69318708994324caba36c10ac6159da70426d28
 2011-12-07 15:53:21 -08:00
Joe Malin
13235db8f7 DOC CHANGE: Add text for android.os.storage 
Change-Id: Ia5785cff3860907af4c53cbe769126496ee338c3
 2011-12-07 15:50:34 -08:00
Amith Yamasani
e48a160e57 Make new ringer toggles on power menu accessible and navigable with keyboard. 
Bug: 5721663

Added content descriptions and made the listview allow navigation between nested
views.

Change-Id: I69d78d65e1bab829f63c2e6025051206e511f00f
 2011-12-07 15:42:09 -08:00
Dianne Hackborn
b32785c6e8 Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0 2011-12-07 15:22:21 -08:00
Jeff Brown
ff3b5a828e Merge "Make the dock orientation override the HDMI orientation." into ics-mr1 2011-12-07 15:04:39 -08:00
Dianne Hackborn
87e06ec2fa Merge "Fix issue #5144065: Tap on Music icon from Home screen..." into ics-mr1 2011-12-07 15:01:55 -08:00
Dianne Hackborn
eee1241938 Merge "DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen..." into ics-mr0 2011-12-07 15:00:05 -08:00
Dianne Hackborn
d9efb95a0e 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 14:56:51 -08:00
Jason Simmons
0d77f84d0c Merge "Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged." into ics-aah 2011-12-07 14:36:39 -08:00
Winson Chung
7992f3e541 am 0a361b10: Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1 
* commit '0a361b10a665a3d158c846722290f26ce62276e1':
  Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)
 2011-12-07 14:35:59 -08:00
Winson Chung
0a361b10a6 Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1 2011-12-07 14:33:31 -08:00
Dianne Hackborn
04ea2d98af 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 14:18:05 -08:00
Dave Burke
fa5fc72635 am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1 
* commit '54a53841a9ff48ba4cd004469ae4ff77caed900a':
  Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
 2011-12-07 14:07:49 -08:00
Dave Burke
54a53841a9 Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1 2011-12-07 14:05:41 -08:00
Dianne Hackborn
ae0a0a84d1 Fix issue #5144065: Tap on Music icon from Home screen... 
... a different app opens

In some cases when reparenting activities we could end up with a reply
chain that crosses task boundaries, so if an activity below that needs
to be reparented we pull that and the activities above it up into the
new task.

Change-Id: Ia4fa041ab7069e39dac162ddbf5b8e1de98675b9
 2011-12-07 14:03:01 -08:00
Jason Simmons
aab52cd442 Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged. 
HDMI audio hotplug is treated as a "headset" in the audio services.  When a headset is unplugged,
WiredAccessoryObserver sends an AUDIO_BECOMING_NOISY broadcast so that applications can take
appropriate action (e.g. pausing audio if headphones were unplugged).

However, on Tungsten, when you unplug HDMI audio, the Music2 service was getting the NOISY intent
and pausing the transmitter media player.  We could add Tungsten-specific code to Music2 to
disable this behavior, but it's probably better to disable this broadcast entirely because
applications on Tungsten probably shouldn't treat HDMI hotplug in the same way they treat
headphone hotplug on phones.

Change-Id: I2d2b913f74f51fb496bd2f00f32e109bbff01fa1
 2011-12-07 13:52:23 -08:00
Robert Greenwalt
bcf9deedc3 am 3957b5fc: Fix the build. 
* commit '3957b5fc49335f13b15080b8e7146580026c0479':
  Fix the build.
 2011-12-07 13:17:35 -08:00
Robert Greenwalt
3957b5fc49 Fix the build. 
Change-Id: I71d1d9958182966d2eff0d34fa05ac57f2cabc48
 2011-12-07 13:10:59 -08:00