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

314704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Friedman
4eff74f8cb Docs: Fixes broken link in Javadoc. am: df0fd34d50 
am: 506a8b39fb

Change-Id: If60b7db71fe92508daaec1255c637927432d7b55
 2017-04-13 17:00:44 +00:00
Hyunyoung Song
76c13a5fce Merge "Update API, add more documentation on AdaptiveIconDrawable" into oc-dev 2017-04-13 16:53:43 +00:00
Martijn Coenen
e4960cf495 Merge "Add persistentFeature application attribute." into oc-dev 2017-04-13 16:53:22 +00:00
Lucas Dupin
498a44f33a Merge "Add transfer mode support to ShapeDrawable" into oc-dev 2017-04-13 16:52:01 +00:00
TreeHugger Robot
3d6225b4e2 Merge "Companion device mgr doesn't always exist" into oc-dev 2017-04-13 16:50:50 +00:00
Dave Friedman
506a8b39fb Docs: Fixes broken link in Javadoc. 
am: df0fd34d50

Change-Id: I76ed5361426065d5e532c5a11c2d11f28ba8c2d7
 2017-04-13 16:48:41 +00:00
Winson Chung
8561894fa9 Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev 
am: 68cf1b8848

Change-Id: I7d20aeebb7e1a1e6485cc22a8e18ca3c4ab35c3d
 2017-04-13 16:13:30 +00:00
Bill Yi
2d8e49dace Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 05c71b3bbe  -s ours

Change-Id: Id75778a6260e4cf090b4dd574654ff1e9e20ce93
 2017-04-13 16:12:29 +00:00
Winson Chung
68cf1b8848 Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev 2017-04-13 16:01:51 +00:00
Bill Yi
ca2721f9bd Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 2f522fc904  -s ours

Change-Id: I38570abe304599739f9e4dd8c450f9ae0b25a7d4
 2017-04-13 15:55:30 +00:00
TreeHugger Robot
05c71b3bbe Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:55:03 +00:00
TreeHugger Robot
2f522fc904 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:42:31 +00:00
Bill Yi
466cbb6daa Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 023c36f89f  -s ours

Change-Id: I4c1239ade7c3d827cbf6f209ef0375ab5420a9e1
 2017-04-13 15:39:27 +00:00
Bill Yi
d232463193 Merge "Import translations. DO NOT MERGE" into oc-dev 
am: 9e8fa5ec61  -s ours

Change-Id: I0bb86e97bf9e1dbe7aa0de9ba4bde9e72bce7440
 2017-04-13 15:38:21 +00:00
Hugo Benichi
a295bdce7f Merge changes I33ac2b52,I5ab8bb11 into oc-dev 
am: 7270534ac4  -s ours

Change-Id: I98536197e3c4096badcc197ffac7b72836ac00dd
 2017-04-13 15:37:10 +00:00
TreeHugger Robot
023c36f89f Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:27:27 +00:00
TreeHugger Robot
9e8fa5ec61 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:26:29 +00:00
TreeHugger Robot
7270534ac4 Merge changes I33ac2b52,I5ab8bb11 into oc-dev 
* changes:
  Captive portal: fix probe urls at network creation
  NetworkMonitor: improve captive portal validation logs
 2017-04-13 15:26:05 +00:00
Julia Reynolds
1a6ac41f72 Only foreground notis should be sorted higher 
am: 889280c4c3

Change-Id: I755fc0766540a8e836fcd98901c87e4d1ee335c1
 2017-04-13 15:19:09 +00:00
Matt Sarett
44dc270830 Add SkiaCanvas::captureCanvasState() 
Test: Verified bug is fixed.  Wrote unit test.

Bug: 37268771

Change-Id: I9deb7db353cd2129ad245e7f65419670463bb717
 2017-04-13 11:11:11 -04:00
Julia Reynolds
727a728836 Companion device mgr doesn't always exist 
E.g. on tvs.

Test: runtest systemui-notification
Change-Id: I1f1fd3cc5d361d3854eef5e5726816b50f5d7eb6
Fixes: 37276184
 2017-04-13 15:05:45 +00:00
Julia Reynolds
184b86da38 Allow notification channels to be silent. 
This better accomodates those apps that play their own sounds.
Since most apps don't play their own sounds, update the documentation
on notificationchannel to add guidance about when they should add a
sound.

Fixes: 37237013
Test: runtest systemui-notification
Change-Id: If00b15b1b44da66d24dacb2895e9a6c0a06d1890
 2017-04-13 11:03:57 -04:00
Julia Reynolds
889280c4c3 Only foreground notis should be sorted higher 
Having the ongoing flag is not enough.

Test: runtest systemui-notification
Change-Id: I8a6c15af819f2bb4ad3937ae45d33361663fbe13
 2017-04-13 11:03:57 -04:00
Niels Egberts
937f46ffd1 Merge "Document examples where a developer might use the APIs." into oc-dev 
am: 3a543a1bd2

Change-Id: I2c9e5961381e8b7dc1e46b96c704a52ec430e80e
 2017-04-13 14:54:59 +00:00
Dianne Hackborn
80cc3154ee Merge "Debugging issue #37272284: ActivityManager: SELinux tag not defined" into oc-dev 
am: 809f4cf121

Change-Id: I56946e9a2868ea232a02fa2c4919d33c9d0647c0
 2017-04-13 14:42:33 +00:00
TreeHugger Robot
3a543a1bd2 Merge "Document examples where a developer might use the APIs." into oc-dev 2017-04-13 14:41:59 +00:00
TreeHugger Robot
809f4cf121 Merge "Debugging issue #37272284: ActivityManager: SELinux tag not defined" into oc-dev 2017-04-13 14:32:41 +00:00
Hugo Benichi
e90070d528 Merge "Revert "Captive portal: rotate fallback urls"" am: 9ea45b6106 am: 4d47eba86a 
am: 4d47a6a26b

Change-Id: Ib4dd12ee716fbc06e1fbfbb2e0445836b1e7c475
 2017-04-13 13:52:21 +00:00
Seigo Nonaka
0b73a4287e Introduce FontsContract.requestFont and deprecate Typeface.create 
Since background fetch should be synchronized with life cycle of
Activities, so should not create new background thread inside this
method. Not to break existing apps, mark as deprecated and will be
removed from public API untile next release.

New API accepts Handler so that the developer can pass their own thread
.

Test: TBD
Bug: 37253785
Change-Id: I87fdc6a354a829db679253824f42489f25698fa0
 2017-04-13 06:48:07 -07:00
Orion Hodson
c05219d7b3 Merge "Unhide MethodHandles.explicitCastArguments()" am: 891cab55d3 am: 0f7294af11 
am: 2d5f14e578

Change-Id: I9b7a384143ec2dfe3ee55d3949843797f1325d7f
 2017-04-13 13:46:57 +00:00
Hugo Benichi
4d47a6a26b Merge "Revert "Captive portal: rotate fallback urls"" am: 9ea45b6106 
am: 4d47eba86a

Change-Id: Ic2e927bec210f65a0de6face224ce0b8d227b0bc
 2017-04-13 13:46:32 +00:00
Orion Hodson
2d5f14e578 Merge "Unhide MethodHandles.explicitCastArguments()" am: 891cab55d3 
am: 0f7294af11

Change-Id: Ib22190f899dfe6c1440fd70725958f1a767674ae
 2017-04-13 13:40:32 +00:00
Hugo Benichi
4d47eba86a Merge "Revert "Captive portal: rotate fallback urls"" 
am: 9ea45b6106

Change-Id: Iea6582b4c7f347c24ebccf815256dd7125ab29de
 2017-04-13 13:40:04 +00:00
Orion Hodson
0f7294af11 Merge "Unhide MethodHandles.explicitCastArguments()" 
am: 891cab55d3

Change-Id: I6406a01c50df40a59e3af5432c1f31309cdb43e5
 2017-04-13 13:34:27 +00:00
Seigo Nonaka
c0c5763793 Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev 
am: 061db23b79

Change-Id: I7a7d47db8dedd6f75d4884d635cbfcf15949ac43
 2017-04-13 13:27:57 +00:00
Hugo Benichi
9ea45b6106 Merge "Revert "Captive portal: rotate fallback urls"" 2017-04-13 13:25:42 +00:00
Treehugger Robot
891cab55d3 Merge "Unhide MethodHandles.explicitCastArguments()" 2017-04-13 13:25:12 +00:00
TreeHugger Robot
061db23b79 Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev 2017-04-13 13:22:10 +00:00
Jim Van Verth
5745a0a37f Add uncached and perspective shadows to Skia renderer 
Test: manual - looked at FrameworkShadow app

Bug: 37300468
Change-Id: I72d820479141db2d83363747d9f76abbaca70d98
 2017-04-13 13:15:12 +00:00
Niels Egberts
04637f3d4d Document examples where a developer might use the APIs. 
Test: mmma frameworks/base/
Bug: 35767714

Change-Id: I845db36869b84a18e79d7fe28f10031cfe836617
 2017-04-13 13:52:07 +01:00
Hugo Benichi
2e43e45e1e Revert "Captive portal: rotate fallback urls" 
After discussion in the cl we agreed to use "|" as a separator. However  String.split() input arg is a regex and not a literal string, so that "|" will actually split the urls characters per characters.

Will revert and resubmit with a comma.

This reverts commit 0908daaaf00e6b56ebed0a0fce9c3e3fe183a06b.

Change-Id: Ifab25e41bec806fbc1d2c13ffd81d4ad91598c89
 2017-04-13 12:43:49 +00:00
Tony Mak
76979ccddc Merge "Add hidden API startActivityForResultAsUser" into oc-dev 
am: bb14fb9acb

Change-Id: Iad4f51ffb4cdfaef1aeb312f92284cfad309b978
 2017-04-13 12:36:35 +00:00
TreeHugger Robot
bb14fb9acb Merge "Add hidden API startActivityForResultAsUser" into oc-dev 2017-04-13 12:13:03 +00:00
Bill Yi
ca0db87f3e Import translations. DO NOT MERGE 
Change-Id: Iaf188ae0fe780b83f7caa70e8221126d1ffed110
Auto-generated-cl: translation import
 2017-04-13 04:43:14 -07:00
Hugo Benichi
54e288cc6d Merge changes Ia15f77e2,Icaa1f95c am: c923752929 am: 8e5ebd9261 
am: b98eee1f78

Change-Id: I124e328fb64b03eac6808865bf02af8d7dd939cc
 2017-04-13 10:10:27 +00:00
Hugo Benichi
b98eee1f78 Merge changes Ia15f77e2,Icaa1f95c am: c923752929 
am: 8e5ebd9261

Change-Id: Idf1f5091144d93f88684df50fd38593400b0e23e
 2017-04-13 09:40:19 +00:00
Hugo Benichi
8e5ebd9261 Merge changes Ia15f77e2,Icaa1f95c 
am: c923752929

Change-Id: I98b29c91c68a63d6ddeffd03a690b7e841c2b5bc
 2017-04-13 09:34:22 +00:00
Treehugger Robot
c923752929 Merge changes Ia15f77e2,Icaa1f95c 
* changes:
  Captive portal: regroup hardcoded http response codes.
  Captive portal: rotate fallback urls
 2017-04-13 09:24:33 +00:00
Erik Kline
152c9cf703 Merge "Extract SimChangeListener to its own file" am: 0ef8df6d52 am: 85f5725fb5 
am: 270ab2fa7e

Change-Id: Ic39902fe33258dad0315a82b46f37582ba968085
 2017-04-13 08:44:51 +00:00
Erik Kline
270ab2fa7e Merge "Extract SimChangeListener to its own file" am: 0ef8df6d52 
am: 85f5725fb5

Change-Id: I51f350937450542d8217da5e3d4a415de6cb7f30
 2017-04-13 08:38:44 +00:00