diff options
| author | phweiss <phweiss@google.com> | 2016-12-02 14:31:04 +0100 |
|---|---|---|
| committer | phweiss <phweiss@google.com> | 2016-12-20 17:11:01 +0100 |
| commit | 2f512047c225a185b12897d25d343ea86ce818d2 (patch) | |
| tree | 6a2ccb682e1c295677ed16a2e2f532ab5ac3e2a2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | df37f1fa7437dae38925636d1109d7217ea4c1c8 (diff) | |
DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings
If a device owner is active, the layout is changed from a
standard AlertDialog with only one string to a custom dialog
that includes information on Device Owners, and VPN and Network Logging,
if enabled.
Cherry-picked from master and modified to not rely on changes that are not in
N:
A change in master renamed some variables in QSFooter.createDialog() and made
them final, this change is also included here.
The owner's organization name cannot be set in N.
In the case of active Device Owner and active VPN, there was a specialized
string for this in N. This string was now replaced by using the simpler
Device Owner string + an own entry for VPN in the new layout.
Some imports had to be included that were already there on master.
The dimen-tag throws an error message on floats during build, replaced by an
item-tag.
BUG: 29748723
BUG: 33126622
Test: Manual, CTS-Verifier tests will be added later
(cherry picked from commit 9e450e12330d4cfe7843613c79f1c3671d08305f)
Change-Id: I2bfca9d9d02a42d9c3b17683625eda29e9369666
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions