29399 Commits

Author SHA1 Message Date
Daniel Sandler
764b4da4a8 System bar improvements.
- Updated artwork for buttons and signal/battery meters.
- Layout change: meters on either side of clock
- RSSI for mobile data. The algorithm is more or less the
  same as the one used in the phone status bar. Note that
  mobile data is only shown if Wi-Fi is unavailable.

Bug: 2924643
Change-Id: Idaa0c52422db4a63616475bde96626d1953830b4
2010-08-25 16:36:30 -04:00
Sascha Brawer
3c1fbf7ad2 Merge "Added Romansh-language versions of error messages "loaderror.html" and "nodomain.html"." 2010-08-25 10:53:13 -07:00
Eric Laurent
0ae6d2e826 am 74ede9e4: am 67b50606: Merge "Fix the simulator build." into gingerbread
Merge commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64'

* commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64':
  Fix the simulator build.
2010-08-25 10:41:55 -07:00
Eric Laurent
74ede9e4fd am 67b50606: Merge "Fix the simulator build." into gingerbread
Merge commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9' into gingerbread-plus-aosp

* commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9':
  Fix the simulator build.
2010-08-25 10:39:21 -07:00
Eric Laurent
67b506065e Merge "Fix the simulator build." into gingerbread 2010-08-25 10:37:27 -07:00
Gilles Debunne
aed922ffff Merge "Fix in fundamentals web page." 2010-08-25 10:32:58 -07:00
Gilles Debunne
aea2d763a2 Fix in fundamentals web page.
Change-Id: I330ea9c925315bc817bf544992401cd1957c1c2a
2010-08-25 10:31:57 -07:00
Steve Block
976190d21a Merge "In ActionBarImpl, only use mActionView after we've checked that it's non-null" 2010-08-25 10:30:20 -07:00
Gilles Debunne
7e2fb17391 Merge "Fixed typo in View id documentation" 2010-08-25 10:28:50 -07:00
Jean-Baptiste Queru
9650f128b2 am 44b31fdd: am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variant
Merge commit '44b31fdd86053945e1eeb3b91783577aebd95b55'

* commit '44b31fdd86053945e1eeb3b91783577aebd95b55':
  Make the default backup configuration "disabled; local transport selected"
2010-08-25 10:20:08 -07:00
Jean-Baptiste Queru
44b31fdd86 am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variant
Merge commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758' into gingerbread-plus-aosp

* commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758':
  Make the default backup configuration "disabled; local transport selected"
2010-08-25 10:18:14 -07:00
Jean-Baptiste Queru
7e2f87fafa am d5e601c2: reconcile open-source froyo into google variant
Merge commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9' into gingerbread

* commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9':
  Make the default backup configuration "disabled; local transport selected"
2010-08-25 10:15:38 -07:00
Brian Carlstrom
4200058044 am 7517ffd1: am 59073b15: Merge "Fix linux 64 build" into gingerbread
Merge commit '7517ffd134d03bd5392e8292a18551bfce08ddce'

* commit '7517ffd134d03bd5392e8292a18551bfce08ddce':
  Fix linux 64 build
2010-08-25 10:10:31 -07:00
Brian Carlstrom
7517ffd134 am 59073b15: Merge "Fix linux 64 build" into gingerbread
Merge commit '59073b155ab0d8a5706c90200e6af614510aba0e' into gingerbread-plus-aosp

* commit '59073b155ab0d8a5706c90200e6af614510aba0e':
  Fix linux 64 build
2010-08-25 10:07:18 -07:00
Eric Laurent
cd295c11ab Fix the simulator build.
Fixes the sim build broken by commit 58d3bd08107f44cba79938dd8430e69c0fda4202.

Change-Id: I5a63623363d558783dc5254fdd322080cc2f3525
2010-08-25 10:00:53 -07:00
Makoto Onuki
d2a677673b Merge "Add --el option to am for long extras." 2010-08-25 09:44:20 -07:00
Jean-Baptiste Queru
d5e601c230 reconcile open-source froyo into google variant
Change-Id: Idfacbf98a6c98176620f252504213d01bbd49eb9
2010-08-25 09:40:59 -07:00
Brian Carlstrom
59073b155a Merge "Fix linux 64 build" into gingerbread 2010-08-25 09:28:00 -07:00
Sascha Brawer
7d4530d0a2 Added Romansh-language versions of error messages "loaderror.html"
and "nodomain.html".

Change-Id: I3a3408d66cc94ecf5480912057c9742b006cac92
2010-08-25 17:33:13 +02:00
Christopher Tate
9d3fa5764c Make the default backup configuration "disabled; local transport selected"
By default out of the box, an Android build will have the backup mechanism in
its "disabled" state and pointed to the LocalTransport test transport.  We
do not want retail devices built without the Google backend to have backup
enabled out of the box; it would cause them to gradually grind away the
cache partition for no good reason.  On those devices with this change,
developers would need to enable backup manually (possibly using the normal
Settings UI; more probably using the 'bmgr' shell tool), but would no longer
also have to manually configure the active transport name.

Device vendors producing Google-enabled products will simply use resource
overlays to configure the default state and transport name for their builds.
When building a product that points to the Google backup transport by default,
the "def_backup_enabled" boolean resource should still be set to 'false' --
the Google backup disclosure activity supplied by GSF will take care of
enabling the backup services if the user opts in to it.  (Basically, vendors
will never have to overlay the def_backup_enabled resource -- the default
value of 'false' is correct for any retail device regardless of whether it
can use the Google backup transport.)

In the SDK build, the default transport will remain the local one, but
the default enable state overridden and set to "true".  This is the ideal
situation for developers: all aspects of the backup mechanism immediately
operative with no manual configuration needed.

Change-Id: I866f8f627b023b338bc7757e61604e6d8a901a34
2010-08-25 08:27:40 -07:00
Jeff Hamilton
1a2b30cd73 Merge "Fix the documentation of ContentValues." 2010-08-25 08:23:24 -07:00
Jeff Hamilton
f924a513da Fix the documentation of ContentValues.
Bug: 2172562
Change-Id: If7752b937dabc7238723787bb0aa5c348406e28b
2010-08-25 10:19:36 -05:00
Chet Haase
71fcc470eb Merge "Change animator xml importing to use new inflater class" 2010-08-25 08:17:26 -07:00
Mike Lockwood
089a38543f Revert "Add support for generated documentation as part of the SDK docs."
Fix the build

This reverts commit e0dacf93b1a2d911d1c1a663ae6c66e0a211c14d.
2010-08-25 08:21:15 -04:00
Steve Block
08f194bc01 In ActionBarImpl, only use mActionView after we've checked that it's non-null
See https://android-git.corp.google.com/g/#change,61251

Change-Id: Ie11f446c10c096916642a34558a350512495234e
2010-08-25 11:56:55 +01:00
Chih-Chung Chang
9439241d35 resolved conflicts for merge of 20afae51 to master
Change-Id: Ief637e412e4d716526de68c7761bdb8cbf436333
2010-08-25 15:54:51 +08:00
Chih-Chung Chang
20afae5150 am 231a0005: Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread
Merge commit '231a0005654d23284ab58a2d9ea892b995988c34' into gingerbread-plus-aosp

* commit '231a0005654d23284ab58a2d9ea892b995988c34':
  Avoid allocating buffer every time getThumbnail is called.
2010-08-25 00:09:22 -07:00
Chih-Chung Chang
231a000565 Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread 2010-08-25 00:07:23 -07:00
Hung-ying Tyan
96b2516496 am 73497e92: am 37f709ae: Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread
Merge commit '73497e9200e9db653cae56c631db55c133915f10'

* commit '73497e9200e9db653cae56c631db55c133915f10':
  SipProfile: add isOutgoingCallAllowed() and new builder constructor
2010-08-25 00:01:25 -07:00
Hung-ying Tyan
73497e9200 am 37f709ae: Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread
Merge commit '37f709aeb0424948a8f69577c6fad39dc95d7733' into gingerbread-plus-aosp

* commit '37f709aeb0424948a8f69577c6fad39dc95d7733':
  SipProfile: add isOutgoingCallAllowed() and new builder constructor
2010-08-24 23:59:28 -07:00
Hung-ying Tyan
37f709aeb0 Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread 2010-08-24 23:57:50 -07:00
Chih-Chung Chang
2ca36196ea Avoid allocating buffer every time getThumbnail is called.
Change-Id: Ia088539463e26a1242064ed7e79b0b2c12d64ced
2010-08-25 14:52:30 +08:00
Rohit Mungee
6615759f0c am 22518947: am bfc9325f: Merge "Add support for generated documentation as part of the SDK docs." into gingerbread
Merge commit '2251894743f9e7b1ca7f546369c2ba7fc3d28e1f'

* commit '2251894743f9e7b1ca7f546369c2ba7fc3d28e1f':
  Add support for generated documentation as part of the SDK docs.
2010-08-24 23:15:28 -07:00
Gilles Debunne
0243caff24 Fixed typo in View id documentation
Change-Id: I2df4f0ff9dc0b229349c8accbd6ef962f1d345bb
2010-08-24 23:08:44 -07:00
Rohit Mungee
2251894743 am bfc9325f: Merge "Add support for generated documentation as part of the SDK docs." into gingerbread
Merge commit 'bfc9325f8981173db51bc46af0e762dad1341671' into gingerbread-plus-aosp

* commit 'bfc9325f8981173db51bc46af0e762dad1341671':
  Add support for generated documentation as part of the SDK docs.
2010-08-24 23:03:32 -07:00
Rohit Mungee
bfc9325f89 Merge "Add support for generated documentation as part of the SDK docs." into gingerbread 2010-08-24 22:59:41 -07:00
Bill Napier
e0dacf93b1 Add support for generated documentation as part of the SDK docs.
This can be done by adding the list of files to include to the
ALL_GENERATED_DOCS variable, and then making sure to put your generated output
files under $(OUT_DOCS)/gen.

Change-Id: Ie068a3fadccf7c990ec8e26b92ad408e7314469e
2010-08-24 22:18:54 -07:00
Brian Carlstrom
74b58fc58b Fix linux 64 build
git cherry-pick -e 49416bc658e37a0f4ae4f2b7b8582dd1606fba0f

Change-Id: I37a689acea8aeb5d6ac92ee56b077bafe4fba170
2010-08-24 20:20:50 -07:00
Chet Haase
d51d368f2d Change animator xml importing to use new inflater class
Change-Id: I97225ee9868f4dcce5e4c1ba55e16414eb6c0464
2010-08-24 19:37:19 -07:00
Daisuke Miyakawa
a0b436234d am 1922ac10: (-s ours) am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread
Merge commit '1922ac108ce6fd12f640b2892aa1eb348911a94b'

* commit '1922ac108ce6fd12f640b2892aa1eb348911a94b':
  Fix the test breakage in vCard tests.
2010-08-24 18:59:00 -07:00
Makoto Onuki
6a69b4fbae Add --el option to am for long extras.
Change-Id: I13b92284fa4e0765620552b7d9b08d7441254389
2010-08-24 18:39:55 -07:00
Daisuke Miyakawa
1922ac108c am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread
Merge commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab' into gingerbread-plus-aosp

* commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab':
  Fix the test breakage in vCard tests.
2010-08-24 18:31:22 -07:00
Daisuke Miyakawa
d0ad67ad84 Merge "Fix the test breakage in vCard tests." into gingerbread 2010-08-24 18:29:24 -07:00
Christopher Tate
176d0af368 am 384759b1: am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
Merge commit '384759b1c5e39d0f99fa551a369ae73197ab26c5'

* commit '384759b1c5e39d0f99fa551a369ae73197ab26c5':
  Make the default backup configuration "disabled; local transport selected"
2010-08-24 18:27:01 -07:00
Daisuke Miyakawa
4d9c1931c9 Fix the test breakage in vCard tests.
- Make custom resolvers use official MockContentProvider instead of
  relying on its own.
- Fix a test which is found to be broken after the fix above.

Bug: 2945326
Change-Id: Ifb14f61771215c103d8825240989eecee73d585a
2010-08-24 18:26:45 -07:00
Christopher Tate
384759b1c5 am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
Merge commit '2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1' into gingerbread-plus-aosp

* commit '2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1':
  Make the default backup configuration "disabled; local transport selected"
2010-08-24 18:23:56 -07:00
Christopher Tate
2b81d6dd8a am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
Merge commit '02e18d4d4eed949da02fd8aa87801858d99b902a' into gingerbread

* commit '02e18d4d4eed949da02fd8aa87801858d99b902a':
  Make the default backup configuration "disabled; local transport selected"
2010-08-24 18:21:39 -07:00
Brad Fitzpatrick
268957bcaf am d335f9a9: am bb0eb5ca: Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread
Merge commit 'd335f9a90375db18b2f77f22f62379ac2d257384'

* commit 'd335f9a90375db18b2f77f22f62379ac2d257384':
  Negatively cache settings and proactively slurp settings into cache.
2010-08-24 18:17:09 -07:00
Romain Guy
375d19656a Merge "Fix passion build" 2010-08-24 18:16:52 -07:00
Romain Guy
f6fcac7ce1 Fix passion build
Change-Id: I93322bd36a004ac5aa9a0409d22dbf36a2da1680
2010-08-24 18:17:31 -07:00