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

63089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
b1f95c6a93 am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
  Setup ActionBars in layoutlib the same way the platform does it. do not merge.
 2012-02-06 16:42:56 -08:00
Xavier Ducrohet
331bb0c393 Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
Instead of using a simple ImageView for the icon, this uses the platform
layout/action_bar_home which uses a custom class to position and resize
the icon (and also supports the Up icon that we don't yet support).

This ensures that the icon is properly positionned and sized like
on devices.

(cherry picked from commit 7396348dfcfb45b7ad055f4c18cabbe5e8270d26)

Change-Id: Ifd3bc318089b70ba843519523e366e59d434e919
 2012-02-06 16:40:03 -08:00
Scott Main
5a0fe6fc13 am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit 'a9d9fa723a10ae41c047a4e8eba330112d344dc8':
  docs: switch from caps to initial-case for device button names
 2012-02-06 14:12:03 -08:00
Scott Main
a9d9fa723a Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 2012-02-06 14:10:16 -08:00
Jean-Baptiste Queru
f79bcd2dd5 am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library." 
* commit '52da99fac85d1e16a3c95bdd9c039801e920e6d1':
  Skia API changes as a result of an update to the Skia library.
 2012-02-06 14:09:36 -08:00
Scott Main
cf9fe43ce9 docs: switch from caps to initial-case for device button names 
Change-Id: I2affdf7400fd814e43633806cebebee4c6075b0b
 2012-02-06 14:09:00 -08:00
Jean-Baptiste Queru
52da99fac8 am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library." 
* commit 'a081c7b8bc5a3ea19fc7562b333fac525b17bc5f':
  Skia API changes as a result of an update to the Skia library.
 2012-02-06 14:07:31 -08:00
Jean-Baptiste Queru
a081c7b8bc Merge "Skia API changes as a result of an update to the Skia library." 2012-02-06 14:01:06 -08:00
Scott Main
8e39940872 am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 
* commit '4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
  docs: add Sony USB VID issue 5967572
 2012-02-06 13:05:04 -08:00
Scott Main
4ba15efc5b Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 2012-02-06 13:03:16 -08:00
Scott Main
ed4d1f7dcf docs: add Sony USB VID 
issue 5967572

Change-Id: I5735d15bec6bd85b5fa74300193dfba1c9da6f34
 2012-02-06 13:01:44 -08:00
Xavier Ducrohet
b54f371cc4 am f8aea993: Make aapt ignore tools-related data. 
* commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
  Make aapt ignore tools-related data.
 2012-02-06 11:41:56 -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
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
fb16fdf2d1 am 6aaa27fb: docs: fix broken link 
* commit '6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
  docs: fix broken link
 2012-02-01 15:00:49 -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
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
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
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
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
Derek Sollenberger
889a3fa6ab Skia API changes as a result of an update to the Skia library. 
These changes are required to work with r3022 of Skia

Change-Id: Ib7cebeb2eba6790bb38edfc2397b311cf419e17c
 2012-01-31 14:08:22 -05: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
Scott Main
34260ad79e Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1 2012-01-31 08:39:36 -08:00
Scott Main
8bfeb10f98 Merge "docs: fix typo in market doc external issue 22650" into ics-mr1 2012-01-31 08:39:03 -08:00
Scott Main
665a6693f7 am b86cba15: docs: fix typo in eclipse doc external issue 21475 
* commit 'b86cba156c78740793d94444e01d17ef21cb53cc':
  docs: fix typo in eclipse doc external issue 21475
 2012-01-31 08:38:49 -08:00
Scott Main
4b2eb9a50b Merge "docs: fix typos and clarify some grammar in summary external issue 21548" into ics-mr1 2012-01-31 08:37:59 -08:00
Scott Main
b86cba156c docs: fix typo in eclipse doc 
external issue 21475

Change-Id: I5aeee5710175964e2cf969965c7ed58c01f0e433
 2012-01-30 23:56:53 -08:00
Scott Main
6440534660 docs: fix typos and clarify some grammar in summary 
external issue 21548

Change-Id: Ic38921cb64390b42651f3971efeb4b76101dfc14
 2012-01-30 23:49:26 -08:00
Scott Main
5b259c6e4d docs: fix typo in market doc 
external issue 22650

Change-Id: I2bbfddef4692cb6b7567ea3ab04443a6ac421a80
 2012-01-30 23:39:45 -08:00
The Android Automerger
bc98b2a000 merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 23:33:37 -08:00
Scott Main
b16965cf65 docs: fix locale name; South Africa is local en_ZA 
external issue 23133

Change-Id: Ia17f61e6a4e14506aec5491db0c3fc65707f2c2b
 2012-01-30 23:33:01 -08:00