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

326880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santos Cordon
627a68f852 Add ability to turn off VR virtual display functionality. 
Add flag to enable/disable virtual displays via the existing
setDisplayProperties API. This makes it possible for the VR system
to turn off virtual displays if necessary after we ship.

Bug: 62546364
Test: Run 'adb shell vr enable-virtual-display [true|false] to toggle while 2d in 3d
runs.

Change-Id: Iae029be501d61189fced981dbc554e984fa7ed4b
 2017-06-29 19:01:39 +00:00
Sujith Ramakrishnan
98b181b25f Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev 
am: 564d0bf1be

Change-Id: I23deb9056dbd9967bfe07d3db30256794b30a778
 2017-06-29 18:59:11 +00:00
TreeHugger Robot
564d0bf1be Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev 2017-06-29 18:50:08 +00:00
TreeHugger Robot
13d5f05350 Merge "Add @*android:bool/config_defaultRingtonePickerEnabled" into oc-dr1-dev 2017-06-29 17:38:13 +00:00
TreeHugger Robot
e327572e36 Merge "Ensure complete GnssStatus construction" into oc-dr1-dev 2017-06-29 17:18:14 +00:00
TreeHugger Robot
325706f143 Merge "add an auto-merge guard to the metrics constants file" into oc-dr1-dev 2017-06-29 16:49:46 +00:00
TreeHugger Robot
aa481d695d Merge "Fixed an icon flickering when adding a notification" into oc-dr1-dev 2017-06-29 16:45:50 +00:00
TreeHugger Robot
7c726fb430 Merge "Remove extraneous log message" into oc-dr1-dev 2017-06-29 16:33:00 +00:00
Android Build Merger (Role)
0bd1a7b461 Merge "Merge "add links to Log class summary for methods and logcat doc" into oc-dev am: ea6fea4d5d" into oc-dr1-dev 2017-06-29 16:20:48 +00:00
TreeHugger Robot
c93f7b215b Merge "Update WifiConfiguration in AccessPoint." into oc-dr1-dev 2017-06-29 16:20:13 +00:00
Scott Main
41fc46aaa9 Merge "add links to Log class summary for methods and logcat doc" into oc-dev 
am: ea6fea4d5d

Change-Id: I322405e6712ef9affb57d86e43b852e19cdc7f88
 2017-06-29 16:19:20 +00:00
Scott Main
ea6fea4d5d Merge "add links to Log class summary for methods and logcat doc" into oc-dev 2017-06-29 16:12:47 +00:00
Justin Klaassen
f828ef0dd6 Add @*android:bool/config_defaultRingtonePickerEnabled 
Bug: 62996582
Test: verify activity is enabled by default
Change-Id: I9503cd09066d1a61f670da2139758ef83b5edea3
 2017-06-29 15:34:36 +00:00
Chris Wren
9a4f2665e5 add an auto-merge guard to the metrics constants file 
Test: make
Bug: 63127271
Change-Id: Ib03a14d2a9e321d743a67f72f9be50259ced162a
 2017-06-29 10:10:02 -04:00
TreeHugger Robot
693179307c Merge "Be more lenient when processing group headers" into oc-dr1-dev 2017-06-29 13:38:24 +00:00
Jason Monk
b40e4ae72a Remove extraneous log message 
Test: make
Bug: 62620242
Change-Id: I5861f074e1db89cab44d6c86a32d2340b283f588
 2017-06-29 09:34:26 -04:00
Selim Cinek
b26afa3e94 Be more lenient when processing group headers 
We are now only looking at the contracted header instead of all
sorts of headers and if the current header is null, we don't
look any further but consider it to be equal.

Bug: 62378776
Test: add notification groups with multiple headers, observe correct icon / text behavior
Change-Id: I0b83b91caaace30df3bdcba7225e93bd0e195484
 2017-06-29 10:28:17 +02:00
TreeHugger Robot
e644b8cfa3 Merge "Clear AccessPoints in WifiTracker when Wifi is Off." into oc-dr1-dev 2017-06-29 05:51:39 +00:00
TreeHugger Robot
f1febb57d8 Merge "Change TRON counters to reflect cl/159755374" into oc-dr1-dev 2017-06-29 05:38:33 +00:00
Sundeep Ghuman
f4d3302b06 Update WifiConfiguration in AccessPoint. 
Currently, calling AccessPoint.update(config, info, networkInfo) will
not store the new WifiConfiguration object if it has changed. This can
cause the summary statement to fall out of sync.

Bug: b/38409294
Test: Open WifiNetworkDetails page with verbose logging. Stale state no
longer shown when config changes.
runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I86411527472621f86ab691ee772c0b3d2153d01f
 2017-06-28 22:24:22 -07:00
TreeHugger Robot
6a62328517 Merge "Add case sensitive sort to AccessPoint compareTo." into oc-dr1-dev 2017-06-29 04:31:36 +00:00
TreeHugger Robot
350328965b Merge "hidl getService throw correct exceptions." into oc-dr1-dev 2017-06-29 02:33:09 +00:00
Winson Chung
fd71b51367 Merge "Updating dismiss button icon to be rounded." into oc-dr1-dev 2017-06-29 02:32:55 +00:00
Winson Chung
4d6747bb0f Merge "Fixing black background when going back from assistant." into oc-dr1-dev 2017-06-29 02:31:54 +00:00
Tri Vo
d6d2c148fe Merge "Fwk vibrator server handles vibrator hal dying." into oc-dr1-dev 2017-06-29 02:26:14 +00:00
Andrii Kulian
6e086877e5 Merge "Further restrict activity launch on virtual displays" into oc-dev 
am: 36dbd3d43f

Change-Id: Iea0afa18746c4b04d12433902140d65d4af50c8e
 2017-06-29 02:16:43 +00:00
Robert Carr
da72cb368e Merge "Disable requestVisibleBehind." into oc-dev 
am: e33c33e38a

Change-Id: I29e5507d716e19060d4c0578d4b4df3bcfa30069
 2017-06-29 02:15:32 +00:00
Eugene Susla
a96ef94e0d Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev 
am: c55f7d2180

Change-Id: I024af9dfe70fb340b2dc481f8aad6b12351b56cb
 2017-06-29 02:14:22 +00:00
John Reck
dfce81961d Merge "Selectively disable filtering if estimated safe" into oc-dev 
am: 38c97237e3

Change-Id: Ic3be7167429e8cd6a291ac0465e883522afcf9e3
 2017-06-29 02:13:18 +00:00
Jorim Jaggi
9d41ce8c4f Merge "Properly check for orientation mismatch" into oc-dev 
am: a96d749140

Change-Id: I5f11ef2c520e418242b44db32d087656c4eb3984
 2017-06-29 02:12:02 +00:00
TreeHugger Robot
423022e8ab Merge "resolve merge conflicts of 91870d158748 to oc-dr1-dev" into oc-dr1-dev 2017-06-29 02:00:51 +00:00
Andrii Kulian
36dbd3d43f Merge "Further restrict activity launch on virtual displays" into oc-dev 2017-06-29 01:47:41 +00:00
TreeHugger Robot
4b535d93f7 Merge changes from topic 'fix_broken_overlay' into oc-dr1-dev 
* changes:
  Revert "Replaced overlay target package"
  Revert "Support dark text on Recents"
 2017-06-29 01:43:52 +00:00
TreeHugger Robot
e33c33e38a Merge "Disable requestVisibleBehind." into oc-dev 2017-06-29 00:17:19 +00:00
TreeHugger Robot
eb36d83901 Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev 2017-06-29 00:09:25 +00:00
TreeHugger Robot
c55f7d2180 Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev 2017-06-28 23:54:49 +00:00
TreeHugger Robot
176f2533a1 Merge "Adjustments to PIP position while flinging" into oc-dr1-dev 2017-06-28 23:45:37 +00:00
Andrii Kulian
3a95edc0f5 Further restrict activity launch on virtual displays 
Only callers with INTERNAL_SYSTEM_WINDOW permission can launch
an activity to a virtual display.

Bug: 63094482
Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: I3f618fcbf3c07e5085e2b43b0f038f240df0c9d3
 2017-06-28 16:21:07 -07:00
Sundeep Ghuman
e801309908 Clear AccessPoints in WifiTracker when Wifi is Off. 
When Wifi is not Enabled, we should clear existing access points. This
avoids showing stale data when wifi is turned back on. Since this method can
now invoke onAccessPointsChanged callbacks, add extra gating for
mStaleScanResults.

Improve test flakiness by waiting for Work and Main handlers to
finish processing messages before continuing.

Bug: b/37832771
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

Change-Id: I34faabec01a7188debe3c3b2fe6a0e02f49b320f
 2017-06-28 16:18:44 -07:00
Scott Main
450a5bb81c add links to Log class summary for methods and logcat doc 
bug: 29123084

Change-Id: Ida1351ca3647faa133905c5ff85df716bffd3203
 2017-06-28 23:02:02 +00:00
Lucas Dupin
15a39b3afa Revert "Replaced overlay target package" 
This reverts commit ae885416dddd684fab2369fde234dc9e48db5051.
 2017-06-28 16:00:39 -07:00
Lucas Dupin
d78aa5d0cf Revert "Support dark text on Recents" 
This reverts commit 512ce6c9b75ce7d3f4f70280a414ab8fb994e809.
 2017-06-28 16:00:26 -07:00
John Reck
38c97237e3 Merge "Selectively disable filtering if estimated safe" into oc-dev 2017-06-28 22:39:46 +00:00
Wyatt Riley
7f2cfed525 Ensure complete GnssStatus construction 
Using volatile reference & final member pattern.

Bug: 37517406
Test: basic GNSS & GPS Status output works
Change-Id: I5650149e0a3f63a52734c8f044d38f3956819921
 2017-06-28 15:13:10 -07:00
Evan Laird
2b8dac29eb resolve merge conflicts of 91870d158748 to oc-dr1-dev 
Test: mp sysuig; visual
Change-Id: Id329cd7f08667b29e8d430cff6576d8894cd9cf4
 2017-06-28 18:00:02 -04:00
Jorim Jaggi
a96d749140 Merge "Properly check for orientation mismatch" into oc-dev 2017-06-28 21:55:27 +00:00
Sujith Ramakrishnan
0390fff82c Prevent unwanted keypress actions during TV Setup. 
- Prevent Search or long-press Home actions
      while TV setup is being completed based
      on flag TV_USER_SETUP_COMPLETE.

Test: Manual - Reset device, ran Setup, tried keys.
Test: Manual - Rebooted device after Setup, tried keys.

Bug: 62419382
Change-Id: Ic8fb0f10943ab7c39a7d9857f62e6ab292231b40
 2017-06-28 14:38:30 -07:00
Evan Laird
91870d1587 Merge "Fix empty signal line thickness / color in status bar" into oc-dev 2017-06-28 21:30:15 +00:00
Charlie Wang
b5e79ad0d3 Merge "Adding fields for time elapsed for headset device events." into oc-dr1-dev 2017-06-28 21:26:38 +00:00
Alison Cichowlas
29c70316df Merge "This import got lost in the merge. Restore to fix build." into oc-dr1-dev 2017-06-28 21:23:49 +00:00