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

6550 Commits

Author SHA1 Message Date
Robert Ly
0932eb35ec am 8028e4a0: am 1f14c107: am 0689fad8: Merge "docs: fix some notification code for wear stacks" into klp-docs 
* commit '8028e4a063b49aadfb08fab012d2388a7466a9a1':
  docs: fix some notification code for wear stacks
 2014-05-10 02:53:28 +00:00
Robert Ly
8028e4a063 am 1f14c107: am 0689fad8: Merge "docs: fix some notification code for wear stacks" into klp-docs 
* commit '1f14c107f825a9a309b396f65fbfc92a4c57eb3d':
  docs: fix some notification code for wear stacks
 2014-05-10 02:48:57 +00:00
Robert Ly
0689fad8cc Merge "docs: fix some notification code for wear stacks" into klp-docs 2014-05-10 02:40:40 +00:00
Robert Ly
37cb8d7530 docs: fix some notification code for wear stacks 
Change-Id: Iea6b444480b161ab08a9ba02dbabb22773862cf0
 2014-05-09 17:01:21 -07:00
Andrew Solovay
99aa0c17d2 am 5119f6e6: am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs 
* commit '5119f6e6db1cd7254ee71537a56bd133eb7e6a09':
  doc: Documented how to set notification priority.
 2014-05-09 21:15:10 +00:00
Andrew Solovay
5119f6e6db am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs 
* commit '3f22f22aab7d641b9d56e57a2ceec6614e09a5d8':
  doc: Documented how to set notification priority.
 2014-05-09 21:10:28 +00:00
Andrew Solovay
bff632c8ff Merge "doc: Documented how to set notification priority." into klp-docs 2014-05-09 21:01:08 +00:00
Eino-Ville Talvala
8bfb3513ee am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature. 
* commit '1caeb10a7a288d937195d925c52f441f454cbc9a':
  DO NOT MERGE: Add android.hardware.camera.external feature.
 2014-05-09 15:47:58 +00:00
Andrew Solovay
3701cbef0f doc: Documented how to set notification priority. 
This is related to change http://ag/459520, where I added info about appropriate
priority constants for setPriority(int)

Doc is staged to:

http://asolovay.mtv:8998/guide/topics/ui/notifiers/notifications.html#Priority

Bug: 13514649
Change-Id: I792e2f02614c88fbcfe1b0714a9c10da27eb6c37
 2014-05-08 17:58:30 -07:00
Eino-Ville Talvala
1caeb10a7a DO NOT MERGE: Add android.hardware.camera.external feature. 
This feature will be listed by Android devices that allow for an
external camera to be connected to it. Such camera devices may
not always be available or connected.

Also clarify that android.hardware.camera.any also encompasses
devices that list android.hardware.camera.external.

Change-Id: I57497758877e4286c1f0116961731d483b56808f
 2014-05-08 21:47:36 +00:00
Scott Main
b5342f965b am fe997295: am 01dc133b: am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed. 
* commit 'fe99729539c8e51ce13c88dd9c999a458032356a':
  fix code error. The data type was wrong, but it's actually not needed.
 2014-05-06 23:57:08 +00:00
Scott Main
fe99729539 am 01dc133b: am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed. 
* commit '01dc133b35021878b9c7c45d862cacb2b7645a4d':
  fix code error. The data type was wrong, but it's actually not needed.
 2014-05-06 23:53:22 +00:00
Scott Main
f1bc39b8ae fix code error. 
The data type was wrong, but it's actually not needed.

Change-Id: I50275fd16c72de42b75f24be6192ca974bd67488
 2014-05-06 16:34:30 -07:00
David Friedman
4146d546a4 Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory." into klp-docs 2014-05-05 17:05:22 +00:00
Scott Main
76df9c3485 am db94d2d1: am 1d7ea94d: am 937db487: Merge "update dashboard for 5/1/14" into klp-docs 
* commit 'db94d2d1e5fe1a357f53357429e4035bc08ee5d0':
  update dashboard for 5/1/14
 2014-05-02 18:48:07 +00:00
Scott Main
db94d2d1e5 am 1d7ea94d: am 937db487: Merge "update dashboard for 5/1/14" into klp-docs 
* commit '1d7ea94d72808162e70e55a531563cb011ac6f30':
  update dashboard for 5/1/14
 2014-05-02 18:44:43 +00:00
Scott Main
1d7ea94d72 am 937db487: Merge "update dashboard for 5/1/14" into klp-docs 
* commit '937db487443171b75f321190be591c8f3d5f74bb':
  update dashboard for 5/1/14
 2014-05-02 18:40:33 +00:00
Scott Main
937db48744 Merge "update dashboard for 5/1/14" into klp-docs 2014-05-02 18:36:42 +00:00
Scott Main
7cb2bf1bf3 am 3525b3c7: am 44e7ed77: am 5584601c: add intel USB vendor ID bug: 13982556 
* commit '3525b3c7e9d7d4fd2c60d88f6e3b92c30ec68558':
  add intel USB vendor ID bug: 13982556
 2014-05-02 18:18:34 +00:00
Scott Main
3525b3c7e9 am 44e7ed77: am 5584601c: add intel USB vendor ID bug: 13982556 
* commit '44e7ed77f16f6773d950e8b7a4fadb526b4c7a8a':
  add intel USB vendor ID bug: 13982556
 2014-05-02 18:13:11 +00:00
Scott Main
44e7ed77f1 am 5584601c: add intel USB vendor ID bug: 13982556 
* commit '5584601c8ade068f403808a3c2b5e9c611134ab2':
  add intel USB vendor ID bug: 13982556
 2014-05-02 18:10:30 +00:00
Scott Main
5584601c8a add intel USB vendor ID 
bug: 13982556

Change-Id: I34fae455f0eee04088bed3f79243776321c745cf
 2014-05-02 10:50:50 -07:00
Scott Main
156bcfcf93 update dashboard for 5/1/14 
Change-Id: I874f060089ecc701c23b91adc52d19d50fd51014
 2014-05-02 09:45:44 -07:00
Robert Ly
0c88867c7c am 01352613: am a9dfeaa9: am 7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs 
* commit '0135261361e21f3585b21ff4498b05bd6d1bf88d':
  Revert "update wear stack notifications to coincide with devbyte code"
 2014-05-01 17:51:23 +00:00
Robert Ly
edbabd2806 am e3135059: am 9f129366: am 80b2cbbe: Revert "docs: fix method name" 
* commit 'e3135059dee534c9d93cfb0c6e4fa7574eff1049':
  Revert "docs: fix method name"
 2014-05-01 17:51:20 +00:00
Robert Ly
0135261361 am a9dfeaa9: am 7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs 
* commit 'a9dfeaa94083c322fb95d8bd2ac765521ae8bceb':
  Revert "update wear stack notifications to coincide with devbyte code"
 2014-05-01 17:47:23 +00:00
Robert Ly
e3135059de am 9f129366: am 80b2cbbe: Revert "docs: fix method name" 
* commit '9f129366e6963aacb00893e0be1892003bc0b39d':
  Revert "docs: fix method name"
 2014-05-01 17:47:19 +00:00
Robert Ly
a9dfeaa940 am 7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs 
* commit '7fadcf84244172004568c4107083d415f1285b75':
  Revert "update wear stack notifications to coincide with devbyte code"
 2014-05-01 17:44:16 +00:00
Robert Ly
9f129366e6 am 80b2cbbe: Revert "docs: fix method name" 
* commit '80b2cbbe6c134ff415072f29eaa7392c1ebb0c52':
  Revert "docs: fix method name"
 2014-05-01 17:44:13 +00:00
Robert Ly
7fadcf8424 Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs 2014-05-01 17:41:39 +00:00
Robert Ly
80b2cbbe6c Revert "docs: fix method name" 
This reverts commit b39ce1b6c1dc34b3c99d312bc3f02dcc9efbbaed.

Change-Id: Ib7ed4fac07301dd5640fc41348af0d49ad9ef518
 2014-05-01 17:40:33 +00:00
Robert Ly
5f1192c9a3 Revert "update wear stack notifications to coincide with devbyte code" 
This reverts commit b8e3f209af70a7707be75d866b142dc1fccc8d5f.

Change-Id: Iba48e235b23cb0b6ce191809e6eb87395c6d1766
 2014-05-01 17:40:16 +00:00
Robert Ly
f8df90fd6a am 007fad0d: am 6b7f3936: am b39ce1b6: docs: fix method name 
* commit '007fad0dbd3f8bd3a8b7323a4587eab954093f27':
  docs: fix method name
 2014-05-01 16:02:16 +00:00
Robert Ly
007fad0dbd am 6b7f3936: am b39ce1b6: docs: fix method name 
* commit '6b7f3936ede97bf29ab5d606c172ff2be7bf9160':
  docs: fix method name
 2014-05-01 15:56:58 +00:00
Robert Ly
6b7f3936ed am b39ce1b6: docs: fix method name 
* commit 'b39ce1b6c1dc34b3c99d312bc3f02dcc9efbbaed':
  docs: fix method name
 2014-05-01 15:53:03 +00:00
Robert Ly
b39ce1b6c1 docs: fix method name 
Change-Id: If7efbc891eb8f1403bd167ae21d17a2847b257cc
 2014-05-01 08:47:14 -07:00
Robert Ly
f05bef95fb am b76f7b35: am 8873025b: am f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs 
* commit 'b76f7b35db0040591492f026d0dc17678141b6cf':
  update wear stack notifications to coincide with devbyte code
 2014-05-01 09:42:08 +00:00
Robert Ly
b76f7b35db am 8873025b: am f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs 
* commit '8873025b2a52ca1ecccfaa9840e82681e17900d4':
  update wear stack notifications to coincide with devbyte code
 2014-05-01 09:37:01 +00:00
Robert Ly
8873025b2a am f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs 
* commit 'f26a71003de069355931eab340433ba8345ba3f7':
  update wear stack notifications to coincide with devbyte code
 2014-05-01 08:22:05 +00:00
Robert Ly
f26a71003d Merge "update wear stack notifications to coincide with devbyte code" into klp-docs 2014-05-01 07:27:23 +00:00
Robert Ly
b8e3f209af update wear stack notifications to coincide with devbyte code 
Change-Id: I4ccfc39eb47c938b9c1e9ba9309aaba54319f53b
 2014-05-01 00:23:42 -07:00
Ricardo Cervera
6824e4e351 am 8bef5ea7: am 27515952: am ba333f2f: docs: Added release notes for Android Studio 0.5.2 
* commit '8bef5ea70161586287ec06e9bd74b30604cd3f2c':
  docs: Added release notes for Android Studio 0.5.2
 2014-04-30 22:40:00 +00:00
Ricardo Cervera
8bef5ea701 am 27515952: am ba333f2f: docs: Added release notes for Android Studio 0.5.2 
* commit '27515952f54a8c98eaec694ce74c3b9d9b152746':
  docs: Added release notes for Android Studio 0.5.2
 2014-04-30 22:03:40 +00:00
Ricardo Cervera
27515952f5 am ba333f2f: docs: Added release notes for Android Studio 0.5.2 
* commit 'ba333f2f4c2ca5325b4df1b131c6c26a18beb877':
  docs: Added release notes for Android Studio 0.5.2
 2014-04-30 21:59:19 +00:00
Ricardo Cervera
ba333f2f4c docs: Added release notes for Android Studio 0.5.2 
Change-Id: Ia364620d0ab14648b4db523890c529a0dc5b940d
 2014-04-30 14:41:44 -07:00
David Friedman
86318b7daa am 0c18705b: am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs 
* commit '0c18705bf10e1e04fbb2b2afaf5f9537764148a5':
  Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
 2014-04-28 23:07:40 +00:00
David Friedman
0c18705bf1 am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs 
* commit '3fef8e60668bb955763367ac17c1195e46b3078c':
  Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
 2014-04-28 23:03:25 +00:00
David Friedman
3fef8e6066 am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs 
* commit '1053b2c5d43ca58e9f0fe611770b278e88c76fa3':
  Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
 2014-04-28 21:56:07 +00:00
David Friedman
1053b2c5d4 Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs 2014-04-28 21:52:45 +00:00
Vince Harron
165b965edb am 4f50911a: am e9a4e9de: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that 
* commit '4f50911aa18f9d4650c6721456dd05ac499fcefd':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
 2014-04-25 23:25:11 +00:00