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

58681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
511ecc8cf9 am b849074c: Merge "Tell the resolver what protocols to use." into ics-factoryrom 
* commit 'b849074cb58edc15b0764afdde0326c0b6d5b147':
  Tell the resolver what protocols to use.
 2011-09-22 23:39:53 -07:00
Justin Ho
006dc043f0 am 4dfe8695: Merge "CAB assets" into ics-factoryrom 
* commit '4dfe869520b83b79cc5912f5bd0061b0ec33aa11':
  CAB assets
 2011-09-22 23:39:51 -07:00
Justin Ho
64edbc3093 am 777163e0: Merge "Updated emergency icon on lockscreen" into ics-factoryrom 
* commit '777163e0466bda76d64809b5fd6a1a688de67099':
  Updated emergency icon on lockscreen
 2011-09-22 23:39:49 -07:00
John Wang
5298a8c71a am dd6d1bbd: Merge "Update PUK unlock screen." into ics-factoryrom 
* commit 'dd6d1bbd15c4e5cf1b3e0ac34c96f29fb04863c6':
  Update PUK unlock screen.
 2011-09-22 23:39:37 -07:00
Adam Cohen
a0c7a5765d am 08ee7fa4: Merge "Fixing emergency dialer flicker on lock screen (issue 5314293)" into ics-factoryrom 
* commit '08ee7fa463aee5e83f77789e9a99f17a34ab68b4':
  Fixing emergency dialer flicker on lock screen (issue 5314293)
 2011-09-22 23:39:33 -07:00
Justin Ho
83227a2d06 am 31b638d4: Merge "Fix 5355659: Change chevron visuals, timing, and animated positioning" into ics-factoryrom 
* commit '31b638d40342fc9e3198f9e7f8dffaf55049c9e1':
  Fix 5355659: Change chevron visuals, timing, and animated positioning
 2011-09-22 23:39:31 -07:00
Mathias Agopian
0c92e4d747 Merge "don't clear the framebuffer when the framebuffer is not used" 2011-09-22 21:01:21 -07:00
Mathias Agopian
9f12c8b47b Merge "fix dumpsys wording for h/w composer" 2011-09-22 21:00:49 -07:00
Mathias Agopian
9fe96541c3 don't clear the framebuffer when the framebuffer is not used 
when areas of the FB are undefined (transparent windows on top of
nothing), we clear those areas before composition.
however, it makes no sense to do this when the FB is not in use
(case where hwc handles all layers)

Bug: 5360529
Change-Id: If51bb669307e8419bbe1f3a89d1c88e0ec1f216c
 2011-09-22 20:57:04 -07:00
Adam Powell
9b01e30cea Merge "Fix bug 5355912 - SearchView in ActionBar with Theme.Holo.Light.DarkActionBar gets black text" 2011-09-22 19:32:13 -07:00
Svetoslav Ganov
1ac6b1e221 Merge "ActivityChooserView not showing "Show all" properly if the default target button not shown." 2011-09-22 19:08:26 -07:00
Adam Powell
d65b3b99f0 Fix bug 5355912 - SearchView in ActionBar with 
Theme.Holo.Light.DarkActionBar gets black text

Make sure that menus generated for use in action bars get themed correctly.

Change-Id: I14ba676d296c785514425d40d89e62dc4ff1da1a
 2011-09-22 18:53:15 -07:00
Chia-chi Yeh
1dc43b5cc5 Merge "ip-up-vpn: Handle the case where INTERNAL_NETMASK4 is empty." 2011-09-22 17:25:27 -07:00
Scott Main
7370642dd8 Merge "docs: update Notification dev guide with info about custom notification text colors" 2011-09-22 17:18:25 -07:00
Robert Greenwalt
b849074cb5 Merge "Tell the resolver what protocols to use." into ics-factoryrom 2011-09-22 16:57:43 -07:00
Justin Ho
4dfe869520 Merge "CAB assets" into ics-factoryrom 2011-09-22 16:57:03 -07:00
Justin Ho
777163e046 Merge "Updated emergency icon on lockscreen" into ics-factoryrom 2011-09-22 16:54:17 -07:00
Justin Ho
03c3a35394 Updated emergency icon on lockscreen 
Change-Id: Idd4dc679c45aedce627a5be0991879d83758650e
 2011-09-22 16:52:56 -07:00
Robert Greenwalt
d90c611a59 Tell the resolver what protocols to use. 
Stop guessing based on the connectivity of the default route and use the correct
v4/v6 proto for your pid.

bug:5284168
Change-Id: Ife82a8d8e54c0ace2bc9e8a624b11d29a4e285e2
 2011-09-22 16:43:15 -07:00
Mathias Agopian
c4f5d5a0df fix dumpsys wording for h/w composer 
Change-Id: Iaa1094964f2fb83da491e23b9309f7690079c17e
 2011-09-22 16:26:39 -07:00
Roman Nurik
e94d950d12 Fix semantic error in Speech article on d.a.c 
Change-Id: I02f17146dc6f17dbc1dfe096609252805fa67125
 2011-09-22 16:15:27 -07:00
Svetoslav Ganov
f632eaa9d6 ActivityChooserView not showing "Show all" properly if the default target button not shown. 
If the default target button is hidden all activities are shown in the list from
which to choose. In this case due to off by one error the list was not showing the
option to expand it if the activities are one more than the initially shown.

bug:5358475

Change-Id: I8c3db37dab008637d78330f8de830cec92720264
 2011-09-22 16:09:46 -07:00
Justin Ho
ec29658513 CAB assets 
Change-Id: I40e979a57173220586aafa6cb76d7431c8bbd91f
 2011-09-22 16:09:08 -07:00
John Wang
dd6d1bbd15 Merge "Update PUK unlock screen." into ics-factoryrom 2011-09-22 15:44:40 -07:00
Adam Cohen
08ee7fa463 Merge "Fixing emergency dialer flicker on lock screen (issue 5314293)" into ics-factoryrom 2011-09-22 15:14:49 -07:00
Justin Ho
31b638d403 Merge "Fix 5355659: Change chevron visuals, timing, and animated positioning" into ics-factoryrom 2011-09-22 15:13:13 -07:00
Dianne Hackborn
fb49cd9539 Merge "Fix issue #5355844: PowerManager does not call screenTurningOn after boot." 2011-09-22 15:06:23 -07:00
Dianne Hackborn
400110902e Fix issue #5355844: PowerManager does not call screenTurningOn after boot. 
Be more explicit about initialization -- power manager never sends
screen update when first initializing, phone window manager retreives
current screen state and applies that itself when initializing.

Change-Id: I8294ed36d700e186c1637754df8c8183721c15dd
 2011-09-22 13:37:48 -07:00
John Wang
7f3eb49ad5 Update PUK unlock screen. 
1. Make Pin and Puk focusable EditText.
2. Add hint text for pin and puk.
3. Update focusEntry logic.

bug:5243771
Change-Id: I65bd52510bbbf0ebd7830ecac7e31159ae750c6c
 2011-09-22 11:59:46 -07:00
Robert Greenwalt
5840639fd1 Fix apn bearer logic. 
The original change said that if the RAT were X or Y we would only
accept APN's that explicitly called out X or Y.  This meant that
any device using X or Y would stop working until their APN db were
adjusted.

This change changes it to be if a particular APN calls out X or Y
it will only be considered if the current RAT matches.  If the APN
doesn't specify, it matches all RAT.

This allows just as tight a restriction, but the default is looser.

Change-Id: Ia5e92f13c5052e890bf169e0db9584302afb36f5
 2011-09-22 11:49:01 -07:00
Robert Ly
745f1e3a06 Merge "cherrypick from hc-mr2 Change-Id: I0c3a19f11790142d8dbc7bdf354542c69c3c754f" 2011-09-22 11:02:52 -07:00
Robert Ly
37717192bf Merge "cherrypick from hc-mr2 Change-Id: Iec29f5d063c2c42a56afb971e071b4535559ac01" 2011-09-22 11:02:47 -07:00
Robert Ly
b82696fadf Merge "cherrypick from hc-mr2 Change-Id: I292eb859d90f918bb69ff32f115569144995dba9" 2011-09-22 11:02:43 -07:00
The Android Open Source Project
ee79a53c81 Reconcile with ics-factoryrom-release 
Change-Id: I5f3fe0c78905638535925d842337bffcd504a95b
 2011-09-22 10:57:24 -07:00
Wink Saville
94097b44b8 am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom 
* commit '904fb9d79cc72879e4c6767c219ec78feda8e62b':
  Notify people of empty proxies too.
 2011-09-22 10:53:40 -07:00
Chia-chi Yeh
f459d324bf ip-up-vpn: Handle the case where INTERNAL_NETMASK4 is empty. 
Also set the errno when inet_pton() fails.

Change-Id: Ib98ed593fe1ceabecef4b92bf939f44ecf9fa665
 2011-09-22 10:53:05 -07:00
Wink Saville
904fb9d79c Merge "Notify people of empty proxies too." into ics-factoryrom 2011-09-22 10:52:25 -07:00
Robert Ly
dec97360a5 cherrypick from hc-mr2 Change-Id: I292eb859d90f918bb69ff32f115569144995dba9 
Conflicts:

	docs/html/sdk/sdk_toc.cs

Change-Id: Iaaa7fc01504400e7c57955a1ee94f005d1dba056
 2011-09-22 10:33:28 -07:00
Daniel Sandler
e690f565fd am 2dbe444e: Merge "Properly generate systemUiVisibilityChanged callbacks." into ics-factoryrom 
* commit '2dbe444e5dd89b83829df6a3f48c491a844ecd28':
  Properly generate systemUiVisibilityChanged callbacks.
 2011-09-22 10:31:49 -07:00
Daniel Sandler
7933b7056f am cc22b992: Merge "Revert "Allow views to setSystemUiVisibility() with the same value and have it work."" into ics-factoryrom 
* commit 'cc22b99249ac80891af99be941862edc9569fc4b':
  Revert "Allow views to setSystemUiVisibility() with the same value and have it work."
 2011-09-22 10:31:47 -07:00
Robert Ly
1c79900d52 cherrypick from hc-mr2 Change-Id: I0c3a19f11790142d8dbc7bdf354542c69c3c754f 
Change-Id: I1c10a5e8780fe264ab2be37bc127860d2c0e8242
 2011-09-22 10:31:06 -07:00
Robert Ly
f33bcdffde cherrypick from hc-mr2 Change-Id: Iec29f5d063c2c42a56afb971e071b4535559ac01 
Change-Id: I5232cf7ed14fc015e3d1184e399d802fdced593e
 2011-09-22 10:30:08 -07:00
Daniel Sandler
2dbe444e5d Merge "Properly generate systemUiVisibilityChanged callbacks." into ics-factoryrom 2011-09-22 10:29:33 -07:00
Daniel Sandler
cc22b99249 Merge "Revert "Allow views to setSystemUiVisibility() with the same value and have it work."" into ics-factoryrom 2011-09-22 10:29:31 -07:00
Fabrice Di Meglio
bedc1eb19d Merge "Bug 5279842: mis alignment after scroll" 2011-09-22 10:25:57 -07:00
Scott Main
63fe6fa3e6 docs: update Notification dev guide with info about custom notification text colors 
Change-Id: Ic73fc70e9c5b40f7d02393ac752d69a1e81d1d51
 2011-09-22 10:19:25 -07:00
Scott Main
a41074870d Merge "docs: clean the slate of newness for all side navs" 2011-09-22 10:05:49 -07:00
Scott Main
9ed517da9b docs: clean the slate of newness for all side navs 
Change-Id: I0d027199168d3e0e5fd1ed243438d8dc1b150f23
 2011-09-22 09:57:34 -07:00
Chet Haase
5ce348615b Merge "Fix 5335993, calculate correct size of lockscreen buttons" 2011-09-22 07:55:23 -07:00
The Android Automerger
17fc7f6ed3 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-22 06:28:37 -07:00