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

155897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Quddus Chong
fd32fec2ca am 52357721: am b8796e44: docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies. 
* commit '523577213072d63f6775ea3155bfc93080314494':
  docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
 2014-10-22 20:48:35 +00:00
John Reck
7c8f44ae52 am 36c2aa4a: Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit '36c2aa4a6394047f02c4f236233b41d738ff56c1':
  Surface:lockHardwareCanvas DO NOT MERGE
 2014-10-22 20:48:27 +00:00
Geoff Mendal
80d812b9b5 am c9e4f942: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'c9e4f942276506c25922e0d61a3978cc2b1c9bc6':
  Import translations. DO NOT MERGE
 2014-10-22 20:48:22 +00:00
Geoff Mendal
4bfba71f8b am b571b926: (-s ours) Import translations. DO NOT MERGE 
* commit 'b571b926f00aee176792aedd964de8230c75c401':
  Import translations. DO NOT MERGE
 2014-10-22 20:48:15 +00:00
Deepanshu Gupta
01c80f155d am 37779f07: Merge "Check Bridge init before disposing." into lmp-dev automerge: 568f16c 
* commit '37779f07496462afa4b5d88725e8a004a7e10bc0':
  Check Bridge init before disposing.
 2014-10-22 20:47:37 +00:00
Jinsuk Kim
9ad6a47186 am 07b481a9: Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev automerge: 0c74939 -s ours 
* commit '07b481a9f77a7ac0dc430706aadfa262802cfdba':
  CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE
 2014-10-22 20:47:34 +00:00
Santos Cordon
05f4d8d1d0 am 40f15895: am 028217eb: Merge "Add hidden method to access a connection\'s service." into lmp-dev 
* commit '40f158954491c4d2587e0b2a13cd07195bc27b25':
  Add hidden method to access a connection's service.
 2014-10-22 20:47:15 +00:00
Filip Gruszczynski
d4a52a6878 am baecc0b2: Merge "Disable activity\'s translucency until it starts being swiped away." into lmp-sprout-dev 
* commit 'baecc0b2d111c3bc930b85d5450f1ff8b7b83395':
  Disable activity's translucency until it starts being swiped away.
 2014-10-22 20:45:59 +00:00
Guang Zhu
871cdeebda am 55bc7dc4: am ccbeb61a: Block monkey from creating user profiles 
* commit '55bc7dc4288e2c2cdd0bd9c2d06c38e00d139d5c':
  Block monkey from creating user profiles
 2014-10-22 20:45:55 +00:00
Jason Monk
61f9c3475f Fix talkback name of screen pinning button 
Bug: 17638334
Change-Id: Ie49c4d66e3c3872271e8fbf1c641cd422b0f8a55
 2014-10-22 16:45:47 -04:00
Adrian Roos
96d3132bd0 am c19586a8: am 7b4a38b1: Delay discovery of system trust agents 
* commit 'c19586a8055b27bc7c7cc3ac3e1f38eec8cc82a9':
  Delay discovery of system trust agents
 2014-10-22 20:45:26 +00:00
Craig Mautner
5cd68ee4df Merge "Cherry pick task movement changes from aosp" into lmp-sprout-dev 2014-10-22 20:38:06 +00:00
Bryce Lee
f03ba4f13b Merge "[Theater Mode] framework implementation through global setting" into lmp-sprout-dev 2014-10-22 20:33:08 +00:00
Nancy Chen
36c62f3e3c Add an option to set the selected phone account as the default. (1/3) 
Modify the phoneAccountSelected method to support the option to set the
selected phone account as the default for outgoing phone calls.

Bug: 18078232
Change-Id: I2689bc9611366d521dfd3dc2086fd31eb6393876
 2014-10-22 13:32:57 -07:00
Craig Mautner
cbd84af39a Cherry pick task movement changes from aosp 
The following cherry picks from aosp contain code that keep windows
tracking the task movement.

https://android-review.googlesource.com/#/c/111380/
https://android-review.googlesource.com/#/c/109930

Maybe fixes bug 15729183.

Change-Id: Ida69fe365b06025d119e32b22a8d04958cdbabf3
 2014-10-22 13:28:40 -07:00
Christopher Tate
6ab862747b Merge "Don't cancel scheduled jobs when packages are updated" into lmp-mr1-dev 2014-10-22 20:27:15 +00:00
Alan Viverette
410f7ee403 Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev 2014-10-22 20:03:46 +00:00
John Reck
5c9d717d3e Fix damage bug 
Bug: 18087374
Change-Id: Ie183392122c73f93010fb3f4be071c924b352966
 2014-10-22 11:32:27 -07:00
Tyler Gunn
6a7ed1eb40 Propagating isMultiParty indicator from RIL up into Telephony layer. 
- Adding isMultiParty() method to IImsCallSession AIDL.

Bug: 18058253
Change-Id: I1c44d3db0f7aa00a3ae6efb1231c5ddd39ab20ac
 2014-10-22 11:26:40 -07:00
Christoph Studer
4da84cd565 SysUI/NoMan: Log clicks on notification buttons 
Introduce notification_action_click logtag that is logged whenever
the user clicks any notification button. For standard templates, we
also log the index of the pressed action button.

Bug: 18064190
Change-Id: Icb07795ff711729d16bde0b7e03d13c2f466779c
 2014-10-22 20:18:14 +02:00
Leon Scroggins III
8e8a0d6eaf Remove outdated tests for custom decoder. 
These tests don't appear to be meaningful. We are comparing an
unused decoder against one that is used.

Keeping this test building (the primary changes to this directory
in a while) is not believed to be worth the effort.

BUG:17419670
Change-Id: Ia0862f2a1de1fb9d744382bb949f6c1638a1a12a
 2014-10-22 18:17:14 +00:00
Christopher Tate
aad67a3e48 Don't cancel scheduled jobs when packages are updated 
Only cancel the app's jobs when it is fully uninstalled, not when
it's being updated to a newer version.

Bug 18059252

Change-Id: I6cf617013ec8e9e9abd90e366d7a6ab0711790de
 2014-10-22 11:16:33 -07:00
Christopher Tate
04e6827ace Fix settings db update sequence 
The 'global' table only exists in the owner-user db instance; make
sure to apply global-setting update steps only when bringing up that
instance.

Bug 18069830

Change-Id: I843eabe710d9487de94690921d61adb181b45ed2
 2014-10-22 10:36:42 -07:00
xin He
265e3da006 am 5085c4c2: Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev 
* commit '5085c4c2933219831bde11a482c8b2934e4a259f':
  Show ProgressDialog when waiting for radio to turn on when provisioning.
 2014-10-22 17:22:51 +00:00
xin He
5085c4c293 Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev 2014-10-22 17:19:26 +00:00