60438 Commits

Author SHA1 Message Date
Svetoslav Ganov
c82cd08aa5 am 1ac6b1e2: Merge "ActivityChooserView not showing "Show all" properly if the default target button not shown."
* commit '1ac6b1e221a76d7f09f47599449227e934d61d83':
  ActivityChooserView not showing "Show all" properly if the default target button not shown.
2011-09-22 19:10:51 -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
Dianne Hackborn
80a7ac1063 Fix issue #5321282: Force Stop Button in Battery Screen Not disabled correctly
If the app had activities still finishing, when we checked whether it was
now stopped we would get told no.  Also some other improvements:

- Schedule an idle as part of the force stop, to get any finishing
  activities out of the stack soon rather than waiting for some activity
  to idle.
- Don't filter out stopped system apps.  This is dangerous because
  system apps may have no way for the user to explicitly launch them,
  so they could get put into a stopped state for which there is no way
  to get them out.  Also if the user really wants a system app to not
  run, the new disabling mechanism is more appropriate.

Change-Id: I34003f21dac29e2ca0f66a23b88c710de41bab99
2011-09-22 18:32:52 -07:00
Peter Ng
dd33bf0ebb Merge "Fix 5355659: Minor tweak to wave ping radius in MultiWaveView." into ics-factoryrom 2011-09-22 17:28:29 -07:00
Chia-chi Yeh
c858cc108e am 1dc43b5c: Merge "ip-up-vpn: Handle the case where INTERNAL_NETMASK4 is empty."
* commit '1dc43b5cc5d37d3bd2a8dcd689d32e219f44d2fe':
  ip-up-vpn: Handle the case where INTERNAL_NETMASK4 is empty.
2011-09-22 17:27:27 -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
Jim Miller
fb708a1a6c Fix 5355659: Minor tweak to wave ping radius in MultiWaveView.
Change-Id: Ib85c9d375e26897ce87b41addfaba503d9430f18
2011-09-22 17:21:56 -07:00
Scott Main
f54b484708 am 7370642d: Merge "docs: update Notification dev guide with info about custom notification text colors"
* commit '7370642dd8f06ab6d44464365889a63d6dcc1980':
  docs: update Notification dev guide with info about custom notification text colors
2011-09-22 17:21:06 -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
Eric Fischer
6b1a9af51e Delete translations of files that no longer exist.
Change-Id: I26edc4a3dd2ac19c410af75c4fce1b67100a71d2
2011-09-22 17:17:55 -07:00
Pannag Sanketi
a1849fceaf Returning EOS in SurfaceMediaSource:read
In SurfaceMediaSource::read, if disconnect has already been called, then
ERROR_END_OF_STREAM should be returned rather that NO_INIT. Else, it
sometimes leads to a crash in mediarecorder stop() call.

Related to FactoryROM bug: 5332812

Change-Id: I22132538ab2501d084e0283876817b1ec3f64a1d
2011-09-22 17:03:48 -07:00
Roman Nurik
9861a44428 am e94d950d: Fix semantic error in Speech article on d.a.c
* commit 'e94d950d122005bb10e11dd18b6029d0108f2fbe':
  Fix semantic error in Speech article on d.a.c
2011-09-22 17:01:06 -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
Jason Simmons
8e64fca6f1 resolved conflicts for merge of fb49cd95 to ics-aah
Change-Id: I55cfbddf87914bbdb74998b1676b245182f3a6fd
2011-09-22 16:36:14 -07:00
Mathias Agopian
c4f5d5a0df fix dumpsys wording for h/w composer
Change-Id: Iaa1094964f2fb83da491e23b9309f7690079c17e
2011-09-22 16:26:39 -07:00
Jeff Sharkey
367d15ab1a Watch network subtype, tethering teardown, empty.
Watch for changes to telephony network subtype, and update iface
mapping to persist stats under correct type.  Update network stats
before removing tethering NAT rules.

Skip recording that would create empty historical buckets.  Query UID
stats before iface stats to always skew positive when counters are
actively rolling forward.

Bug: 5360042, 5359860, 5335674, 5334448
Change-Id: I8aa37b568e8ffb70647218aa1aff5195d3e44d5a
2011-09-22 16:19:06 -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
Roman Nurik
48acca6c4a Update supported media formats doc for ICS
Change-Id: I0a654801b0e93457a734343a16a8598ab59033f9
2011-09-22 15:51:25 -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
Robert Greenwalt
8a8f81f932 am 5840639f: Fix apn bearer logic.
* commit '5840639fd18c334c0df30ae03b270c452fee0a61':
  Fix apn bearer logic.
2011-09-22 14:32:39 -07:00
Shaopeng Jia
c6027ee464 Temp fix to the problem of incorrectly classifying Brazilian local
numbers as emergency numbers.

Bug: 5247602
Change-Id: Ib1626ef25ced2e149c526601bfac72de39e3f1b9
2011-09-22 23:22:56 +02:00
Daniel Sandler
db8bd198e5 Put the correct background behind largeIcons.
Also add touch feedback to notification items (finally!).

Bug: 5213090 (largeIcon background)
Bug: 3329721 (press states)
Change-Id: I89a4211106698ebff867b5c8bad50cb8b9b33a0b
2011-09-22 17:06:29 -04: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
a9eeca40e3 am 745f1e3a: Merge "cherrypick from hc-mr2 Change-Id: I0c3a19f11790142d8dbc7bdf354542c69c3c754f"
* commit '745f1e3a06eb504c9e4465afc987854a6269220d':
  cherrypick from hc-mr2 Change-Id: I0c3a19f11790142d8dbc7bdf354542c69c3c754f
2011-09-22 11:05:13 -07:00
Robert Ly
f5a7739b4d am 37717192: Merge "cherrypick from hc-mr2 Change-Id: Iec29f5d063c2c42a56afb971e071b4535559ac01"
* commit '37717192bf8ddecada2321c750a99251364ec484':
  cherrypick from hc-mr2 Change-Id: Iec29f5d063c2c42a56afb971e071b4535559ac01
2011-09-22 11:05:11 -07:00
Robert Ly
959f330b4f am b82696fa: Merge "cherrypick from hc-mr2 Change-Id: I292eb859d90f918bb69ff32f115569144995dba9"
* commit 'b82696fadf74e060dd3c83bcc03aadfa3974f1a2':
  cherrypick from hc-mr2 Change-Id: I292eb859d90f918bb69ff32f115569144995dba9
2011-09-22 11:05:09 -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
5a2b159742 am ee79a53c: Reconcile with ics-factoryrom-release
* commit 'ee79a53c81d621cb275cdc12e860b87f637b5ea1':
2011-09-22 11:00:55 -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
7945cabb7f am 94097b44: am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom
* commit '94097b44b86f15d2581af5f3df21b5afcab27d01':
  Notify people of empty proxies too.
2011-09-22 10:55:32 -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
261ded783f am e690f565: am 2dbe444e: Merge "Properly generate systemUiVisibilityChanged callbacks." into ics-factoryrom
* commit 'e690f565fd1926885f2b12c2aee2dddc5ba99983':
  Properly generate systemUiVisibilityChanged callbacks.
2011-09-22 10:33:17 -07:00
Daniel Sandler
44f5cc031d am 7933b705: am cc22b992: Merge "Revert "Allow views to setSystemUiVisibility() with the same value and have it work."" into ics-factoryrom
* commit '7933b7056f9886789e46e4151ed6c03f9f3d9398':
  Revert "Allow views to setSystemUiVisibility() with the same value and have it work."
2011-09-22 10:33:15 -07:00