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

156976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
Alan Viverette
3b415e41cc Use correct smooth scroll default duration 
BUG: 18092378
Change-Id: I503677129edb647b7970b4e39a175289d5798e1b
 2014-10-22 16:19:57 -07:00
Svetoslav
71de484dd1 am 1eb6a2f0: Merge "Grant the shell user a permission to let apps host widgets." into lmp-mr1-dev 
* commit '1eb6a2f075bfc0b65f0accf0f03661d7a5152593':
  Grant the shell user a permission to let apps host widgets.
 2014-10-22 22:29:50 +00:00
Svetoslav
1eb6a2f075 Merge "Grant the shell user a permission to let apps host widgets." into lmp-mr1-dev 2014-10-22 22:24:59 +00:00
Rich Slogar
cb79d08666 docs:Update 4.4W for Wear GPS suppport 
Change-Id: I1fc5699c84d2c29b26730a949858f9cd6eba4bbe
 2014-10-22 15:23:15 -07:00
Wale Ogunwale
1546422ea7 am d0aae5a2: Merge "Fix issue #17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev 
* commit 'd0aae5a2226c620c547690039fc06dfdf20ea35d':
  Fix issue #17789629: PopupWindow overlaps with navigation bar.
 2014-10-22 22:20:59 +00:00
Wale Ogunwale
d0aae5a222 Merge "Fix issue #17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev 2014-10-22 22:17:19 +00:00
Leon Scroggins III
694fd58dd9 am fed9888e: Merge "Remove outdated tests for custom decoder." into lmp-mr1-dev 
* commit 'fed9888e60f0c7c9eecffbeee22ea058aedbc692':
  Remove outdated tests for custom decoder.
 2014-10-22 22:13:38 +00:00
Leon Scroggins III
fed9888e60 Merge "Remove outdated tests for custom decoder." into lmp-mr1-dev 2014-10-22 22:06:27 +00:00
Aravind Akella
9088e45b45 am bf45075e: Merge "Change body sensor permission string." into lmp-mr1-dev 
* commit 'bf45075e9f2146d8c69499f14f587ecccdbb96c9':
  Change body sensor permission string.
 2014-10-22 22:05:41 +00:00
Aravind Akella
bf45075e9f Merge "Change body sensor permission string." into lmp-mr1-dev 2014-10-22 22:02:19 +00:00
Leon Scroggins III
e8556de6f8 am 36960fad: Merge "Decoder only returns true on complete success." into lmp-mr1-dev 
* commit '36960fad6631f3cb5f2c6048e482e19319b6b2d3':
  Decoder only returns true on complete success.
 2014-10-22 21:56:13 +00:00
Leon Scroggins III
36960fad66 Merge "Decoder only returns true on complete success." into lmp-mr1-dev 2014-10-22 21:53:07 +00:00
Aravind Akella
19a3904626 Change body sensor permission string. 
Change-Id: If02ac48bfa6f1bd87616f89d6e7d0881c4d30967
Bug: 18023754
 2014-10-22 21:46:25 +00:00
xin He
a86aa5d14b am 4329f15b: am 265e3da0: am 5085c4c2: Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev 
* commit '4329f15b50268b4b35d09c18c3c89d0ba3a4b072':
  Show ProgressDialog when waiting for radio to turn on when provisioning.
 2014-10-22 21:30:21 +00:00
xin He
4329f15b50 am 265e3da0: am 5085c4c2: Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev 
* commit '265e3da00668a0769be331349541050dd6603c2b':
  Show ProgressDialog when waiting for radio to turn on when provisioning.
 2014-10-22 21:22:18 +00:00
Ricardo Cervera
c9fb8f2d13 am 2b8f9f87: am e9438c7b: am 0ae6e37e: Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev 
* commit '2b8f9f87ff127983af4c365b70d76d41c6f7f21c':
  docs: Removing extra semicolons in Wear notif examples.
 2014-10-22 21:07:12 +00:00
Quddus Chong
a4215870d7 am fd32fec2: am 52357721: am b8796e44: docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies. 
* commit 'fd32fec2ca4fc86b5361556e0903f3beaad8a650':
  docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
 2014-10-22 21:07:07 +00:00
John Reck
d83fc233bd am 7c8f44ae: am 36c2aa4a: Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit '7c8f44ae529ce32356d83e92c26d9ba62be3298c':
  Surface:lockHardwareCanvas DO NOT MERGE
 2014-10-22 21:07:01 +00:00