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

64198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dianne Hackborn
844b13155b am 0fea67ce: am 95c7cd56: am 87e06ec2: Merge "Fix issue #5144065: Tap on Music icon from Home screen..." into ics-mr1 
* commit '0fea67ce9124a6eef913febc70a2d7b3e0ca1c99':
  Fix issue #5144065: Tap on Music icon from Home screen...
 2011-12-07 16:08:06 -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
0c5c288454 am 03be4d9c: am ff3b5a82: Merge "Make the dock orientation override the HDMI orientation." into ics-mr1 
* commit '03be4d9cf456b7ad82e6fbbdea2b4902cb0e4abb':
  Make the dock orientation override the HDMI orientation.
 2011-12-07 16:05:48 -08:00
Dianne Hackborn
0fea67ce91 am 95c7cd56: am 87e06ec2: Merge "Fix issue #5144065: Tap on Music icon from Home screen..." into ics-mr1 
* commit '95c7cd56cc12179ad00623422814e8ba16646c34':
  Fix issue #5144065: Tap on Music icon from Home screen...
 2011-12-07 16:05:46 -08:00
Roman Nurik
06e2e0c2ba am 9ff5d8da: Merge "Cherry: Reduce file size for ADL presentation shareable." 
* commit '9ff5d8daa423eafcc5bbe95a414bf6f086c90a9b':
  Cherry: Reduce file size for ADL presentation shareable.
 2011-12-07 16:04:09 -08:00
Roman Nurik
d63126375f am ada19047: Merge "Cherry: Add Q3 2011 ADL slides to docs/shareables/adl" 
* commit 'ada1904717e356f479a3801834372fd103ac74f8':
  Cherry: Add Q3 2011 ADL slides to docs/shareables/adl
 2011-12-07 16:04:07 -08:00
Jeff Brown
03be4d9cf4 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:03:57 -08:00
Dianne Hackborn
95c7cd56cc 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:03:56 -08:00
Roman Nurik
9ff5d8daa4 Merge "Cherry: Reduce file size for ADL presentation shareable." 2011-12-07 15:54:16 -08:00
Roman Nurik
ada1904717 Merge "Cherry: Add Q3 2011 ADL slides to docs/shareables/adl" 2011-12-07 15:54:14 -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