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

3591 Commits

Author SHA1 Message Date
Scott Main
db00b17a1c am ec3aed6e: am a5d13a5e: am 6ad19f2e: am 30bbfeaf: am a180cc3c: am cd579c57: wording tweak to brand guidelines 
* commit 'ec3aed6edb88637ecd9119aeaeee7dc153ced9cd':
  wording tweak to brand guidelines
 2012-10-01 13:48:06 -07:00
Scott Main
6ad19f2e2c am 30bbfeaf: am a180cc3c: am cd579c57: wording tweak to brand guidelines 
* commit '30bbfeafa1645c39790ef7e40c63b427af11b927':
  wording tweak to brand guidelines
 2012-10-01 12:05:31 -07:00
Scott Main
30bbfeafa1 am a180cc3c: am cd579c57: wording tweak to brand guidelines 
* commit 'a180cc3c0c33333c07c7c510aef92cee78dab56c':
  wording tweak to brand guidelines
 2012-10-01 12:03:09 -07:00
Scott Main
a180cc3c0c am cd579c57: wording tweak to brand guidelines 
* commit 'cd579c57bb7bce23736216905dc2c0a349bf4246':
  wording tweak to brand guidelines
 2012-10-01 12:00:24 -07:00
Scott Main
cd579c57bb wording tweak to brand guidelines 
Change-Id: Ie1435ac97b6988b74fbcd1e1b29e4ff106492a13
 2012-10-01 11:17:54 -07:00
Scott Main
7369d8dd74 am 4b228c33: am 4acbe2d8: am ef6130d6: am dc3e0069: am b78c2207: Merge "updates to the brand guidelines, based on the partner toolkit" into jb-dev-docs 
* commit '4b228c33eb82a2e6e0a2b5a31f6936647fc88fb8':
  updates to the brand guidelines, based on the partner toolkit
 2012-09-28 15:53:01 -07:00
Scott Main
4acbe2d892 am ef6130d6: am dc3e0069: am b78c2207: Merge "updates to the brand guidelines, based on the partner toolkit" into jb-dev-docs 
* commit 'ef6130d6fa0e84c5aa038ff87e1fa633fe98a7b4':
  updates to the brand guidelines, based on the partner toolkit
 2012-09-28 15:15:53 -07:00
Scott Main
ef6130d6fa am dc3e0069: am b78c2207: Merge "updates to the brand guidelines, based on the partner toolkit" into jb-dev-docs 
* commit 'dc3e0069827289c77e769e2d1861f0e1520f7693':
  updates to the brand guidelines, based on the partner toolkit
 2012-09-28 15:09:20 -07:00
Scott Main
dc3e006982 am b78c2207: Merge "updates to the brand guidelines, based on the partner toolkit" into jb-dev-docs 
* commit 'b78c2207a05cee804f225e86c27211ae5b1629ab':
  updates to the brand guidelines, based on the partner toolkit
 2012-09-28 15:05:19 -07:00
Scott Main
b78c2207a0 Merge "updates to the brand guidelines, based on the partner toolkit" into jb-dev-docs 2012-09-28 15:02:28 -07:00
Joe Malin
6214c9c0c2 am aaa2ebdc: am fd3398c8: am 44c564f2: am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 
* commit 'aaa2ebdccec0d37a990ae45d831847f9253b8a65':
  DOC CHANGE: Fix Google Play services page
 2012-09-26 12:52:29 -07:00
Joe Malin
fd3398c8bf am 44c564f2: am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 
* commit '44c564f251653286f3d2b8608ff5fccba39e831f':
  DOC CHANGE: Fix Google Play services page
 2012-09-26 12:48:58 -07:00
Joe Malin
44c564f251 am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 
* commit 'd8104d9b3debad8c960a302972488e5157702618':
  DOC CHANGE: Fix Google Play services page
 2012-09-26 12:45:58 -07:00
Joe Malin
d8104d9b3d am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 
* commit '829986a5f6b46a744f1f9953b8af5bbe849c71a9':
  DOC CHANGE: Fix Google Play services page
 2012-09-26 12:43:38 -07:00
Joe Malin
829986a5f6 Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 2012-09-26 12:41:43 -07:00
Joe Malin
74708d896b DOC CHANGE: Fix Google Play services page 
Change-Id: I9b175a01ee415fee187ff4257c36b9462acfd29b
 2012-09-26 12:36:50 -07:00
Scott Main
d401d58e50 updates to the brand guidelines, based on the partner toolkit 
Change-Id: Ie4ee8b11bc97d00412f48b6086fac72ad5c52006
 2012-09-26 12:17:49 -07:00
Dirk Dougherty
0e2bb7b9a9 am 17a5745b: am 832981c2: am 6aba1d7b: am 8a58c030: am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs 
* commit '17a5745bc99d25977013588a71a4c2a45138199c':
  Doc change: Update GP services description.
 2012-09-26 12:09:43 -07:00
Dirk Dougherty
832981c213 am 6aba1d7b: am 8a58c030: am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs 
* commit '6aba1d7bb9935c42ef8dd53ce81cb45184a39e45':
  Doc change: Update GP services description.
 2012-09-26 12:04:50 -07:00
Dirk Dougherty
6aba1d7bb9 am 8a58c030: am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs 
* commit '8a58c030e3a56878cac6f449161c8b29d9557006':
  Doc change: Update GP services description.
 2012-09-26 12:02:47 -07:00
Dirk Dougherty
8a58c030e3 am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs 
* commit '8e3dca8d274270d8cb43d0df10787c7409bcc8cc':
  Doc change: Update GP services description.
 2012-09-26 12:00:54 -07:00
Dirk Dougherty
8e3dca8d27 Merge "Doc change: Update GP services description." into jb-dev-docs 2012-09-26 11:58:30 -07:00
Dirk Dougherty
d2a8a5ecf9 Doc change: Update GP services description. 
Change-Id: I9891c3bd900726d0c7fb39ac91157e6e58c52ed8
 2012-09-26 11:54:18 -07:00
Scott Main
72ce2c1763 am 991a5f38: am 80c491f0: am 16eb5366: am 54645245: am 14a36625: fix markup bugs 
* commit '991a5f3856b3f714d81141e7413558e5fbe8109a':
  fix markup bugs
 2012-09-26 11:44:50 -07:00
Scott Main
80c491f07a am 16eb5366: am 54645245: am 14a36625: fix markup bugs 
* commit '16eb53668bc000c9d6cdd9c2dd68e51f16483d25':
  fix markup bugs
 2012-09-26 11:39:54 -07:00
Scott Main
16eb53668b am 54645245: am 14a36625: fix markup bugs 
* commit '5464524524ce40af3e421e2d1c9bf810605ae43a':
  fix markup bugs
 2012-09-26 11:37:38 -07:00
Scott Main
5464524524 am 14a36625: fix markup bugs 
* commit '14a366255aee79eec81d5a80ec3d8f298af9a938':
  fix markup bugs
 2012-09-26 11:34:49 -07:00
Scott Main
14a366255a fix markup bugs 
Change-Id: I37111431505f7803c2374917b3c186529c6e3d60
 2012-09-26 11:22:09 -07:00
Scott Main
fb3b17d90e am bbad39a1: am 9703880d: am 82e7fdfd: am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout state 
* commit 'bbad39a1e92b363526b114bdf81eea86b90aba55':
  add tip about including android:id for layout state
 2012-09-25 19:12:09 -07:00
Scott Main
9703880d73 am 82e7fdfd: am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout state 
* commit '82e7fdfd47e7de5408c3a0e296475bb1e945f339':
  add tip about including android:id for layout state
 2012-09-25 19:08:15 -07:00
Scott Main
82e7fdfd47 am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout state 
* commit '4f832bc796bad90e5632c3ab69e305b3c7c008ba':
  add tip about including android:id for layout state
 2012-09-25 19:05:35 -07:00
Scott Main
4f832bc796 am 3b1c5d55: add tip about including android:id for layout state 
* commit '3b1c5d55517260516bfa5591ca08bb39d336d511':
  add tip about including android:id for layout state
 2012-09-25 19:03:33 -07:00
Scott Main
3b1c5d5551 add tip about including android:id for layout state 
Change-Id: I9bc9157b320f8a8ac37ab30bc31fb9c457ecf4f6
 2012-09-25 19:01:09 -07:00
Joe Fernandez
e35d9280d6 cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 
docs: Systrace tool documentation

Change-Id: I85413fad63edd536a18123a5c09abee47051fca6
 2012-09-25 17:52:02 -07:00
Elliott Hughes
94f443278c am 492ff5bb: am bf5d1858: Merge "Attempt to clarify how pluralization actually works." into jb-mr1-dev 
* commit '492ff5bbe184efc07c57b12b7980e0e435f55c6d':
  Attempt to clarify how pluralization actually works.
 2012-09-25 16:31:50 -07:00
Elliott Hughes
bf5d185800 Merge "Attempt to clarify how pluralization actually works." into jb-mr1-dev 2012-09-25 16:25:29 -07:00
Elliott Hughes
0cd016741d Attempt to clarify how pluralization actually works. 
Many languages are very unlike English.

Bug: 7229680
Change-Id: I3a2b9d10ee7d92b0a0bc47d81bd372fd8ce6ba19
 2012-09-25 16:15:35 -07:00
Kristian Monsen
7ae8a60f35 Merge "Hiding a method for JB-MR1" into jb-mr1-dev 2012-09-25 07:29:13 -07:00
Kristian Monsen
d0b90d30d8 Hiding a method for JB-MR1 
This one got left out in the last round of method hiding.

This got lost in the last round of method hiding.

Change-Id: I3c6aa234dd29933cb32d0cd91830d47289e7e639
 2012-09-24 19:11:30 -04:00
Eino-Ville Talvala
19a58d2021 am 899d1efa: am a91c9f9f: Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev 
* commit '899d1efa4e83e1e01e885f30450380996bbe69fc':
  Unhide and document feature android.hardware.camera.any.
 2012-09-24 09:37:54 -07:00
Scott Main
915b7ea045 am 3352fb2f: am ec501466: am 2e642866: am be676b6c: am 4a5425db: fix layout bug 
* commit '3352fb2f7a7cead569ba4fefc5e0991f4205973d':
  fix layout bug
 2012-09-24 00:51:15 -07:00
Eino-Ville Talvala
a91c9f9f7a Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev 2012-09-23 10:14:22 -07:00
Scott Main
ec501466ea am 2e642866: am be676b6c: am 4a5425db: fix layout bug 
* commit '2e6428668c97826e169e51ac5d0a7c6e8ba3bd79':
  fix layout bug
 2012-09-21 16:03:39 -07:00
Scott Main
2e6428668c am be676b6c: am 4a5425db: fix layout bug 
* commit 'be676b6cc4a2a594dcb1fb233539cf927f0b49e5':
  fix layout bug
 2012-09-21 16:00:51 -07:00
Scott Main
be676b6cc4 am 4a5425db: fix layout bug 
* commit '4a5425dbd29329aaffbab3bb83c33bd437958237':
  fix layout bug
 2012-09-21 15:59:04 -07:00
Scott Main
4a5425dbd2 fix layout bug 
Change-Id: Ibf3f04d6c2077c77b75076c02312d3b2dea394eb
 2012-09-21 15:55:15 -07:00
Joe Fernandez
af7ad1360e am 4e482b97: am b4544d68: am c098ff66: am bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev 
* commit '4e482b97910d4e19b0792071950279485ce7e87f':
  docs: Systrace tool documentation
 2012-09-20 20:28:29 -07:00
Joe Fernandez
b4544d68b0 am c098ff66: am bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev 
* commit 'c098ff668bf9ff9abd15a2b7352e0c498fa38e3f':
  docs: Systrace tool documentation
 2012-09-20 18:17:51 -07:00
Joe Fernandez
c098ff668b am bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev 
* commit 'bbdfada0a97b779bde0c43b63979bf7edb94d94d':
  docs: Systrace tool documentation
 2012-09-20 16:43:21 -07:00
Joe Fernandez
bbdfada0a9 Merge "docs: Systrace tool documentation" into jb-dev 2012-09-20 15:13:01 -07:00