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

160391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Gilmore
636a39babb am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit 'e95fa2649b62a3fbccd096b43925a17c6ff03228':
  Re-fixing link, and removing trailing white space.
 2015-03-05 23:04:27 +00:00
Eric Gilmore
e95fa2649b am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit 'e17b0a14ccc427bff386517537fcf23e00a087d4':
  Re-fixing link, and removing trailing white space.
 2015-03-05 22:50:16 +00:00
Eric Gilmore
e17b0a14cc am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs 
* commit '87499b275bc7a8d4a12a3134646769a5c6c34829':
  Re-fixing link, and removing trailing white space.
 2015-03-05 22:34:58 +00:00
Eric Gilmore
87499b275b Merge "Re-fixing link, and removing trailing white space." into lmp-docs 2015-03-05 22:00:22 +00:00
Eric Gilmore
08134e649d Re-fixing link, and removing trailing white space. 
Change-Id: Ic6cef9862424d5581cf0ad5b8366c7033a9fdd93
 2015-03-05 13:39:21 -08:00
Rich Slogar
bc669e3f55 am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix 
* commit 'dad1cbebfabf421efc90d366d9c4fd67becf930f':
  docs: sdk tools date fix
 2015-03-05 19:46:12 +00:00
Rich Slogar
dad1cbebfa am 9f485e97: am 4aba69a8: docs: sdk tools date fix 
* commit '9f485e971e06dad399dd70712787f4c30da9515e':
  docs: sdk tools date fix
 2015-03-05 19:39:47 +00:00
Rich Slogar
9f485e971e am 4aba69a8: docs: sdk tools date fix 
* commit '4aba69a8a7f58541ce76429252dd0c9650b40f35':
  docs: sdk tools date fix
 2015-03-05 19:33:56 +00:00
Rich Slogar
4aba69a8a7 docs: sdk tools date fix 
Change-Id: Ieb0a5193a5bbf7efd1e5852be4b0db421d08db14
 2015-03-05 11:24:45 -08:00
smain@google.com
8b2be54a62 am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs 
* commit '182059f875bedc778a3ce9710a4f634197d1e959':
  add tags for wakelock and other API names
 2015-03-05 06:10:54 +00:00
smain@google.com
182059f875 am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs 
* commit 'ca10a4352f07652d82da59f6c1630e8607d82dda':
  add tags for wakelock and other API names
 2015-03-05 01:12:15 +00:00
smain@google.com
ca10a4352f am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs 
* commit 'f4bbec09a4c3795bc72d6a95aab3488c6c49ce6e':
  add tags for wakelock and other API names
 2015-03-05 00:59:24 +00:00
smain@google.com
f4bbec09a4 Merge "add tags for wakelock and other API names" into lmp-docs 2015-03-05 00:49:49 +00:00
Eric Gilmore
498691d264 am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs 
* commit '62777b189dc31c250c4ae06915aae0a337950e1c':
  Fixing broken link per b/19503824.
 2015-03-05 00:49:21 +00:00
Bart Sears
4eedccebb7 Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev 2015-03-05 00:35:08 +00:00
John Spurlock
c974ac11f8 MediaProjectionPermissionActivity: Fix NPE. 
Avoid dismissing a null dialog.

Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit 3d332f4e67a484abe597576bf329d89655afe720)
 2015-03-04 18:58:18 +00:00
Craig Mautner
bbd2ac5adf Merge commit '83a63bac' into manualmerge 2015-03-04 10:10:34 -08:00
Eric Gilmore
62777b189d am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs 
* commit '5c30adfdb6ef4b004ef0b88006660598f40eb6f5':
  Fixing broken link per b/19503824.
 2015-03-04 17:53:31 +00:00
Eric Gilmore
5c30adfdb6 am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs 
* commit '22d1c1ce1dc3c84d7517ba64a5d07b5946e49514':
  Fixing broken link per b/19503824.
 2015-03-04 17:47:01 +00:00
Eric Gilmore
22d1c1ce1d Merge "Fixing broken link per b/19503824." into lmp-docs 2015-03-04 17:40:16 +00:00
Craig Mautner
83a63bac5d am 8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev 
* commit '8fa394fa8c4eb3ca832dac36baf5645a40d449f1':
  Do not make ActivityContainer available to apps. DO NOT MERGE
 2015-03-04 16:15:35 +00:00
Craig Mautner
8fa394fa8c Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev 2015-03-04 16:09:29 +00:00
Eric Gilmore
00eefca280 Fixing broken link per b/19503824. 
Change-Id: I4140decb254cf9c9f0eadfce1a3897c240d640d9
 2015-03-03 12:10:19 -08:00
Joe Fernandez
246a3a4a79 am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit '14fcef3bf02f46a057676d7a6d755daee735c4ea':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:29:33 +00:00
Joe Fernandez
14fcef3bf0 am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit 'c4418980a083c1cd26b789297f084e03036b5fdd':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:22:42 +00:00
Joe Fernandez
c4418980a0 am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit 'a31378dc49868412a2e632bcc46a44877a9b397f':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:15:29 +00:00
Joe Fernandez
a31378dc49 Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 2015-03-03 06:11:50 +00:00
Rich Slogar
a81ed3cd0f docs: support library updates for sdk 22 
Change-Id: I4cb14e6c941652fe02d98ffac32451eea6f4576c
 2015-03-02 22:07:07 -08:00
Rich Slogar
e0ce0f2cc2 docs: platform revisions 5.1 
Change-Id: Iabbd8617e3d334228fec94254160f2e43cdd22c6
 2015-03-02 18:55:44 -08:00
Joe Fernandez
546433328d Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev 2015-03-03 02:03:45 +00:00
Joe Fernandez
2ba57444e8 Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev 2015-03-03 01:42:41 +00:00
Rich Slogar
3f3f842cc0 am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs 
* commit 'd54fe112a24ec3a692d35a4ccf1f73fa5caaaf5e':
  docs: sdk tools 24.1 update
 2015-03-03 01:27:07 +00:00
Andrew Solovay
27f5337841 Minor typo fixes in managed profile Javadoc reference pages. 
See first comment for stage location.

bug: 19389235
Change-Id: I2e1d5169a77e3f4000e73f08d493953ce4eee78c
 2015-03-02 17:22:18 -08:00
Rich Slogar
d54fe112a2 am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs 
* commit '2cbda290f66b5a17d3542ada26f7e91b3893f72d':
  docs: sdk tools 24.1 update
 2015-03-03 01:20:33 +00:00
Rich Slogar
2cbda290f6 am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs 
* commit '69b58e74e087159ed5950632b4ab3738a841c633':
  docs: sdk tools 24.1 update
 2015-03-03 01:13:36 +00:00
Rich Slogar
69b58e74e0 Merge "docs: sdk tools 24.1 update" into lmp-docs 2015-03-03 01:07:44 +00:00
Joe Fernandez
45ef73b4e9 Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev 2015-03-03 01:02:55 +00:00
Joe Fernandez
5c6476aa50 Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev 2015-03-03 00:56:43 +00:00
Joe Fernandez
2c25106ab4 docs: Add Android 5.1 to the uses-sdk manifest docs 
Change-Id: Idf9962af4250e68ed885571a57b9a51a40f74267
 2015-03-02 16:43:14 -08:00
Joe Fernandez
3d44c0faca docs: update Android docs build to include API 22, Android 5.1 
Change-Id: If41c1a142db0f2df439afaa9cf5d0fe0ca47d2c0
 2015-03-02 15:53:38 -08:00
Joe Fernandez
50d0953a86 docs: Android 5.1 API Release notes (Lollipop MR1) 
Change-Id: I47f59ade26086b8368d8b395f92992edc27510d0
 2015-03-02 15:35:07 -08:00
Shishir Agrawal
bcced5b834 Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev 2015-03-02 22:32:17 +00:00
Deepanshu Gupta
f2c1c09683 am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev 
* commit '6ed9b75a45ec4bc62b4a0fac2c86479d61918863':
  Correct PorterDuff filters.
 2015-03-02 19:52:33 +00:00
Deepanshu Gupta
2022b0ffdd am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev 
* commit 'd003e8133167f2b6741f8eb925fdc9f77c2800a5':
  Fix codestyle for switch statements.
 2015-03-02 19:52:29 +00:00
Deepanshu Gupta
aff0ec93f2 am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 
* commit '81449b2c4a63392bff22d77f331f4db52011884b':
  Better error msg for StateList/Hexadecimal Color.
 2015-03-02 19:52:25 +00:00
Deepanshu Gupta
6ed9b75a45 am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev 
* commit '72d75f8d9fb46c04f0458e1f36b064e2b8c3de71':
  Correct PorterDuff filters.
 2015-03-02 19:44:51 +00:00
Deepanshu Gupta
d003e81331 am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev 
* commit '369ad57b00f1c94c80f0f80ef2e7063a23a94a84':
  Fix codestyle for switch statements.
 2015-03-02 19:44:47 +00:00
Deepanshu Gupta
81449b2c4a am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 
* commit '10d620ff2c4770e926b693e833105e8dbbd5fa86':
  Better error msg for StateList/Hexadecimal Color.
 2015-03-02 19:44:43 +00:00
Deepanshu Gupta
72d75f8d9f Merge "Correct PorterDuff filters." into lmp-dev 2015-03-02 19:40:14 +00:00
Deepanshu Gupta
369ad57b00 Merge "Fix codestyle for switch statements." into lmp-dev 2015-03-02 19:37:32 +00:00