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

156994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Svet Ganov
d8bc6677e5 Merge "Optimize text rendering in accessibility mode." into lmp-mr1-dev 2014-10-23 01:55:44 +00:00
Alan Viverette
e8f676c0e5 Merge "Use correct smooth scroll default duration" into lmp-mr1-dev 2014-10-23 01:29:06 +00:00
Alan Viverette
e1201e87f4 Merge "Lighten action bar on light theme, use secondary color for subtitle" into lmp-mr1-dev 2014-10-23 01:28:50 +00:00
smain@google.com
32c820fac0 update android workplace screenshot 
bug: 18038081

Change-Id: I6cc59cf002000ee2c938e634ef3662fbba2c70cc
 2014-10-22 17:58:50 -07:00
Nancy Chen
df0ace2627 Merge "Add an option to set the selected phone account as the default. (1/3)" into lmp-sprout-dev 2014-10-23 00:42:24 +00:00
Craig Mautner
105e8f3e9b Merge "Fix dumpsys display apptoken ordering." into lmp-mr1-dev 2014-10-23 00:26:06 +00:00
Ye Wen
9d28487e05 Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev 2014-10-23 00:23:28 +00:00
Alan Viverette
bd266fef81 Lighten action bar on light theme, use secondary color for subtitle 
Also cleans up some code in ActionBarView.

BUG: 17987639
Change-Id: I7dcdf18748d6da5792900ab9a78775a0511f982a
 2014-10-22 17:20:17 -07:00
Rich Slogar
9ba1d92cdb am 1e44dc18: am cb79d086: docs:Update 4.4W for Wear GPS suppport 
* commit '1e44dc18c865a43e8102526ab537f74e7b6271d5':
  docs:Update 4.4W for Wear GPS suppport
 2014-10-23 00:14:40 +00:00
Craig Mautner
74ff66e26a am 5cd68ee4: Merge "Cherry pick task movement changes from aosp" into lmp-sprout-dev 
* commit '5cd68ee4dfeaf74a31a0a62e5d0a60951cddc3bc':
  Cherry pick task movement changes from aosp
 2014-10-23 00:13:57 +00:00
smain@google.com
9f987e0ac7 fix a few of the tags for helpouts compatibility 
Change-Id: Ic7f6f281c937bcba8690a50ce1c5417689993352
 2014-10-22 17:13:51 -07:00
smain@google.com
545049665c 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 2014-10-23 00:06:10 +00:00
Bryce Lee
49cb52e296 Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev 2014-10-23 00:05:42 +00:00
Alan Viverette
720f43e4a4 Merge "Revert "Check MenuItem.isVisible() for keyboard shortcuts"" into lmp-mr1-dev 2014-10-23 00:05:33 +00:00
Alan Viverette
183cef06df Merge "Ensure AdapterView doesn't post selection notifications forever" into lmp-mr1-dev 2014-10-23 00:04:09 +00:00
smain@google.com
c5c029e91d am 13eb86a1: Merge "add helpouts widget to first round of pages" into lmp-dev 
* commit '13eb86a11308b2cff7159d287a79fd7cfa2b045b':
  add helpouts widget to first round of pages
 2014-10-23 00:02:43 +00:00
smain@google.com
13eb86a113 Merge "add helpouts widget to first round of pages" into lmp-dev 2014-10-22 23:59:15 +00:00
Rich Slogar
1e44dc18c8 am cb79d086: docs:Update 4.4W for Wear GPS suppport 
* commit 'cb79d0866695c5a082de02b45d50cf22a9fe8caa':
  docs:Update 4.4W for Wear GPS suppport
 2014-10-22 23:57:53 +00:00
Bryce Lee
fb1cf36aa7 resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev 
Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960
 2014-10-22 16:56:08 -07:00
Alan Viverette
e38eb4d4ef Revert "Check MenuItem.isVisible() for keyboard shortcuts" 
Just kidding we do want this to work like it used to.

This reverts commit e354a9e4da56da45d7035e1e93301554c5faf32e.

Change-Id: Ia51050a93e25c1ad16144b0da3f6178a98ad971a
 2014-10-22 23:51:32 +00:00
Ye Wen
a81f23e5e5 Disable Content-Disposition header for 53005 and 310120 
Platform PDU lib uses a flag in frameworks/base/core resources
instead of mms config in mms service

b/17634414

Change-Id: I0ba78d6b7d6f2844eafa3dac3691828414975f43
 2014-10-22 16:28:39 -07:00
Alan Viverette
3b415e41cc Use correct smooth scroll default duration 
BUG: 18092378
Change-Id: I503677129edb647b7970b4e39a175289d5798e1b
 2014-10-22 16:19:57 -07:00