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

164033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
Joe Fernandez
038fe2deab am 19a57761: am 95c39774: docs: Small fix for Android Dashboard 
* commit '19a57761b4aec17c907d271e58ae4c20da40a039':
  docs: Small fix for Android Dashboard
 2015-04-07 18:40:22 +00:00
Quddus Chong
0307acf907 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 2015-04-07 18:31:45 +00:00
Joe Fernandez
911e4c508c am ab882856: am b1a6bd01: docs: April 2015 Android Dashboard update 
* commit 'ab8828564c5a121ce341710b362bb8f090995885':
  docs: April 2015 Android Dashboard update
 2015-04-07 18:31:12 +00:00
Joe Fernandez
19a57761b4 am 95c39774: docs: Small fix for Android Dashboard 
* commit '95c39774d245921be04b2a6f0f221f86545f8ac6':
  docs: Small fix for Android Dashboard
 2015-04-07 18:31:03 +00:00
Quddus Chong
31864381d3 docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. 
bug: 20077293

Change-Id: Ie1148e751b9d22e5e7a1abad819c19a4c0b9c6b7
 2015-04-07 11:30:09 -07:00
Joe Fernandez
ab8828564c am b1a6bd01: docs: April 2015 Android Dashboard update 
* commit 'b1a6bd01bc278f4f6c6a656925e37b998d93f143':
  docs: April 2015 Android Dashboard update
 2015-04-07 18:18:55 +00:00
Joe Fernandez
95c39774d2 docs: Small fix for Android Dashboard 
Change-Id: I33f3b8b4a7b7abdf16bb5fc4964c51f2809f6c3d
 2015-04-07 11:18:00 -07:00
Joe Fernandez
b1a6bd01bc docs: April 2015 Android Dashboard update 
Change-Id: I7ddd526209cb41cc8944ea5bd99a32021ab343fa
 2015-04-07 11:07:53 -07:00
Matthew Williams
20baa9d944 am 28358eae: Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test." into lmp-mr1-dev 
* commit '28358eaed2e1858fcba7991cbd7199a25d160471':
  Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test.
 2015-04-06 20:30:29 +00:00
Matthew Williams
28358eaed2 Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test." into lmp-mr1-dev 2015-04-06 20:22:22 +00:00
Quddus Chong
0d53fcadce am d642f829: am 54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class. 
* commit 'd642f8297529b3df96d0f822b062cb8354c90c18':
  docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
 2015-04-04 00:39:10 +00:00
Quddus Chong
d642f82975 am 54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class. 
* commit '54dee349976eaafe7df3a2bb48e9fce2b964a7f0':
  docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
 2015-04-04 00:29:11 +00:00
Quddus Chong
54dee34997 docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class. 
Change-Id: I0e2a49b639101a7607e8e90cf830d9d449ad6328
 2015-04-03 17:17:04 -07:00
Luan Nguyen
9b9bda5623 am b7647017: am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs 
* commit 'b7647017ddf8f57c7333b5ae3e459639ef0a6a7c':
  docs: Remove note about inablity to submit apps to Google Play.
 2015-04-03 22:01:12 +00:00
Luan Nguyen
b7647017dd am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs 
* commit 'eeb42053df94de88674caf904a96ec987d55e668':
  docs: Remove note about inablity to submit apps to Google Play.
 2015-04-03 21:49:32 +00:00
Luan Nguyen
eeb42053df Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs 2015-04-03 21:40:53 +00:00
Quddus Chong
d9e2c05dbf am 0c3b894c: am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs 
* commit '0c3b894c2c18b226f58af98569f21bcb4a593b14':
  docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
 2015-04-03 21:08:49 +00:00
Quddus Chong
0c3b894c2c am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs 
* commit '91070dc419b9b60843094ecc02f95b38c784208a':
  docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
 2015-04-03 20:57:44 +00:00
Quddus Chong
91070dc419 Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs 2015-04-03 20:47:46 +00:00
Wale Ogunwale
4a7967ad9a am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev 
* commit 'f61aee97adf4e543e82289511c6127bcfa53151c':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display
 2015-04-03 00:15:26 +00:00
Wale Ogunwale
f61aee97ad Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev 2015-04-03 00:07:04 +00:00
Wale Ogunwale
70e12aa123 [DO NOT MERGE] Fixed NPE when trying to animate a window without display 
In some cases it is possible for the AppToken.allAppWindows list to
get out of sync with the list of windows known to WMS if the client
doesn't call Session.remove(Window). This can lead to an NPE when
the animation threads runs and the display for the window has been
removed.

Bug: 19972099
Change-Id: Ifdf9ff2364b96757bba0539394c4a682f64577c9
 2015-04-02 16:38:52 -07:00
Andrew Solovay
589a272e97 am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 
* commit 'f2ff12ba00ba7c290bc15ea28fdcf3c6d6d1029a':
  docs: Fixed formatting in android:documentLaunchMode syntax section
 2015-04-02 19:56:41 +00:00
Yuichi Araki
61ce6c9b70 am 776cf41d: Fix a broken link in javadoc 
* commit '776cf41d7c8f239d20397886f2120407396cfc87':
  Fix a broken link in javadoc
 2015-04-02 19:56:35 +00:00
Andrew Solovay
f2ff12ba00 Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs 2015-04-02 19:25:25 +00:00
Yuichi Araki
776cf41d7c Fix a broken link in javadoc 
Bug: 19856130

Change-Id: I0456e951f8bed36e3a62ddfd882f9c2d2bef9627
 2015-04-02 04:03:07 +00:00
Eric Gilmore
f2204720ea am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs 
* commit 'b2b93762b8165ee47f49765816fc7ba0428c371c':
  Changing wording to reflect c2dm shutdown.
 2015-04-02 00:59:34 +00:00
Eric Gilmore
b2b93762b8 Merge "Changing wording to reflect c2dm shutdown." into lmp-docs 2015-04-01 23:13:26 +00:00
Quddus Chong
7639e730c8 docs: Added training docs for UI testing frameworks (Espresso, UI Automator). 
Change-Id: I421a29c90a0763665fd93aa85e86d2c6f33ad894
 2015-04-01 15:40:45 -07:00
Scott Rowe
a03245a343 am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs 
* commit '4fc3d3ff404c777e07616b704c68176d9060c4e4':
  docs: Building Live TV Apps
 2015-04-01 21:25:53 +00:00
Scott Rowe
4fc3d3ff40 Merge "docs: Building Live TV Apps" into lmp-docs 2015-04-01 21:05:42 +00:00