63098 Commits

Author SHA1 Message Date
Xavier Ducrohet
3d4db0dc18 am c205a9d6: am f8aea993: Make aapt ignore tools-related data.
* commit 'c205a9d68c23e9ade2cbe28bba0f257d84d23a97':
  Make aapt ignore tools-related data.
2012-02-06 11:42:50 -08:00
Xavier Ducrohet
c205a9d68c am f8aea993: Make aapt ignore tools-related data.
* commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
  Make aapt ignore tools-related data.
2012-02-06 11:41:04 -08:00
Xavier Ducrohet
f8aea99385 Make aapt ignore tools-related data.
This patchset introduces a new standard namespace http://schemas.android.com/tools
which will be used for tools specific XML attributes.
Any attributes using this namespace will not be compiled into the binary XML file.

The namespace node is also not written at all, and its string is not collected
to ensure that there is no impact on the devices.

(cherry picked from commit a5d5e9d906583ebeb590ca200ca9840302a5cd1a)

Change-Id: I62937b8bc34c07ac544930aa8eadd7797e0179d5
2012-02-06 11:25:28 -08:00
Scott Main
1e148f509e am 2adfc9de: am 633de7ba: docs: fix meta description tag for homepage
* commit '2adfc9de0390962701535d0c075c4fb8e886d9d8':
2012-02-01 15:56:56 -08:00
Scott Main
c019983a21 am c78a300c: am 6aaa27fb: docs: fix broken link
* commit 'c78a300c6abfea859538f4148ddb3311ca06dd7e':
2012-02-01 15:56:55 -08:00
Scott Main
4e133702ac am be09298e: am 633de7ba: docs: fix meta description tag for homepage
* commit 'be09298eb708f6acb6af7028fbca28afdf230008':
  docs: fix meta description tag for homepage
2012-02-01 15:15:10 -08:00
Scott Main
2adfc9de03 am 633de7ba: docs: fix meta description tag for homepage
* commit '633de7bab9397c4f7591c5514d903305254451b2':
  docs: fix meta description tag for homepage
2012-02-01 15:12:40 -08:00
Scott Main
be09298eb7 am 633de7ba: docs: fix meta description tag for homepage
* commit '633de7bab9397c4f7591c5514d903305254451b2':
  docs: fix meta description tag for homepage
2012-02-01 15:12:33 -08:00
Scott Main
931d1daf1a am fb16fdf2: am 6aaa27fb: docs: fix broken link
* commit 'fb16fdf2d11b807e9c5d986e6135c2915f1f6523':
  docs: fix broken link
2012-02-01 15:03:15 -08:00
Scott Main
fb16fdf2d1 am 6aaa27fb: docs: fix broken link
* commit '6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
  docs: fix broken link
2012-02-01 15:00:49 -08:00
Scott Main
c78a300c6a am 6aaa27fb: docs: fix broken link
* commit '6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
  docs: fix broken link
2012-02-01 15:00:30 -08:00
Scott Main
633de7bab9 docs: fix meta description tag for homepage
Change-Id: Idfbc5e04fcdfc9d4e20c02ae7b1366c566722053
2012-02-01 14:49:32 -08:00
Scott Main
6aaa27fb8c docs: fix broken link
Change-Id: I58a082341373370bf97fed49d4d6584b468b4b46
2012-02-01 14:32:11 -08:00
Scott Main
4f7f2b8bc3 am b49c0355: am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit 'b49c0355aa6cb7411f6f5061f5fd31ee5cdea14d':
2012-02-01 13:54:48 -08:00
Scott Main
3a08035788 am e043db89: am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit 'e043db892436f643fc2d71df3bc4b2604c556988':
2012-02-01 13:54:45 -08:00
Scott Main
eea2e9c134 am 13f3c854: am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '13f3c854d8fb635fa824a1ba15fe85152fed131e':
2012-02-01 13:54:43 -08:00
Xia Wang
c8c9ebe868 am 581a3334: am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '581a33344485181eb3484ba7bf50ff2b52be6d99':
2012-02-01 13:54:40 -08:00
Scott Main
b49c0355aa am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
  docs: fix action bar style example
2012-02-01 13:52:21 -08:00
Scott Main
e043db8924 am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit 'f47f6791f897b436530557dea3a57a2ca969afe6':
  docs: dashboard update for feb 1
2012-02-01 13:52:19 -08:00
Scott Main
13f3c854d8 am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '5e0959393426371dadef2c7905d5c915a1ac2dd4':
  docs: update menu guide with CAB and popup menu, plus many other revisions
2012-02-01 13:52:17 -08:00
Xia Wang
581a333444 am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit 'ccc11c4d3c8357a402b84c546e7b2f889729358c':
  Fix a typo in image processing test
2012-02-01 13:52:13 -08:00
Scott Main
d3747509f5 am 8f6b4c52: am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '8f6b4c52ded03527d3c60e99cafa66aaabb4f355':
  docs: fix action bar style example
2012-02-01 11:58:57 -08:00
Scott Main
8f6b4c52de am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
  docs: fix action bar style example
2012-02-01 11:56:23 -08:00
Scott Main
6b3f98b458 Merge "docs: fix action bar style example" into ics-mr1 2012-02-01 11:54:57 -08:00
Scott Main
b6802e7b58 docs: fix action bar style example
Change-Id: I9e02c3b3ade17c832b97836c03cf023fe6ea9340
2012-02-01 11:53:03 -08:00
Scott Main
0683d0963b am b43a0f1f: am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit 'b43a0f1fe5cddf1376c52d0ace2d958f21e4044d':
  docs: dashboard update for feb 1
2012-02-01 11:48:28 -08:00
Scott Main
414cc6cfcd am 9af875ec: am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '9af875ec74e34541539897d7a8069b4ea7f07b12':
  docs: update menu guide with CAB and popup menu, plus many other revisions
2012-02-01 11:48:26 -08:00
Scott Main
b43a0f1fe5 am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit 'f47f6791f897b436530557dea3a57a2ca969afe6':
  docs: dashboard update for feb 1
2012-02-01 11:45:51 -08:00
Scott Main
9af875ec74 am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '5e0959393426371dadef2c7905d5c915a1ac2dd4':
  docs: update menu guide with CAB and popup menu, plus many other revisions
2012-02-01 11:45:49 -08:00
Scott Main
f47f6791f8 Merge "docs: dashboard update for feb 1" into ics-mr1 2012-02-01 11:43:48 -08:00
Scott Main
5e09593934 docs: update menu guide with CAB and popup menu, plus many other revisions
Change-Id: I5faedd5f5b812ca58eb2085b0c036570de861f15
2012-02-01 11:40:49 -08:00
Scott Main
1d45bc2eef docs: dashboard update for feb 1
Change-Id: I112d649e70e78678f986a4ed02e6db1cbdcf607f
2012-02-01 11:27:14 -08:00
Xia Wang
606b16bc16 am e546b879: am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit 'e546b879a5aa9c58a58fc1c5a2e3eb0123d4d5b2':
  Fix a typo in image processing test
2012-02-01 10:57:07 -08:00
Xia Wang
e546b879a5 am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit 'ccc11c4d3c8357a402b84c546e7b2f889729358c':
  Fix a typo in image processing test
2012-02-01 10:54:30 -08:00
Xia Wang
ccc11c4d3c Merge "Fix a typo in image processing test" into ics-mr1 2012-02-01 10:51:43 -08:00
Xia Wang
e2ce3b8252 Fix a typo in image processing test
Change-Id: I6c39a144dc7c724188e6ebad76c51c3ac1e818e1
2012-02-01 10:47:18 -08:00
The Android Open Source Project
964faa3518 am 3f3afbef: Reconcile with ics-mr1-release
* commit '3f3afbef0fc7c4199bb7d992dc52efaa6db1b91a':
2012-02-01 10:01:22 -08:00
The Android Open Source Project
3f3afbef0f Reconcile with ics-mr1-release
Change-Id: I79900da9bc339bad1350124768b53026f465a345
2012-02-01 08:49:50 -08:00
The Android Open Source Project
5ec5c7525d Reconcile with ics-mr1-release
Change-Id: Ia38fac8a91adbce6ae5c796c86252ac2364e3a6f
2012-02-01 08:42:59 -08:00
John Wang
cb78dd2da2 Use LTE SNR and RSRP to set signal level bar.
The LTE signal strength level is the smaller one
between lte rsrp level and lte snr level if both
rsrp and snr are valid.

The lte snr mapping are

  Four  bars: SNR >= 45
  Three bars: 10 <= SNR < 45
  Two   bars: -30 <= SNR < 10
  One   bars: SNR < -30
  No    bars: No Service

The invalid value of lte snr is changed to INVALID_SNR
from -1, since -1 is a valid value of lte snr.

bug:5640958
Change-Id: If26aaba0c7fcc0fee3db488b5adfa02922f06715
2012-01-31 16:24:10 -08:00
Scott Main
1a8a8b73d4 am 0b2701b7: Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a form
* commit '0b2701b7344fb7b7b6f9a1c1c99c8ede81b49d2d':
  docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug.
2012-01-31 16:10:38 -08:00
Scott Main
0b2701b734 Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug." into ics-mr1 2012-01-31 16:08:09 -08:00
The Android Automerger
869ad2b790 merge in ics-mr1-release history after reset to ics-mr1 2012-01-31 15:42:17 -08:00
Scott Main
493d27b89c docs: change that stated as a few doc fixes and turned into
fully documenting the device default themes and fixing many more,
including adding API level information for older themes to avoid confusion.
Oh and fix an unclosed <em> tag causing a format bug.

Change-Id: Ia4b33559bd5ad2cbae8b53966999cf7f5038b125
2012-01-31 15:24:08 -08:00
Justin Ho
66146c4f5b am 792d83c5: Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1
* commit '792d83c5087a7a6dec4e64f59f5b78d1041c9585':
  Use LTE SNR and RSRP to set signal level bar.
2012-01-31 14:02:44 -08:00
Justin Ho
792d83c508 Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1 2012-01-31 14:00:55 -08:00
John Wang
5e39519396 Use LTE SNR and RSRP to set signal level bar.
The LTE signal strength level is the smaller one
between lte rsrp level and lte snr level if both
rsrp and snr are valid.

The lte snr mapping are

  Four  bars: SNR >= 45
  Three bars: 10 <= SNR < 45
  Two   bars: -30 <= SNR < 10
  One   bars: SNR < -30
  No    bars: No Service

The invalid value of lte snr is changed to INVALID_SNR
from -1, since -1 is a valid value of lte snr.

bug:5640958
Change-Id: If26aaba0c7fcc0fee3db488b5adfa02922f06715
2012-01-31 11:15:28 -08:00
Scott Main
123ffc1fa4 am 34260ad7: Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1
* commit '34260ad79ede2ed35cc9859095b778f194b9650b':
  docs: fix locale name; South Africa is local en_ZA external issue 23133
2012-01-31 08:41:03 -08:00
Scott Main
21e32f2097 am 8bfeb10f: Merge "docs: fix typo in market doc external issue 22650" into ics-mr1
* commit '8bfeb10f98125706d8bb7afa1067ca563e741540':
  docs: fix typo in market doc external issue 22650
2012-01-31 08:41:01 -08:00
Scott Main
20d06540e2 am 4b2eb9a5: Merge "docs: fix typos and clarify some grammar in summary external issue 21548" into ics-mr1
* commit '4b2eb9a50bbead0b756944ebffd01c89916896ad':
  docs: fix typos and clarify some grammar in summary external issue 21548
2012-01-31 08:40:59 -08:00