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

10708 Commits

Author SHA1 Message Date
Luan Nguyen
d0dc4c1c1f am a3bfa390: am 7bfd2d9e: am e44643b1: am 33677f0c: am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs 
* commit 'a3bfa3908f9bdf5cb3603968fb32b81d92824fa7':
  docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs.
 2015-06-09 23:40:40 +00:00
Luan Nguyen
a3bfa3908f am 7bfd2d9e: am e44643b1: am 33677f0c: am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs 
* commit '7bfd2d9e7487a5c68025d9abee00aa138e9702b4':
  docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs.
 2015-06-09 23:27:49 +00:00
Luan Nguyen
e44643b15c am 33677f0c: am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs 
* commit '33677f0c1050ae73447136ec3e88d1140a53da4b':
  docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs.
 2015-06-09 23:10:21 +00:00
Luan Nguyen
33677f0c10 am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs 
* commit 'd8b632fbce276ca0e91bf2b251aff266869e1291':
  docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs.
 2015-06-09 15:01:16 +00:00
Jim Miller
78b12521f3 am 0c9032ac: am 8caea094: am 800ebfc1: Merge "Update and cleanup FingerprintManager API to new spec" into mnc-dev 
* commit '0c9032acaec1c0bba8f8e6e22892d463246e71b0':
  Update and cleanup FingerprintManager API to new spec
 2015-06-09 13:16:35 +00:00
Jim Miller
0c9032acae am 8caea094: am 800ebfc1: Merge "Update and cleanup FingerprintManager API to new spec" into mnc-dev 
* commit '8caea094031b1b924f98cd73cc9b4fd68c3c9b0c':
  Update and cleanup FingerprintManager API to new spec
 2015-06-09 13:01:42 +00:00
Jim Miller
f501b58de8 Update and cleanup FingerprintManager API to new spec 
Fixes bug 21040383

Change-Id: Ib97d486535869814d5b449cccb31670e8f412552
 2015-06-08 16:36:29 -07:00
Joe Fernandez
a310f88e47 am a08a143e: am 606e65a8: am c37d84ac: am edaf008c: am b0ebbc86: Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docs 
* commit 'a08a143ea4b02d410455a9440d038db644c5f72d':
  Revert "docs: studio 1.2.2.0 updates"
 2015-06-06 00:45:54 +00:00
Rich Slogar
840b3d8ca0 am f60c1d3a: am ad7fc997: am 3a2a3104: am 34bebb04: am 16293cf5: Merge "docs: studio 1.2.2.0 updates" into mnc-preview-docs 
* commit 'f60c1d3a49d012afb69b981f0531f6fd5b1b92b5':
  docs: studio 1.2.2.0 updates
 2015-06-06 00:45:34 +00:00
Luan Nguyen
124259e289 am 6f2c3081: am 2c11981c: am 1877a32f: am 26c3dd5b: am ef7458ed: Merge "docs: Add DevByte embedded video." into mnc-preview-docs 
* commit '6f2c3081b48e28b72fd6faa4912c77a1f3f69ff4':
  docs: Add DevByte embedded video.
 2015-06-06 00:45:28 +00:00
Joe Fernandez
a08a143ea4 am 606e65a8: am c37d84ac: am edaf008c: am b0ebbc86: Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docs 
* commit '606e65a87db3ed16f7f6a43bf68971a27710f9f8':
  Revert "docs: studio 1.2.2.0 updates"
 2015-06-06 00:30:15 +00:00
Rich Slogar
f60c1d3a49 am ad7fc997: am 3a2a3104: am 34bebb04: am 16293cf5: Merge "docs: studio 1.2.2.0 updates" into mnc-preview-docs 
* commit 'ad7fc99774be7bab9e10c6858ad54d0767814935':
  docs: studio 1.2.2.0 updates
 2015-06-06 00:29:59 +00:00
Luan Nguyen
6f2c3081b4 am 2c11981c: am 1877a32f: am 26c3dd5b: am ef7458ed: Merge "docs: Add DevByte embedded video." into mnc-preview-docs 
* commit '2c11981cae52e1e377084e3bc5150bdc83da0345':
  docs: Add DevByte embedded video.
 2015-06-06 00:29:55 +00:00
Elliott Hughes
f2ac58bc6d am bdbd41c4: am 2f61e6ef: am 3a5c054a: Merge "Fix debugging-log documentation errors." 
* commit 'bdbd41c4a0f499948d0b70ff0bda311714d8d4a3':
  Fix debugging-log documentation errors.
 2015-06-06 00:29:05 +00:00
Elliott Hughes
bdbd41c4a0 am 2f61e6ef: am 3a5c054a: Merge "Fix debugging-log documentation errors." 
* commit '2f61e6ef97b470d264dcebce4643a451a461cf2f':
  Fix debugging-log documentation errors.
 2015-06-06 00:22:42 +00:00
Joe Fernandez
c37d84ac08 am edaf008c: am b0ebbc86: Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docs 
* commit 'edaf008c5e594d140aa430965a779f0b35280730':
  Revert "docs: studio 1.2.2.0 updates"
 2015-06-06 00:06:25 +00:00
Rich Slogar
3a2a310429 am 34bebb04: am 16293cf5: Merge "docs: studio 1.2.2.0 updates" into mnc-preview-docs 
* commit '34bebb044062ebb783705c420b8a2e6b38d6af04':
  docs: studio 1.2.2.0 updates
 2015-06-06 00:05:44 +00:00
Luan Nguyen
1877a32f21 am 26c3dd5b: am ef7458ed: Merge "docs: Add DevByte embedded video." into mnc-preview-docs 
* commit '26c3dd5b0302ea6dcb353be2df8cfaf5f8ca5622':
  docs: Add DevByte embedded video.
 2015-06-06 00:05:05 +00:00
Elliott Hughes
771f2d5428 Fix debugging-log documentation errors. 
ART has never supported log.redirect-stdio.

Don't imply that System.out and System.err go to /dev/null.

Bug: http://b/18092307
Bug: https://code.google.com/p/android/issues/detail?id=165602
Bug: https://code.google.com/p/android/issues/detail?id=62555
Change-Id: If5304a129e8941865211deb86766531925255796
 2015-06-05 15:44:51 -07:00
Luan Nguyen
54fd7224fd docs: Fix WatchFace guide to no longer reference deprecated Time.java 
Also fix links to samples and reference docs.

bug: 20057886
Change-Id: I31aaad7066dabd05f1af8f7ff434ccb79f54357f
 2015-06-05 13:53:44 -07:00
John Reck
9c15f29bc2 am a34ec1cd: am a6ae6e2d: am 30ff6523: am 06ae68aa: am 902ec1c7: Merge "Fix framestats docs ordering" into mnc-preview-docs 
* commit 'a34ec1cdb87e5f3846a48a1b28859031fdd0ea20':
  Fix framestats docs ordering
 2015-06-05 02:56:01 +00:00
David Friedman
80dc54edbb am 2a135aaf: am 386df35c: am fe216bd2: am cae82287: am 6bffab80: Merge "Docs: Fixes several typos on Android Studio index.html page." into mnc-preview-docs 
* commit '2a135aaf157747ae8643de37d1d5a1ac6f7a708c':
  Docs: Fixes several typos on Android Studio index.html page.
 2015-06-05 02:55:55 +00:00
Dirk Dougherty
1fd86f499c am 1a404be8: am 86a490a2: am 4a08d6f0: am 392f5321: am 5c117ae1: Merge "Fix dependency specs for data binding." into mnc-preview-docs 
* commit '1a404be83a581b62153e84af782aaa181e773149':
  Fix dependency specs for data binding.
 2015-06-05 02:55:49 +00:00
Chris Craik
3b0433d665 am f7aa4bfe: am 1ca5cd21: am 44dc1667: am 78ab4c38: am 6042f351: Merge "Rework systrace analysis documentation" into mnc-preview-docs 
* commit 'f7aa4bfe341b14d47df7bca035bc5deef19c06db':
  Rework systrace analysis documentation
 2015-06-05 02:55:37 +00:00
Joe Fernandez
492bb7e781 am ed250c5f: am 59de628b: am eb837e8c: am ab1fb237: am 79106d1c: docs: Remove ADT-1 RMA form link 
* commit 'ed250c5f6b1ffd3ead235b48ba8dfc73de23fb7a':
  docs: Remove ADT-1 RMA form link
 2015-06-05 02:55:32 +00:00
John Reck
30ff6523a7 am 06ae68aa: am 902ec1c7: Merge "Fix framestats docs ordering" into mnc-preview-docs 
* commit '06ae68aac222e1ba06169c5125e0689a30d13b09':
  Fix framestats docs ordering
 2015-06-05 02:27:26 +00:00
David Friedman
fe216bd25b am cae82287: am 6bffab80: Merge "Docs: Fixes several typos on Android Studio index.html page." into mnc-preview-docs 
* commit 'cae82287c704c000d304fdd3447dd693e2801c14':
  Docs: Fixes several typos on Android Studio index.html page.
 2015-06-05 02:18:53 +00:00
Dirk Dougherty
4a08d6f042 am 392f5321: am 5c117ae1: Merge "Fix dependency specs for data binding." into mnc-preview-docs 
* commit '392f532104aeba2d395bdf940cc08a1247bd3de5':
  Fix dependency specs for data binding.
 2015-06-05 02:18:42 +00:00
Chris Craik
44dc1667eb am 78ab4c38: am 6042f351: Merge "Rework systrace analysis documentation" into mnc-preview-docs 
* commit '78ab4c3867af40b512d2e0c046abd5c8b040d05f':
  Rework systrace analysis documentation
 2015-06-05 02:18:29 +00:00
Joe Fernandez
eb837e8cf8 am ab1fb237: am 79106d1c: docs: Remove ADT-1 RMA form link 
* commit 'ab1fb23712c66286285ffdce2d1488c41565650f':
  docs: Remove ADT-1 RMA form link
 2015-06-05 02:18:23 +00:00
Joe Fernandez
edaf008c5e am b0ebbc86: Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docs 
* commit 'b0ebbc8625b9ca165c9cfa2ec0023c8fc1af61a8':
  Revert "docs: studio 1.2.2.0 updates"
 2015-06-04 17:37:24 +00:00
Joe Fernandez
b0ebbc8625 Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docs 2015-06-04 17:27:22 +00:00
Joe Fernandez
c9032b1472 Revert "docs: studio 1.2.2.0 updates" 
This reverts commit bda2bb39717accd08fe56f997b7a46e56f997c5d.

Change-Id: I734cce1d0fdccefa64577b7e0ba68f8afdbfb2d6
 2015-06-04 17:24:59 +00:00
Rich Slogar
34bebb0440 am 16293cf5: Merge "docs: studio 1.2.2.0 updates" into mnc-preview-docs 
* commit '16293cf5f493df47a51a75051cf29532ed9b69eb':
  docs: studio 1.2.2.0 updates
 2015-06-04 00:37:33 +00:00
Rich Slogar
16293cf5f4 Merge "docs: studio 1.2.2.0 updates" into mnc-preview-docs 2015-06-04 00:26:27 +00:00
Rich Slogar
bda2bb3971 docs: studio 1.2.2.0 updates 
Change-Id: I98ba501ec83ce0a4cbd45ec45460cd56aa78501f
 2015-06-03 17:14:01 -07:00
Luan Nguyen
26c3dd5b03 am ef7458ed: Merge "docs: Add DevByte embedded video." into mnc-preview-docs 
* commit 'ef7458ed67f5d80a6e6f860779465c63fe72e019':
  docs: Add DevByte embedded video.
 2015-06-03 22:59:05 +00:00
Luan Nguyen
ef7458ed67 Merge "docs: Add DevByte embedded video." into mnc-preview-docs 2015-06-03 22:48:24 +00:00
Luan Nguyen
d49e338a1b docs: Add DevByte embedded video. 
Change-Id: Ie8fbf7d56ad6820b4ece724a9d0ba53efa3fb2fd
 2015-06-03 12:41:30 -07:00
John Reck
06ae68aac2 am 902ec1c7: Merge "Fix framestats docs ordering" into mnc-preview-docs 
* commit '902ec1c7c660b46d7d643e5c1dd07021f073bfcd':
  Fix framestats docs ordering
 2015-06-03 15:58:58 +00:00
John Reck
902ec1c7c6 Merge "Fix framestats docs ordering" into mnc-preview-docs 2015-06-03 15:45:48 +00:00
David Friedman
cae82287c7 am 6bffab80: Merge "Docs: Fixes several typos on Android Studio index.html page." into mnc-preview-docs 
* commit '6bffab80889ff4283eac626249d082453a9db5c3':
  Docs: Fixes several typos on Android Studio index.html page.
 2015-06-03 01:12:54 +00:00
David Friedman
6bffab8088 Merge "Docs: Fixes several typos on Android Studio index.html page." into mnc-preview-docs 2015-06-03 01:02:38 +00:00
Dirk Dougherty
392f532104 am 5c117ae1: Merge "Fix dependency specs for data binding." into mnc-preview-docs 
* commit '5c117ae1fb27a5a94dd37489cdb7b16ddc10c2bf':
  Fix dependency specs for data binding.
 2015-06-02 23:41:40 +00:00
Dirk Dougherty
5c117ae1fb Merge "Fix dependency specs for data binding." into mnc-preview-docs 2015-06-02 23:29:36 +00:00
John Reck
5eff54f79f Fix framestats docs ordering 
Bug: 21560187

Fields were listed in a different order than they were printed

Change-Id: Icea4f442c5f43aef42e0701958249a4dca9e01f0
 2015-06-02 23:01:03 +00:00
Chris Craik
78ab4c3867 am 6042f351: Merge "Rework systrace analysis documentation" into mnc-preview-docs 
* commit '6042f351d21a67e6ebb30d1effce8264772c6a19':
  Rework systrace analysis documentation
 2015-06-02 22:01:19 +00:00
Chris Craik
6042f351d2 Merge "Rework systrace analysis documentation" into mnc-preview-docs 2015-06-02 21:51:31 +00:00
Joe Fernandez
ab1fb23712 am 79106d1c: docs: Remove ADT-1 RMA form link 
* commit '79106d1cdea70d80a8e75655fa94cf794d0e91e0':
  docs: Remove ADT-1 RMA form link
 2015-06-02 21:09:50 +00:00
Dirk Dougherty
bcab182714 Fix dependency specs for data binding. 
Change-Id: I61c52d78601b977cdb991697139fd3531d4f0285
 2015-06-02 14:09:09 -07:00