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

155925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
fed9888e60 Merge "Remove outdated tests for custom decoder." into lmp-mr1-dev 2014-10-22 22:06:27 +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
36960fad66 Merge "Decoder only returns true on complete success." into lmp-mr1-dev 2014-10-22 21:53:07 +00:00
Winson Chung
9a22a175f6 Fixing issue where Recents would not work if the time is changed. (Bug 17995039) 
Change-Id: I389631aac1dba30003e82e7c2beac86d01117dfb
 2014-10-22 14:46:43 -07:00
Aravind Akella
19a3904626 Change body sensor permission string. 
Change-Id: If02ac48bfa6f1bd87616f89d6e7d0881c4d30967
Bug: 18023754
 2014-10-22 21:46:25 +00:00
George Mount
cba01b2310 Fix transition being canceled improperly. 
Bug 18092208

When a transition is determining whether or not it should be
canceled, the old values and new values are compared. Previously,
the if a value was in the old values, but not in the new values
then the value was considered changed. This discounts that
transitions sometimes don't target views and it may be that
no value was populated.

Change-Id: I8210ba1e44921fadedf9ead571d380ad34e73d3f
 2014-10-22 14:39:43 -07: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
Selim Cinek
5256d93121 Fixed a bug where the indication text could get too high 
Bug: 17645187
Change-Id: I8b526be55cd554ae4656797ea5e737135952d32c
 2014-10-22 21:13:46 +00:00
Ricardo Cervera
2b8f9f87ff am e9438c7b: am 0ae6e37e: Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev 
* commit 'e9438c7b17caf0253427031a010456f594741616':
  docs: Removing extra semicolons in Wear notif examples.
 2014-10-22 20:48:39 +00:00