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

164140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Takayuki Hoshi
b254ab6add Fix a bug where LocationManager's addGpsStatusListener does not throw a 
SecurityException if LocationManagerService.mGpsStatusProvider is null
even when ACCESS_FINE_LOCATION permission is not present.

Tested under Nexus 5 and Molly with lmp-mr1-dev build with
android.location2.cts.LocationManagerTest#testGpsStatusListener CTS
test case such that it has been modified to expect SecurityException
only from .addGpsStatusListener.

Bug: 18095673
Change-Id: I09f9e7224a3b0eab91001f5092f0ef6e0ada7b08
 2014-10-23 16:46:02 +09: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
Trevor Johns
fdb02fcf9c Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev 2014-10-23 06:15:33 +00:00
Nancy Chen
3ace54b895 Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount. 
Settings and Dialer need label, icon, and color for UI display of
subscriptions/SIMs. Add getters for these methods in SubInfoRecord. Sets
up for the following changes:
+ getIcon will return a drawable instead of a resource ID
+ getColor will return a color value instead of an index
PhoneAccount will also be adding these changes which will be adopted
from SubInfoRecord. Adds changes that were reverted from ag/563976.

Bug: 17971273
Change-Id: Ie2beedf8475c6deb48a6ab83bc9656c1142cc004
 2014-10-22 21:44:45 -07:00
Joe Fernandez
16350261e0 Merge "docs: Add article describing Location API for Android Wear." into lmp-dev 2014-10-23 04:39:25 +00:00
Luan Nguyen
5aad2c9fb0 docs: Add article describing Location API for Android Wear. 
Change-Id: I1956be7df8cc875270d45652d1b0d414b6395982
 2014-10-22 21:36:02 -07:00
Trevor Johns
87cb043f5d Docs: Update /samples/new/index.html for Clockwork Beryl release 
Added SpeedTracker sample to list of new samples.

Change-Id: I88094149ab21b9a24f19bb7693bbce1187b625eb
 2014-10-22 21:14:25 -07:00
Craig Mautner
b9b62b06bb am 52656916: am 4c101015: Merge "Avoid to skip app window due to un-assigned sending to bottom state while app window sort" 
* commit '52656916e35b08013bf776b3603d6cecba287a1e':
  Avoid to skip app window due to un-assigned sending to bottom state while app window sort
 2014-10-23 03:17:35 +00:00
Joe Fernandez
eaee469381 Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev 2014-10-23 03:14:34 +00:00
Svet Ganov
d8bc6677e5 Merge "Optimize text rendering in accessibility mode." into lmp-mr1-dev 2014-10-23 01:55:44 +00:00
Eric Rowe
34766d9c3f Merge "Add delay in ping connectivity test retry" into lmp-dev 2014-10-23 01:41:19 +00:00
Eric Rowe
58a3ddf5aa Add delay in ping connectivity test retry 
Change-Id: Id6e36f42b2a2d84605185780fb7a3f2144e7a9b9
 2014-10-22 18:34:43 -07: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
Rich Slogar
b3ae31ac1f docs:Build tools revisions 21.01 and 21.02 
Change-Id: I220f35541e88bf3b5dba1981d7375ecece525e2b
 2014-10-22 17:30:07 -07: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
Svetoslav
8528259fa0 am 71de484d: am 1eb6a2f0: Merge "Grant the shell user a permission to let apps host widgets." into lmp-mr1-dev 
* commit '71de484dd1cdfd2e06761c170dfe729480cb7906':
  Grant the shell user a permission to let apps host widgets.
 2014-10-22 22:49:52 +00:00
Wale Ogunwale
cbe7f81819 am 1546422e: am d0aae5a2: Merge "Fix issue #17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev 
* commit '1546422ea7b0c62e6205ab9e85a370caf1d01756':
  Fix issue #17789629: PopupWindow overlaps with navigation bar.
 2014-10-22 22:39:35 +00:00
Leon Scroggins III
b3d2a85b64 am 694fd58d: am fed9888e: Merge "Remove outdated tests for custom decoder." into lmp-mr1-dev 
* commit '694fd58dd93b6360ec2204dab731d3c68847478b':
  Remove outdated tests for custom decoder.
 2014-10-22 22:39:30 +00:00
Aravind Akella
6c2c9b8628 am 9088e45b: am bf45075e: Merge "Change body sensor permission string." into lmp-mr1-dev 
* commit '9088e45b4554c5e6aa57ad69c58a5648584b24fa':
  Change body sensor permission string.
 2014-10-22 22:39:17 +00:00
Leon Scroggins III
1e2f56c513 am e8556de6: am 36960fad: Merge "Decoder only returns true on complete success." into lmp-mr1-dev 
* commit 'e8556de6f82ae0f4e4c8e76679e94abc23d724cf':
  Decoder only returns true on complete success.
 2014-10-22 22:39:10 +00: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