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

2593 Commits

Author SHA1 Message Date
Elliott Hughes
6973a63e96 am ec2d8d0b: am ea8ff822: Merge "Fix and be more explicit about plurals best practices." 
* commit 'ec2d8d0bb8a36355b8d687c660b5c64e4aebd9b8':
  Fix and be more explicit about plurals best practices.
 2014-11-20 00:27:29 +00:00
Elliott Hughes
1fe7d496db Fix and be more explicit about plurals best practices. 
The "one" case should always include %d. Say so, and fix our examples.
Also make it clear that developers should always provide exactly "one"
and "other".

Bug: 18429565
Change-Id: I09eb39ea6986850c3af28cca3052d319e3c97705
 2014-11-19 16:18:45 -08:00
Ricardo Cervera
23dac82dd3 am de71dd5c: am 92ad1d81: am b2a2d2c2: am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs 
* commit 'de71dd5cb47509011099f08ae872de5f2c945775':
  docs: Add link to "Voice search in your app" video.
 2014-11-19 00:19:28 +00:00
Ricardo Cervera
0d18b091eb Merge "docs: Add link to "Voice search in your app" video." into lmp-docs 2014-11-18 23:16:22 +00:00
Ricardo Cervera
c3b2a00371 docs: Add link to "Voice search in your app" video. 
Bug: 18407660

Change-Id: I9062c708b64586116e5af4df5d83b73988189e8a
 2014-11-18 10:02:15 -08:00
smain@google.com
be0737cdff am e9e96e7f: am 7d0d2f6c: am c6bd0155: am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs 
* commit 'e9e96e7f0e372459372b31b138124d0760ed2689':
  fix code type and mention api level 21 exception for bindService()
 2014-11-12 18:09:54 +00:00
smain@google.com
9adc33a658 fix code type and mention api level 21 exception for bindService() 
Change-Id: I45460a1559960a32818e9cc88b1241b26f2f1f7d
 2014-11-12 09:38:00 -08:00
Scott Rowe
3632637b4a docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 
Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-07 16:05:13 -08:00
Ricardo Cervera
92f6a74708 docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
Change-Id: Iae4901a311e76401396f89c552e5b27a49c65c83
 2014-11-05 08:55:51 -08:00
Scott Rowe
c1c58b9a96 am 1117098b: am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docs 
automerge: aa3be67

* commit 'aa3be670328ee9ff7e1fbd3ec077ff27ddf42013':
  docs: b/18119632 isGame, b/18119595 banner
 2014-11-03 17:29:59 +00:00
Scott Rowe
4c3a07ba05 docs: b/18119632 isGame, b/18119595 banner 
Change-Id: I171b4aff3359ec96b2ea1003870739ad586971c7
 2014-10-31 09:51:27 -07:00
David Friedman
5decda261a am 3be4e43b: am 543a82ed: am 51209aa3: am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
* commit '3be4e43b4cb81762c0fae2936b1546e2bb5acdcc':
  Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
 2014-10-30 23:43:31 +00:00
David Friedman
0fa6edced7 Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
Change-Id: I7be014d27ef85631b5e26ad2b3ab81d3a12d1813
 2014-10-28 16:38:11 -07:00
Ricardo Cervera
91934b63ee am 989f4bfd: am f4e32145: am 61fcad92: docs: Add SearchXonY to Common Intents automerge: be07f2a 
automerge: cf6a28f

* commit 'cf6a28f813749f9ce1934e9054b53a19d0e30b39':
  docs: Add SearchXonY to Common Intents
 2014-10-28 19:42:19 +00:00
Ricardo Cervera
61fcad92ab docs: Add SearchXonY to Common Intents 
Change-Id: Idb68c0dc95dfd0a21a73df707a7a1f5b21c3ee5e
 2014-10-27 18:09:11 +00:00
Natalie Masse
7e3f7ced52 am a2e6ec07: am 694a9e46: am 0fbbed83: am 60144a7a: am bcf9ced4: am 1e5bb861: Link and typo fixed 
* commit 'a2e6ec070cc9c127a5c376e3bf5e19de09c44324':
  Link and typo fixed
 2014-10-24 23:39:29 +00:00
Natalie Masse
60144a7a06 am bcf9ced4: am 1e5bb861: Link and typo fixed 
* commit 'bcf9ced47a123220271fcca70f71c2adf69ad100':
  Link and typo fixed
 2014-10-24 22:36:54 +00:00
Joe Fernandez
6a050e96c7 am 0fac4f27: am 9881c0d8: am c97bc213: am f21746fc: Merge "docs: update location of sample apps" into lmp-dev 
* commit '0fac4f27c762058b5b955749e8be68ae8573a8e8':
  docs: update location of sample apps
 2014-10-17 20:29:01 +00:00
Joe Fernandez
5259fee88e am f21746fc: Merge "docs: update location of sample apps" into lmp-dev 
* commit 'f21746fca8603ed5a4d328b804ad6de24226ef49':
  docs: update location of sample apps
 2014-10-17 19:44:38 +00:00
Dirk Dougherty
94ce09cb80 am e1fa68cd: am 20a7afd4: am f0c1af8e: am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev 
* commit 'e1fa68cd24c5a97a549c101f3eeacb70cafb8c9d':
  Doc change: Add Lollipop to platform versions table.
 2014-10-17 19:11:31 +00:00
Scott Rowe
0e500adfc8 am 81584ee6: am 5100b72c: am fafb6c70: am dd886683: docs: Notifications changes for L 
* commit '81584ee6ed1b0378847aaee0ae4091cb9fefe2a3':
  docs: Notifications changes for L
 2014-10-17 19:10:38 +00:00
Joe Fernandez
8733556213 am d81ca1da: am 39f69b79: am 770f57e0: am 321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev 
* commit 'd81ca1da0546b4d0d9ff32918132e625e89d4e16':
  docs: Recents screen for tasks and activities
 2014-10-17 19:10:23 +00:00
Joe Fernandez
bc31db59e5 am 315a45e0: am 36d13e6a: am 491fa057: am d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev 
* commit '315a45e085a14884e267c49498e94a316376e212':
  Android 5.0 changes to IME switching
 2014-10-17 19:09:52 +00:00
Scott Rowe
87b1d0d099 docs: update location of sample apps 
Change-Id: I5079d5578c29cde387d087ec8767ae03aaa7ebe2
 2014-10-17 10:46:04 -07:00
Natalie Masse
1e5bb86126 Link and typo fixed 
Change-Id: Ie9ace6e002703d7d1f83173da49672cf60ca1653
 2014-10-17 13:50:24 +01:00
Dirk Dougherty
eab518b443 am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev 
* commit '22fa76dac8de6cfd9e7bc1eb8800f4cddbfc0640':
  Doc change: Add Lollipop to platform versions table.
 2014-10-17 09:24:36 +00:00
Dirk Dougherty
2b86948e46 Doc change: Add Lollipop to platform versions table. 
Change-Id: Iad84444396a3b2d24403e88398ca21933741b819
 2014-10-17 02:16:58 -07:00
Scott Rowe
1d90cac982 docs: Notifications changes for L 
automerge: dd88668

* commit 'dd88668392839509c812a544b1132185b3825b69':
  docs: Notifications changes for L
 2014-10-17 07:09:17 +00:00
Scott Rowe
dd88668392 docs: Notifications changes for L 
Change-Id: I53c744734358401adefbcffd5ce5a3676d6d955a
 2014-10-16 23:48:25 -07:00
Joe Fernandez
06d2cb68b4 Merge "docs: Recents screen for tasks and activities" into lmp-dev 
automerge: 321e764

* commit '321e7645c305dbc4f7444d364c879bad8946da2b':
  docs: Recents screen for tasks and activities
 2014-10-17 05:49:27 +00:00
Joe Fernandez
321e7645c3 Merge "docs: Recents screen for tasks and activities" into lmp-dev 2014-10-17 05:40:43 +00:00
Joe Fernandez
365ca55529 Merge "Android 5.0 changes to IME switching" into lmp-dev 
automerge: d664dc9

* commit 'd664dc93f47e32df865384718055b200585e0e88':
  Android 5.0 changes to IME switching
 2014-10-17 05:33:00 +00:00
Scott Rowe
73d799dda2 docs: Recents screen for tasks and activities 
Change-Id: I94774e60e6a7453a047ad394c3bbfff0cc4dfc7d
 2014-10-16 22:16:13 -07:00
Joe Fernandez
d664dc93f4 Merge "Android 5.0 changes to IME switching" into lmp-dev 2014-10-17 05:01:04 +00:00
David Friedman
e802d5432e Android 5.0 changes to IME switching 
Change-Id: I158736ee36706889a5277f02a652162194289514
 2014-10-16 21:52:53 -07:00
Scott Rowe
6b7bca2cbb am d534cf04: am 0e328222: am c9f6bb8e: am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit 'd534cf04f014096e23fa533614a25eafeaafb771':
  docs: update reference to FragmentRetainInstance
 2014-10-16 19:17:06 +00:00
David Friedman
bc6c216540 am 57c63dbf: am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev automerge: f8e428d 
* commit '57c63dbf271ebc66c9ce09eaac05b1d1f524944e':
  OpenGL 3.1 and AEP documentation for L-release.
 2014-10-16 19:16:25 +00:00
Scott Rowe
27d9fa6801 am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit '447369f2d2b02f78d01d4a4923fedfca96c1950f':
  docs: update reference to FragmentRetainInstance
 2014-10-16 18:32:17 +00:00
Scott Rowe
447369f2d2 am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 
* commit 'a1e3063ebe04c8c304f48a02117085962f75cb63':
  docs: update reference to FragmentRetainInstance
 2014-10-16 18:23:42 +00:00
David Friedman
40d9eaa844 am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 
* commit 'd12e6de645a39e6e902785d544100fb1963aa203':
  OpenGL 3.1 and AEP documentation for L-release.
 2014-10-16 18:10:38 +00:00
David Friedman
d12e6de645 Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev 2014-10-16 18:06:01 +00:00
Scott Rowe
ab64919c0e Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs 2014-10-16 16:56:55 +00:00
David Friedman
778d3552d6 OpenGL 3.1 and AEP documentation for L-release. 
Change-Id: I21b75a6f38977729fa8c1c94c66354054bdb780c
 2014-10-15 19:59:43 -07:00
Nick Kralevich
a26487cb28 am 55bb6a7b: am 01edf579: am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev 
* commit '55bb6a7b68595ee83b543eda40d191636de1831e':
  Docs: adding closing bracket to un-break javadoc tokens.
 2014-10-15 02:03:37 +00:00
Nick Kralevich
0763a03d22 am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev 
* commit '0ae82b05be47df85551a1c759a93e84c8009947c':
  Docs: adding closing bracket to un-break javadoc tokens.
 2014-10-14 15:50:15 +00:00
Nick Kralevich
0ae82b05be resolved conflicts for merge of a4eb81b6 to lmp-dev 
Change-Id: I73b225141e09826b40e4941140b59d1c163bd9c7
 2014-10-14 08:38:05 -07:00
Eric Gilmore
e77fe60760 Docs: adding closing bracket to un-break javadoc tokens. 
Bug: 17186958

Change-Id: Ib21120d71ccd7c59536af3d26d7090fc919bec17
 2014-10-09 10:17:59 -07:00
Ricardo Cervera
abbbc5940a am ef081faf: am 25221488: am 3edec8ec: am dbcfc8ef: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. 
* commit 'ef081faf72931b9c8262bcd8d4c387b615218857':
  docs: Removing references to self note on Common Intents page.
 2014-10-08 07:51:33 +00:00
Ricardo Cervera
dcc6501c73 am 24e579a2: am 614ae244: am d3ffa845: am 692bb81c: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 
* commit '24e579a2d387b2c4307a016982d8ee85b32693a7':
  docs: Update Common Intents page with Google Now actions
 2014-10-08 07:51:29 +00:00
Ricardo Cervera
89b6d70ccd am dbcfc8ef: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. 
* commit 'dbcfc8efdb995d3e7a1865f1d8484c883acb3805':
  docs: Removing references to self note on Common Intents page.
 2014-10-07 23:58:19 +00:00