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

157025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
cd8442d4e8 am 2bf92530: Merge "First commit of split-select tool" into lmp-mr1-dev 
* commit '2bf92530ee600088fac4e72d04a1f70debf28d2b':
  First commit of split-select tool
 2014-10-23 19:47:22 +00:00
John Reck
ebcfd24b8f am 68335df6: Merge "Fix damage bug" into lmp-mr1-dev 
* commit '68335df6e6134c919f8575aa52e11872642848ad':
  Fix damage bug
 2014-10-23 19:47:18 +00:00
Adam Lesinski
2bf92530ee Merge "First commit of split-select tool" into lmp-mr1-dev 2014-10-23 17:54:47 +00:00
Adam Lesinski
40e8eefbed First commit of split-select tool 
This tool emits a set of rules as JSON for when a Split APK
should match a target device.

Change-Id: I8bfbdfbdb51efcfc645889dd03e1961f16e39645
 2014-10-23 10:39:31 -07:00
John Reck
68335df6e6 Merge "Fix damage bug" into lmp-mr1-dev 2014-10-23 16:45:27 +00:00
Joe Fernandez
8fff0a24bc am f6e29739: am 3bd3a9c1: am 7c2bfa2e: Merge "docs: Add Wear App Quality checklist" into lmp-dev 
* commit 'f6e297398ba23ce7d26cf2e0efaf0d8a2230fe1c':
  docs: Add Wear App Quality checklist
 2014-10-23 09:20:05 +00:00
Trevor Johns
682d3eddaf am 3ee2aa0f: am 5111993f: am fdb02fcf: Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev 
* commit '3ee2aa0fa309a0f8638bd6d13180f42ac91463b0':
  Docs: Update /samples/new/index.html for Clockwork Beryl release
 2014-10-23 09:20:00 +00:00
Joe Fernandez
44723da8d4 am e562ce35: am e30fdb59: am 16350261: Merge "docs: Add article describing Location API for Android Wear." into lmp-dev 
* commit 'e562ce35c957ed6717f4f26347485fbb696487c5':
  docs: Add article describing Location API for Android Wear.
 2014-10-23 09:19:56 +00:00
Joe Fernandez
9d98894a8d am 3f16106c: am ac0e00db: am eaee4693: Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev 
* commit '3f16106c519ca8e630cd05f0d245023403de1773':
  docs:Build tools revisions 21.01 and 21.02
 2014-10-23 09:19:51 +00:00
Eric Rowe
868878bd91 am 46ca296c: am d2983ced: am 34766d9c: Merge "Add delay in ping connectivity test retry" into lmp-dev 
* commit '46ca296c533bb6dd5939a2e6ad72f8c7dd8a0c82':
  Add delay in ping connectivity test retry
 2014-10-23 09:19:46 +00:00
smain@google.com
5c889e369c am 0c57361f: am 3e2502cb: am 32c820fa: update android workplace screenshot bug: 18038081 
* commit '0c57361f3e1a35816ca829b63b2683faaaf021a1':
  update android workplace screenshot bug: 18038081
 2014-10-23 09:19:42 +00:00
Ye Wen
127597e92f am e6ac3c71: am 4e0ba198: am 9d28487e: Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev 
* commit 'e6ac3c71193545a490a526a1c935d06f800653eb':
  Disable Content-Disposition header for 53005 and 310120
 2014-10-23 09:19:38 +00:00
smain@google.com
ed65508a94 am b3cd9e86: am b7db4ed0: am 9f987e0a: fix a few of the tags for helpouts compatibility 
* commit 'b3cd9e86079faa49d6a8640234a76cef57711ac0':
  fix a few of the tags for helpouts compatibility
 2014-10-23 09:19:34 +00:00
smain@google.com
e958e6c01b am 78e99264: am 20e6a369: am 54504966: Merge "some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." into lmp-dev 
* commit '78e9926405030d155db1f1cba215479368026267':
  some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions.
 2014-10-23 09:19:25 +00:00
Nancy Chen
9d3f616b0a am 2ff95729: am df0ace26: Merge "Add an option to set the selected phone account as the default. (1/3)" into lmp-sprout-dev 
* commit '2ff95729925c782b5e4f52236a3a46b82be3c8cd':
  Add an option to set the selected phone account as the default. (1/3)
 2014-10-23 09:19:20 +00:00
smain@google.com
5ba3d0dc3c am 6837b6af: am c5c029e9: am 13eb86a1: Merge "add helpouts widget to first round of pages" into lmp-dev 
* commit '6837b6afca73ead66a50b2a88492ad1b081e898f':
  add helpouts widget to first round of pages
 2014-10-23 09:19:15 +00:00
Joe Fernandez
f6e297398b am 3bd3a9c1: am 7c2bfa2e: Merge "docs: Add Wear App Quality checklist" into lmp-dev 
* commit '3bd3a9c105301f1d7585479e4222807cdee521ab':
  docs: Add Wear App Quality checklist
 2014-10-23 08:02:56 +00:00
Trevor Johns
3ee2aa0fa3 am 5111993f: am fdb02fcf: Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev 
* commit '5111993f839a68519aa8ba39a2ed05d8dbe13f63':
  Docs: Update /samples/new/index.html for Clockwork Beryl release
 2014-10-23 08:02:53 +00:00
Joe Fernandez
e562ce35c9 am e30fdb59: am 16350261: Merge "docs: Add article describing Location API for Android Wear." into lmp-dev 
* commit 'e30fdb596a5670a90482d8535352a33081784a8b':
  docs: Add article describing Location API for Android Wear.
 2014-10-23 08:02:49 +00:00
Joe Fernandez
3f16106c51 am ac0e00db: am eaee4693: Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev 
* commit 'ac0e00dbdf272595fe6032e0d7d52d2097850300':
  docs:Build tools revisions 21.01 and 21.02
 2014-10-23 08:02:45 +00:00
Eric Rowe
46ca296c53 am d2983ced: am 34766d9c: Merge "Add delay in ping connectivity test retry" into lmp-dev 
* commit 'd2983ced58254f52d199981149c42a59642e59b2':
  Add delay in ping connectivity test retry
 2014-10-23 08:02:41 +00:00
smain@google.com
0c57361f3e am 3e2502cb: am 32c820fa: update android workplace screenshot bug: 18038081 
* commit '3e2502cbee68a4aa583227ea5328069275e6e192':
  update android workplace screenshot bug: 18038081
 2014-10-23 08:02:37 +00:00
Ye Wen
e6ac3c7119 am 4e0ba198: am 9d28487e: Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev 
* commit '4e0ba1988a66ed731b0100554dc17ff44a07d164':
  Disable Content-Disposition header for 53005 and 310120
 2014-10-23 08:02:34 +00:00
smain@google.com
b3cd9e8607 am b7db4ed0: am 9f987e0a: fix a few of the tags for helpouts compatibility 
* commit 'b7db4ed08d8d03e317288a4739249b903b9d19a6':
  fix a few of the tags for helpouts compatibility
 2014-10-23 08:02:30 +00:00
smain@google.com
78e9926405 am 20e6a369: am 54504966: Merge "some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." into lmp-dev 
* commit '20e6a369da29877a5adb77b77a754eda9b7ac054':
  some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions.
 2014-10-23 08:02:26 +00:00
Nancy Chen
2ff9572992 am df0ace26: Merge "Add an option to set the selected phone account as the default. (1/3)" into lmp-sprout-dev 
* commit 'df0ace26279f16beacdf9206cb2a8ecc126aecb7':
  Add an option to set the selected phone account as the default. (1/3)
 2014-10-23 08:02:23 +00:00
smain@google.com
6837b6afca am c5c029e9: am 13eb86a1: Merge "add helpouts widget to first round of pages" into lmp-dev 
* commit 'c5c029e91d2b4300ec39dde1b4511cd9bc59cfb8':
  add helpouts widget to first round of pages
 2014-10-23 08:02:19 +00:00
Jae Seo
7d2dcd6b67 am 6c9b0847: Merge "Update documentation for notifyTracksChanged() and notifyTrackSelected()" into lmp-mr1-dev 
* commit '6c9b08478b9f3f69e6f9fa8a5d288ba780a58f3e':
  Update documentation for notifyTracksChanged() and notifyTrackSelected()
 2014-10-23 07:55:53 +00:00
Svet Ganov
012b4eae10 am d8bc6677: Merge "Optimize text rendering in accessibility mode." into lmp-mr1-dev 
* commit 'd8bc6677e5b923cda9e953b60c936815368fb84a':
  Optimize text rendering in accessibility mode.
 2014-10-23 07:55:48 +00:00
Alan Viverette
171c98bd71 am e8f676c0: Merge "Use correct smooth scroll default duration" into lmp-mr1-dev 
* commit 'e8f676c0e580f5ffffbc23befd4b4ffac0d0a332':
  Use correct smooth scroll default duration
 2014-10-23 07:55:44 +00:00
Joe Fernandez
3bd3a9c105 am 7c2bfa2e: Merge "docs: Add Wear App Quality checklist" into lmp-dev 
* commit '7c2bfa2eae3d59b0a876e54c4c6b4f21ea997e89':
  docs: Add Wear App Quality checklist
 2014-10-23 07:55:41 +00:00
Alan Viverette
eb09aaa5ac am e1201e87: Merge "Lighten action bar on light theme, use secondary color for subtitle" into lmp-mr1-dev 
* commit 'e1201e87f4eb83783d8f9f3e46699cc18abb03f6':
  Lighten action bar on light theme, use secondary color for subtitle
 2014-10-23 07:55:39 +00:00
Trevor Johns
5111993f83 am fdb02fcf: Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev 
* commit 'fdb02fcf9c8b55252f4375c2f3e8b4872432cbc8':
  Docs: Update /samples/new/index.html for Clockwork Beryl release
 2014-10-23 07:55:38 +00:00
Craig Mautner
2abc8aa032 am 105e8f3e: Merge "Fix dumpsys display apptoken ordering." into lmp-mr1-dev 
* commit '105e8f3e9ba29997f700194c9031fa56456b202b':
  Fix dumpsys display apptoken ordering.
 2014-10-23 07:55:35 +00:00
Joe Fernandez
e30fdb596a am 16350261: Merge "docs: Add article describing Location API for Android Wear." into lmp-dev 
* commit '16350261e0c491880be42a26bf53965c32e8dd0a':
  docs: Add article describing Location API for Android Wear.
 2014-10-23 07:55:34 +00:00
Joe Fernandez
ac0e00dbdf am eaee4693: Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev 
* commit 'eaee4693814a1c3fbde06474a85570bbf228fc19':
  docs:Build tools revisions 21.01 and 21.02
 2014-10-23 07:55:31 +00:00
Rich Slogar
145016f375 am 9ba1d92c: am 1e44dc18: am cb79d086: docs:Update 4.4W for Wear GPS suppport 
* commit '9ba1d92cdb8980d5cede6284a8d6bf0018ac5a27':
  docs:Update 4.4W for Wear GPS suppport
 2014-10-23 07:55:30 +00:00
Eric Rowe
d2983ced58 am 34766d9c: Merge "Add delay in ping connectivity test retry" into lmp-dev 
* commit '34766d9c3f88e864d37b5c2ece6218e83cd0fe7c':
  Add delay in ping connectivity test retry
 2014-10-23 07:55:27 +00:00
Craig Mautner
933d807c5d am 74ff66e2: am 5cd68ee4: Merge "Cherry pick task movement changes from aosp" into lmp-sprout-dev 
* commit '74ff66e26a4c901922524f221414c578186f92b5':
  Cherry pick task movement changes from aosp
 2014-10-23 07:55:25 +00:00
smain@google.com
3e2502cbee am 32c820fa: update android workplace screenshot bug: 18038081 
* commit '32c820fac0575b406acef688ce365d9c390fd93e':
  update android workplace screenshot bug: 18038081
 2014-10-23 07:55:23 +00:00
Bryce Lee
477fa01286 am 49cb52e2: Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev 
* commit '49cb52e296c48613c2177bfcb14fc67e21b9ae03':
  [Theater Mode] framework implementation through global setting
 2014-10-23 07:55:21 +00:00
Ye Wen
4e0ba1988a am 9d28487e: Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev 
* commit '9d28487e05b6f5b2c4d464467f932060de463067':
  Disable Content-Disposition header for 53005 and 310120
 2014-10-23 07:55:19 +00:00
Alan Viverette
dc546ab7c3 am 720f43e4: Merge "Revert "Check MenuItem.isVisible() for keyboard shortcuts"" into lmp-mr1-dev 
* commit '720f43e4a42ca5cb2544a049d3b60c53174df93a':
  Revert "Check MenuItem.isVisible() for keyboard shortcuts"
 2014-10-23 07:55:17 +00:00
smain@google.com
b7db4ed08d am 9f987e0a: fix a few of the tags for helpouts compatibility 
* commit '9f987e0ac7a410a38a57a69dad1a721324bce766':
  fix a few of the tags for helpouts compatibility
 2014-10-23 07:55:15 +00:00
smain@google.com
20e6a369da am 54504966: Merge "some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." into lmp-dev 
* commit '545049665ce3b1cd5a8da44963f849e23aca4412':
  some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions.
 2014-10-23 07:55:12 +00:00
Alan Viverette
0a736fa7ae am 183cef06: Merge "Ensure AdapterView doesn\'t post selection notifications forever" into lmp-mr1-dev 
* commit '183cef06df00c20df97b6a964dead91c1f7fa0a2':
  Ensure AdapterView doesn't post selection notifications forever
 2014-10-23 07:55:12 +00:00
Joe Fernandez
7c2bfa2eae Merge "docs: Add Wear App Quality checklist" into lmp-dev 2014-10-23 07:03:16 +00:00
Luan Nguyen
9aec78cafa docs: Add Wear App Quality checklist 
Change-Id: I81ef6b3283ffb4d924836a84b52bb04acb301649
 2014-10-22 23:59:40 -07:00
Jae Seo
6c9b08478b Merge "Update documentation for notifyTracksChanged() and notifyTrackSelected()" into lmp-mr1-dev 2014-10-23 06:51:09 +00:00
Jae Seo
8ddb01ec7b Update documentation for notifyTracksChanged() and notifyTrackSelected() 
Bug: 18090857
Change-Id: I339a222454612e0111e79725de596a73f4d406b8
 2014-10-23 06:50:48 +00:00