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

164668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Slogar
904d498312 am 6843ae30: am c0559808: am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs 
* commit '6843ae308ea8d62aa44dda3e7ad95c6e292513af':
  docs: remove adb install option
 2015-04-13 18:53:01 +00:00
Rich Slogar
12020cf441 am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit '3e664c3bda8ee1cb3b2819ba38a8195147ad448a':
  docs: systrace update
 2015-04-13 18:43:04 +00:00
Rich Slogar
8f68c77cec am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit '6656ea4607d8250a611eddb07de890213ea31426':
  docs: nexus usb driver update
 2015-04-13 18:42:58 +00:00
Rich Slogar
6843ae308e am c0559808: am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs 
* commit 'c0559808eeb881ce5afa368c51f3da3807359d56':
  docs: remove adb install option
 2015-04-13 18:42:54 +00:00
Rich Slogar
3e664c3bda am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit 'bdc20109208d16144cd052b281e25e6e243b2547':
  docs: systrace update
 2015-04-13 18:30:38 +00:00
Rich Slogar
6656ea4607 am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit '880460a704c79b0d81c1aa8af9b3c163c8adf16d':
  docs: nexus usb driver update
 2015-04-13 18:30:33 +00:00
Rich Slogar
c0559808ee am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs 
* commit 'a7ade2f7f0c496cb12edfc4ae805fd08c9c2359d':
  docs: remove adb install option
 2015-04-13 18:30:29 +00:00
Rich Slogar
bdc2010920 Merge "docs: systrace update" into lmp-docs 2015-04-13 18:14:06 +00:00
Rich Slogar
880460a704 Merge "docs: nexus usb driver update" into lmp-docs 2015-04-13 18:13:47 +00:00
Rich Slogar
a7ade2f7f0 Merge "docs: remove adb install option" into lmp-docs 2015-04-13 18:13:10 +00:00
Mathieu Chartier
d4bcbcfa08 am dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 
* commit 'dd9e41407552fb44ad2d537966611d574269f45f':
  Update "Investigating your RAM usage" for ART
 2015-04-13 17:47:24 +00:00
Mathieu Chartier
dd9e414075 am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 
* commit 'f2a4968b3fd2292943d5fa5c54246b87d3637076':
  Update "Investigating your RAM usage" for ART
 2015-04-13 17:37:44 +00:00
Mathieu Chartier
2c957d4cb9 Update "Investigating your RAM usage" for ART 
Bug: 19884954
Change-Id: I9a987c7bb0ab2a9d8b2ac870796969f073803d56
(cherry picked from commit d92c6bde3fc61e1ea90c54e4fd19d72f0b1a3987)
 2015-04-13 17:29:15 +00:00
Mathieu Chartier
f2a4968b3f Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 2015-04-13 17:29:02 +00:00
Geoff Mendal
08c21adc91 Import translations. DO NOT MERGE 
Change-Id: I239fc7724d745a1abbac73e673ecfe408ce17c9b
Auto-generated-cl: translation import
 2015-04-10 23:07:04 -07:00
David Friedman
23b5e508ad am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 
* commit '340a617ef42951446bbc730833cea207370307d0':
  New build rule reflecting different masthead, side nav for NDK minisite.
 2015-04-11 02:05:57 +00:00
David Friedman
340a617ef4 am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 
* commit '746fed63567c548c7b55c14e1532d059753bfa52':
  New build rule reflecting different masthead, side nav for NDK minisite.
 2015-04-11 01:55:32 +00:00
David Friedman
746fed6356 am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 
* commit '3a77a8aeea1a40ca5c2cdb0b66a877032118d89f':
  New build rule reflecting different masthead, side nav for NDK minisite.
 2015-04-11 01:46:19 +00:00
David Friedman
3a77a8aeea Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 2015-04-11 01:36:57 +00:00
Mathieu Chartier
d92c6bde3f Update "Investigating your RAM usage" for ART 
Bug: 19884954
Change-Id: I9a987c7bb0ab2a9d8b2ac870796969f073803d56
 2015-04-10 18:34:51 -07:00
Bryce Lee
eccaf7290a Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with 
keyguard enabled.

Bug: 20037090
Change-Id: I613f3278a234e3961cb4be1976da0f821aebfc1f
 2015-04-09 13:10:33 -07:00
Rich Slogar
0b1610ff49 am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit '2489a7fd5fbafde339ac58f2f1e7a5854e7e4936':
  docs: remove studio proguard settings from play services
 2015-04-09 18:11:24 +00:00
Rich Slogar
2489a7fd5f am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit '9d6e95879aff4608db400c270fa8f89b6b55d0e6':
  docs: remove studio proguard settings from play services
 2015-04-09 17:57:20 +00:00
Rich Slogar
9d6e95879a am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit '36e3f5125895875c63242294da289ca4b09c9f9e':
  docs: remove studio proguard settings from play services
 2015-04-09 17:47:40 +00:00
Rich Slogar
36e3f51258 Merge "docs: remove studio proguard settings from play services" into lmp-docs 2015-04-09 17:39:29 +00:00
Andrew Solovay
3aba19a6c0 Docs: Correcting section on how to escape quotes in strings. 
The behavior for single and double-quotes is different--I expanded
this section to note how they differ.

(New version of a Gerrit CL I abandoned because of a commit mess-up.)

See first comment for doc stage location.

bug: 19959941
Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26
 2015-04-08 12:00:42 -07:00
Quddus Chong
67f0c8db35 am a147451a: am c61fd055: am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 
* commit 'a147451ab92e29141cd85d5c75a881586d5959df':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-08 18:48:57 +00:00
Quddus Chong
a147451ab9 am c61fd055: am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 
* commit 'c61fd05581a80bcecf50509acb220ea3e2817e56':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-08 18:38:47 +00:00
Quddus Chong
c61fd05581 am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 
* commit 'ff4c632592cce177997d63b3ff81c0b2be9cf9bb':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-08 18:27:56 +00:00
Quddus Chong
ff4c632592 Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 2015-04-08 18:16:58 +00:00
Quddus Chong
0c5752be40 am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev 
* commit 'c736e8cf41445e7a32721da617d6d7eacd189703':
  Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
 2015-04-08 18:11:55 +00:00
Quddus Chong
0e3547bd44 cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. 
bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e

Change-Id: I48d1e2f8e1f7d94dffac61a274f9c1a2df31a822
 2015-04-08 10:59:27 -07:00
Quddus Chong
c736e8cf41 am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev 
* commit 'f0ab39c10b614514ba4a600aa6fd4354253cde73':
  Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
 2015-04-08 17:53:44 +00:00
Quddus Chong
f0ab39c10b Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev 2015-04-08 17:46:21 +00:00
Eric Gilmore
b1044aaf29 am 8ba1380f: am a4f72eb0: am aac938a8: Merge "Fixing date." into lmp-docs 
* commit '8ba1380fb59d3b7adec7e99f354eccabcead65b6':
  Fixing date.
 2015-04-08 00:53:50 +00:00
Eric Gilmore
8ba1380fb5 am a4f72eb0: am aac938a8: Merge "Fixing date." into lmp-docs 
* commit 'a4f72eb079938bed57e8183e8110da044fe03429':
  Fixing date.
 2015-04-08 00:43:41 +00:00
Eric Gilmore
a4f72eb079 am aac938a8: Merge "Fixing date." into lmp-docs 
* commit 'aac938a8597efb8d71ce7dc124779f1d268510eb':
  Fixing date.
 2015-04-08 00:33:07 +00:00
Eric Gilmore
aac938a859 Merge "Fixing date." into lmp-docs 2015-04-08 00:05:28 +00:00
Quddus Chong
a9f6a9b769 Fixed broken link in UiAutomation.setRunAsMonkey() method description. 
bug: 19711873

Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-07 13:04:39 -07:00
Quddus Chong
4559d6aefb am 90bf99b1: am 922946ea: am a0c887c6: docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296 
* commit '90bf99b163866020140ac872aa704163fafddae1':
  docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296
 2015-04-07 19:19:48 +00:00
Quddus Chong
90bf99b163 am 922946ea: am a0c887c6: docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296 
* commit '922946ea75e0b387d900bb20c55759c6343ac4b5':
  docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296
 2015-04-07 19:09:13 +00:00
Quddus Chong
0c7f94365c am 47c1835a: am 868c795d: am 0307acf9: Merge "docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293" into lmp-docs 
* commit '47c1835a45321cc327dfd9fc97b3d22305d3fa5e':
  docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293
 2015-04-07 19:03:01 +00:00
Eric Gilmore
4480bdad95 Fixing date. 
Change-Id: Ia406bec97cda0ae309abbb8c538ad4ea3b4e9d42
 2015-04-07 11:58:52 -07:00
Quddus Chong
922946ea75 am a0c887c6: docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296 
* commit 'a0c887c67e5d925247fcb77d714ccc3383c0d0da':
  docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296
 2015-04-07 18:58:07 +00:00
Joe Fernandez
2e567682a2 am 038fe2de: am 19a57761: am 95c39774: docs: Small fix for Android Dashboard 
* commit '038fe2deab06ff4fb72db1f5d5012ddf35c5d04d':
  docs: Small fix for Android Dashboard
 2015-04-07 18:53:01 +00:00
Quddus Chong
47c1835a45 am 868c795d: am 0307acf9: Merge "docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293" into lmp-docs 
* commit '868c795dd253ff31999962f84299be27e4d5828f':
  docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293
 2015-04-07 18:51:22 +00:00
Quddus Chong
a0c887c67e docs: Fixed typo in Implementing In-app Billing guide. 
bug: 19961296

Change-Id: If170b58feb6d7160790591b540cdb91d7c23d6e5
 2015-04-07 11:48:30 -07:00
David Friedman
1adf4958e8 New build rule reflecting different masthead, side nav for NDK minisite. 
Change-Id: I81b50cca405d907cf8a6514356b92e38b6808d3c
 2015-04-07 11:45:54 -07:00
Joe Fernandez
5861b5b618 am 911e4c50: am ab882856: am b1a6bd01: docs: April 2015 Android Dashboard update 
* commit '911e4c508ca3061bbf8d13e78350636f1b3ef52e':
  docs: April 2015 Android Dashboard update
 2015-04-07 18:41:32 +00:00
Quddus Chong
868c795dd2 am 0307acf9: Merge "docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293" into lmp-docs 
* commit '0307acf90773a16faa6b33dad12b14b95708a3cc':
  docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293
 2015-04-07 18:40:32 +00:00