28674 Commits

Author SHA1 Message Date
Wink Saville
c7a98341b0 Add documentation to NetworkStateTracker and a small change to the API.
Also, removed some unused NetworkStateTracker event codes.

The API change was to add context and target to startMonitor, this makes
it easier to document what the actual interface contract is.

Change-Id: If9b52486c3c281fe4794bc78417c8b03888414b1
2010-08-13 16:11:42 -07:00
Dianne Hackborn
68663bf273 Merge "Fix bug with calls to the typeless open API." 2010-08-13 16:08:08 -07:00
Robert Greenwalt
993f85f319 am e300b8c1: Merge "DO NOT MERGE Always set/remove default routes." into gingerbread
Merge commit 'e300b8c10c306b575bbbec29d5572ba92a97785e' into gingerbread-plus-aosp

* commit 'e300b8c10c306b575bbbec29d5572ba92a97785e':
  DO NOT MERGE Always set/remove default routes.
2010-08-13 16:03:29 -07:00
Dianne Hackborn
66b0343e9e am a8d9291d: Merge "Various battery info things:" into gingerbread
Merge commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177' into gingerbread-plus-aosp

* commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177':
  Various battery info things:
2010-08-13 16:00:44 -07:00
Robert Greenwalt
e300b8c10c Merge "DO NOT MERGE Always set/remove default routes." into gingerbread 2010-08-13 15:59:53 -07:00
Dianne Hackborn
a8d9291d7f Merge "Various battery info things:" into gingerbread 2010-08-13 15:56:29 -07:00
Robert Greenwalt
b738fb9938 DO NOT MERGE Always set/remove default routes.
Must clean up default route if a default 3g connection is replaced
by a non-default (ie, mms) connection on teh same interface.

Also stop mucking with all connections dns and routes - do it only
for the connection that has changed.

bug:2865974
Change-Id: Ifdf49080fa0413a4d826813706c809975a562dfa
2010-08-13 15:53:13 -07:00
Gilles Debunne
162d709b93 Merge "Changed default background colors to new UI style." 2010-08-13 15:50:38 -07:00
Daniel Lehmann
b332747ee0 Update flags to be consistent with GTalk's
Change-Id: Ibaa6cdc110316139ef0e2fe2fb95b864d28dfb25
2010-08-13 15:38:30 -07:00
Ying Wang
8cfd3c01e4 am e05184f2: Merge "Output proguard keep flags for fragment classes." into gingerbread
Merge commit 'e05184f271f9882a5bf828e353aea40e0c06ff69' into gingerbread-plus-aosp

* commit 'e05184f271f9882a5bf828e353aea40e0c06ff69':
  Output proguard keep flags for fragment classes.
2010-08-13 15:29:04 -07:00
Ying Wang
e05184f271 Merge "Output proguard keep flags for fragment classes." into gingerbread 2010-08-13 15:26:21 -07:00
Dianne Hackborn
02dfd26304 Fix bug with calls to the typeless open API.
Fix bug where we weren't using the default stream if a caller
requested "*/*" as a type.  This broke apps calling the old open
APIs on content providers that did not report MIME types.

Change-Id: Id6e3e64e36cb8637097c3a7834b09407c27487d2
2010-08-13 15:23:06 -07:00
Jake Hamby
31202b1a40 am 3f442ece: Merge "Fix character count bug and Javadoc typos in SMS (with test cases)" into gingerbread
Merge commit '3f442ece257d416b48f7803a4cc263f0215faa0d' into gingerbread-plus-aosp

* commit '3f442ece257d416b48f7803a4cc263f0215faa0d':
  Fix character count bug and Javadoc typos in SMS (with test cases)
2010-08-13 15:19:11 -07:00
Dianne Hackborn
9adb9c3b10 Various battery info things:
- Now track wake locks in battery history.
- Now track sensors in battery history.
- Some filtering of sensory data.
- Fixes to some data that wasn't cleared when resetting battery stats.
- Print amount discharged since last charge.

And the big part -- keep track of wake locks held per process,
and kill processes that hold wake locks too much while they are in
the background.  This includes information in the battery stats
about the process being killed, which will be available to the
developer if the app is reported.

Change-Id: I97202e94d00aafe0526ba2db74a03212e7539c54
2010-08-13 15:17:49 -07:00
Jake Hamby
3f442ece25 Merge "Fix character count bug and Javadoc typos in SMS (with test cases)" into gingerbread 2010-08-13 15:15:36 -07:00
Jae Yong Sung
8171b5182f lock screen for xlarge
Change-Id: Iab9f53609bf24be774752a9960aaaa654d7a614f
2010-08-13 15:08:05 -07:00
Shimeng (Simon) Wang
54038acc8c Update variable to reflect its true value.
The stale value will happen when rotating the large screen and make
double tapping not behave well.

Alternatively, shall we get rid of this variable?

issue: 2919307
Change-Id: I2d71e547db42adeb5674accbf79fb0e7fc587fcd
2010-08-13 15:04:14 -07:00
Eric Fischer
d22a1e896c am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="false", not "true"." into gingerbread
Merge commit '244152bfb9020341953d3e541c85eb3961806378' into gingerbread-plus-aosp

* commit '244152bfb9020341953d3e541c85eb3961806378':
  Change aapt's warning message to suggest formatted="false", not "true".
2010-08-13 14:56:47 -07:00
Eric Fischer
244152bfb9 Merge "Change aapt's warning message to suggest formatted="false", not "true"." into gingerbread 2010-08-13 14:54:15 -07:00
Jake Hamby
164eb050bd am 4f170821: Merge "Fix typo and bug in CTS test class." into gingerbread
Merge commit '4f170821678099010ec593d2b5a081e0f8adf92d' into gingerbread-plus-aosp

* commit '4f170821678099010ec593d2b5a081e0f8adf92d':
  Fix typo and bug in CTS test class.
2010-08-13 14:53:03 -07:00
Jake Hamby
4f17082167 Merge "Fix typo and bug in CTS test class." into gingerbread 2010-08-13 14:51:09 -07:00
Eric Fischer
98ee11ddb7 Change aapt's warning message to suggest formatted="false", not "true".
True is the default and specifying it won't suppress the warning.

Change-Id: I8ecc919b4059bf3321e781649cb46dd2d3807592
2010-08-13 14:49:55 -07:00
Ficus Kirkpatrick
44e0d5ca75 am 0a6bfe2a: am 2abde6e0: Add --max-res-version flag to aapt.
Merge commit '0a6bfe2ae21f19adf65d8b8a18c530d94ea4e543' into gingerbread-plus-aosp

* commit '0a6bfe2ae21f19adf65d8b8a18c530d94ea4e543':
  Add --max-res-version flag to aapt.
2010-08-13 14:47:38 -07:00
Ficus Kirkpatrick
0a6bfe2ae2 am 2abde6e0: Add --max-res-version flag to aapt.
Merge commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c' into gingerbread

* commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c':
  Add --max-res-version flag to aapt.
2010-08-13 14:45:39 -07:00
Alex Sakhartchouk
aece2d0ca0 Merge "Adding bounding box computation." 2010-08-13 14:39:01 -07:00
Gilles Debunne
9a30556b9a Changed default background colors to new UI style.
Change-Id: I069fe2047d16fb6f4c7870412386ba40bd0ebd39
2010-08-13 14:38:51 -07:00
Alex Sakhartchouk
a80145de00 Adding bounding box computation.
Change-Id: I682609312519d9474176556ade7a208c7d0a1323
2010-08-13 14:32:23 -07:00
Ficus Kirkpatrick
41e567f7cf Add --max-res-version flag to aapt.
aapt will ignore any versioned resource directories over the
specified version (if used).  e.g. --max-res-version=6 will
cause layout-land-v7 to be ignored.

Merged from gingerbread.

Change-Id: I71b889540380cb10bafb40f72582d3af785ae33a
2010-08-13 14:32:05 -07:00
Ficus Kirkpatrick
0f414272cc am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbread
Merge commit '7525c2cfbbaa5c947c029008ef490e93a50c064f' into gingerbread-plus-aosp

* commit '7525c2cfbbaa5c947c029008ef490e93a50c064f':
  Add --max-res-version flag to aapt.
2010-08-13 14:27:41 -07:00
Romain Guy
a4ed1c6788 am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path extension to work" into gingerbread
Merge commit '1e4aa48cfd2b2c13c4f7ace8c9fcb33adfa18661' into gingerbread-plus-aosp

* commit '1e4aa48cfd2b2c13c4f7ace8c9fcb33adfa18661':
  fix [2912927] Can't get NV_draw_path extension to work
2010-08-13 14:27:36 -07:00
Jean-Baptiste Queru
7381541309 Ignore 87624778
It already exists in this branch

Change-Id: Ic4329e543d34828f41040dc264260be9d03a20e7
2010-08-13 14:24:06 -07:00
Ficus Kirkpatrick
7525c2cfbb Merge "Add --max-res-version flag to aapt." into gingerbread 2010-08-13 14:22:34 -07:00
Ficus Kirkpatrick
588f228d6a Add --max-res-version flag to aapt.
aapt will ignore any versioned resource directories over the
specified version (if used).  e.g. --max-res-version=6 will
cause layout-land-v7 to be ignored.

Merged from froyo.

Change-Id: Ia4eabae535b95b75d18b0c83135d44ed9a95b9eb
2010-08-13 14:20:51 -07:00
Romain Guy
1e4aa48cfd Merge "fix [2912927] Can't get NV_draw_path extension to work" into gingerbread 2010-08-13 14:18:55 -07:00
Mathias Agopian
ab5750115d fix [2912927] Can't get NV_draw_path extension to work
there was a problem with eglGetProcAddress() which would only work with
GLES 1.x contexts.

Change-Id: I4747671cbf7ed469bb471a377f1d6f36550d24df
2010-08-13 14:17:58 -07:00
Ficus Kirkpatrick
2abde6e0dd Add --max-res-version flag to aapt.
aapt will ignore any versioned resource directories over the
specified version (if used).  e.g. --max-res-version=6 will
cause layout-land-v7 to be ignored.

Merged from eclair.

Change-Id: I40ccf820c8a6e3074fccc987dd60a511dd8eb0de
2010-08-13 14:13:08 -07:00
Ying Wang
561a91824f Output proguard keep flags for fragment classes.
Change-Id: I28c10fbf18b91f8ba3dfc2575cd41215f65f11ec
Bug: 2916847
2010-08-13 14:06:58 -07:00
Jake Hamby
17f616823a Fix character count bug and Javadoc typos in SMS (with test cases)
Fix a character count bug I discovered while working on related SMS
bugs. Includes a new set of test cases to verify the fix for the
buggy calculateLength() methods ("runtest frameworks-telephony").

You can also verify that the counter works properly in the Mms app
by typing characters until the boundary is crossed where an
additional message part is required. The counter should count down
to 0 characters remaining before increasing the message count.

Change-Id: I4de68b82dfc53dcae094865798f2c0235a355d43
2010-08-13 14:01:31 -07:00
Shimeng (Simon) Wang
74521b17fe Merge "Change scale for large screen reading when double tapped." 2010-08-13 13:56:42 -07:00
Shimeng (Simon) Wang
dde858cbb6 Change scale for large screen reading when double tapped.
This happens when default and overview scales have not much difference.

This solves the double tap issue for large screen devices,
where overview and default scale are the same.  The code works well
with phone device as well.

Change-Id: Iac7f66369d58a152de8de7025b326d1672da30d4
2010-08-13 13:52:42 -07:00
Adam Cohen
8e7b1f750e Merge "-> Refactored and cleaned up dragging / animations -> Added methods to generate blue glow outline -> Added "res-out" effect -> Added some influence for dragging left / right" 2010-08-13 13:50:31 -07:00
Adam Cohen
32a42f1587 -> Refactored and cleaned up dragging / animations
-> Added methods to generate blue glow  outline
-> Added "res-out" effect
-> Added some influence for dragging left / right

Change-Id: I4bdbe4c3bd843ed5616b1ea359a3b0af1c151814
2010-08-13 13:46:47 -07:00
Daisuke Miyakawa
24bb2a708d Merge "Make the doc for PreferenceScreen aware of PreferenceFragment." 2010-08-13 13:42:56 -07:00
Adam Powell
00146321f8 Merge "Clean up some Action Bar style handling." 2010-08-13 13:42:32 -07:00
Daisuke Miyakawa
52a50782d5 Make the doc for PreferenceScreen aware of PreferenceFragment.
This class has existed from before, so the doc does not mention
PreferenceFragment but only PreferenceActivity, while actually
the class can be used via PreferenceFragment.

Change-Id: Ie3756f7ff260cff829eff31a6ba99260c681bc2d
2010-08-13 13:20:04 -07:00
Jake Hamby
a8f39537ca Fix typo and bug in CTS test class.
- Fix Javadoc typo in PhoneSubInfo.java
- Fix ArrayIndexOutOfBoundsException in SimulatedCommands.java

Change-Id: I40dcd52cf9d6990f1f845fca5c1d61cdff93f4d7
2010-08-13 12:16:15 -07:00
Daniel Sandler
86d32939b6 Merge "Battery meter now functioning in the system bar and settings panel." 2010-08-13 12:06:06 -07:00
Daniel Sandler
1e3ed8fc95 Battery meter now functioning in the system bar and settings panel.
Change-Id: I08881a597f166eaeabd01d550a59109661535639
2010-08-13 15:04:40 -04:00
Adam Powell
e2194445b0 Clean up some Action Bar style handling.
Action Bar now obeys the titleTextStyle/subtitleTextStyle attributes
and has a better way of handling custom sizes. Any attached Action
Mode bar will keep in sync with the Action Bar's height.

Change-Id: I7d16319f5609d4d6c80a3043dcb60303e6e903db
2010-08-13 11:41:53 -07:00
Dmitri Plotnikov
7777bb0cad Merge "Keep the '+' when normalizing the phone number" 2010-08-13 11:38:06 -07:00