Commit Graph

33956 Commits

Author SHA1 Message Date
Dmitry Dementyev
d5f3ae5cac resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863 am: 2569925151
am: efb9f74486

Change-Id: I947fecd7b54fac9c3253decff4d635cad7706baa
2017-03-09 18:25:27 +00:00
Dmitry Dementyev
c28fb3e071 resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec
am: 3b5b2d6d20

Change-Id: I52945a6de0678ae91a1eba0201dc252402146260
2017-03-09 18:25:11 +00:00
Dmitry Dementyev
efb9f74486 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863
am: 2569925151

Change-Id: I9462ba01dda65034a82df27a0b7aaf2de14591b0
2017-03-09 18:22:27 +00:00
Dmitry Dementyev
3b5b2d6d20 resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f
am: 8c5c5b5cec

Change-Id: I56f7364b5b70fe41a5d09fbaf334c0e15f073750
2017-03-09 18:22:11 +00:00
Dmitry Dementyev
2569925151 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours
am: f1fb452863

Change-Id: I074be985f7e09f1d7bac6936d7cadc25a9b8afba
2017-03-09 18:19:26 +00:00
Dmitry Dementyev
8c5c5b5cec resolve merge conflicts of 3964c51bf2 to nyc-dev
am: 0f04a5a93f

Change-Id: I5bb82c0b56e43903d10304007bc17165be3c23f9
2017-03-09 18:19:10 +00:00
Dmitry Dementyev
f1fb452863 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43
am: 3964c51bf2  -s ours

Change-Id: I8f8c6bd49cc10addae1408f1cfb8b2200184a999
2017-03-09 18:16:23 +00:00
William Luh
a67df03cfb Merge "Initialize injected Security preferences." 2017-03-09 17:08:11 +00:00
TreeHugger Robot
a7e95c27fe Merge "Update layout and strings for DO Disclosures" 2017-03-09 12:33:06 +00:00
TreeHugger Robot
5ec2747426 Merge "Add CA certs Privacy Settings page" 2017-03-09 10:51:14 +00:00
TreeHugger Robot
a8855922c9 Merge "Misc fixes" 2017-03-09 06:09:58 +00:00
TreeHugger Robot
646aac727d Merge "Change advaned button text color" 2017-03-09 04:07:02 +00:00
TreeHugger Robot
9afc031791 Merge "Fix layout for time zone picker" 2017-03-09 03:57:22 +00:00
TreeHugger Robot
7cea6b2429 Merge "Update theme setting to not require reboot" 2017-03-09 03:14:58 +00:00
Fan Zhang
fcdfa4afa6 Change advaned button text color
Test: visual
Change-Id: I5a7155ac9dfa8dc4b48ba17a937c9c4b03eb2868
2017-03-08 18:14:40 -08:00
TreeHugger Robot
a2a09c9ce2 Merge "Adding app specific screen for "External Sources"" 2017-03-09 01:22:01 +00:00
Jason Monk
2859b9a302 Update theme setting to not require reboot
Add calls into the OverlayManagerService to update the overlays
directly and remove reboot dialog.

Test: make RunSettingsRobotTests
Change-Id: I92841e643eab70b4b194f60cce95ce3cedb75972
Fixes: 34701451
2017-03-08 20:20:16 -05:00
Dmitry Dementyev
0f04a5a93f resolve merge conflicts of 3964c51bf2 to nyc-dev
Bug: 33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
2017-03-08 17:12:40 -08:00
TreeHugger Robot
69ef3f4e69 Merge "Add dividers on a few preferences" 2017-03-09 01:03:11 +00:00
William Luh
91eaa85c52 Initialize injected Security preferences.
Previously a default "G" icon was loaded before the injected ones and
this would be visually jarring. Also the text summary would cause the
titles to shift up, so now load an empty icon and empty summary so no
more jarring visual effects.

Bug: 35994047
Test: make RunSettingsRoboTests
Change-Id: Ia06535215432fe350a3bb06f541e817a566772e0
2017-03-08 16:43:42 -08:00
Fan Zhang
1447da277b Fix layout for time zone picker
Change-Id: I2f1dedac7d747901978ef5d4a1a58bae2fa02921
Fix: 35856915
Test: make RunSettingsRoboTests
2017-03-08 16:28:02 -08:00
Fan Zhang
92831fc7ad Misc fixes
- Deprecate CopyablePreference
- Update search icon for connected device page

Fix: 36006104
Fix: 35948464
Test: make RunSettingsRoboTests

Change-Id: I0f48028b50d347484b4dd2c7844e782d374715d4
2017-03-08 15:30:39 -08:00
Fan Zhang
fbefd9ea01 Add dividers on a few preferences
Fix: 36023418
Fix: 36058273

Test: visual
- On top of emergency preference
- On top of footer preference

Change-Id: Iefbbf0ad410d46c466f919ecb60b572dd6f1ea28
2017-03-08 15:29:25 -08:00
jackqdyulei
391bf71ba2 Add background activity toggle in Battery settings
We will show this preference only if the app is target prior to O
(targetSdk < O)

Bug: 33454801
Test: RunSettingsRoboTests
Change-Id: Ibd6a2147b8e7b49d2b7e3176296dd9b91ee4cc6f
2017-03-08 15:07:24 -08:00
TreeHugger Robot
e32788c630 Merge "Misc fix for secondary user" 2017-03-08 22:32:46 +00:00
Stephen Chen
53d0de2171 Merge "Show Search button in menu of Wifi Preferences page." 2017-03-08 22:24:52 +00:00
Stephen Chen
5bd534e3fc Merge "Remove refresh button from WifiSettings." 2017-03-08 21:46:59 +00:00
Felipe Leme
4fa4a2e3f5 Replaced auto-fill by autofill to keep it consistent with API style.
To keep backward compatibility, it looks for the new service (AutofillService),
then falls back to the old one (AutoFillService) if not found.

Bug: 35956626
Bug: 36024626
Test: manual verification with a custom service
Test: RunSettingsRoboTests passes

Change-Id: I64112ac5d796e94866e632ec8ea79a3fb13e3d9b
2017-03-08 13:45:27 -08:00
Fan Zhang
a6986e7ed2 Misc fix for secondary user
- Theme fix: action bar and status bar color now have enough contrast
  for SUW theme.
- Fix a ConcurrentModificationError when switching between users
  quickly.

Change-Id: If31f88e36f1d4c5d7f90bc9d128041f0e0a81ff9
Fix: 35948464
Test: make RunSettingsRoboTests
2017-03-08 13:09:17 -08:00
Stephen Chen
8e0111ddde Merge "Create NetworkScorerPicker preference controller to set preference summary." 2017-03-08 21:04:44 +00:00
Stephen Chen
f580ccec19 Show Search button in menu of Wifi Preferences page.
Bug: 36066060
Change-Id: Ia40ca8750cfc5233926b6156bb9262b071bb3b85
Test: verify on device.
2017-03-08 12:40:18 -08:00
Stephen Chen
9f5aaa4e5f Remove refresh button from WifiSettings.
Bug: 34891524
Test: b/34673204 for instrumentation tests. Verified button is removed.
Change-Id: I0b30d36bd6b3f0b1361ef4f7dc775ed3545a7bdc
2017-03-08 11:58:13 -08:00
TreeHugger Robot
690d0cfdd0 Merge "SecuritySubSettings: Show trust agent label on lock timeout setting" 2017-03-08 19:54:11 +00:00
Dmitry Dementyev
3964c51bf2 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217
am: def3eddb43

Change-Id: I103086932e0f5071b1fa554a9e11a524b0d36d7d
2017-03-08 19:17:42 +00:00
Dmitry Dementyev
def3eddb43 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9
am: b7e2545217

Change-Id: I40643a3a88c3ec9344604917dd0e765cd9078f29
2017-03-08 19:15:40 +00:00
Dmitry Dementyev
b7e2545217 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258
am: 3a5e567ab9

Change-Id: Ie14fd1ef35f12fffadf4e241e3cd8146a1063d8a
2017-03-08 19:13:10 +00:00
Dmitry Dementyev
3a5e567ab9 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258

Change-Id: Iba7445a15febacfd49ee8a415d8b5a02691b084b
2017-03-08 19:11:13 +00:00
Dmitry Dementyev
5c4276a258 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
am: e24780ed4c

Change-Id: I2fe71909a4b3873fc4e14f7c28b50b0418f85dd1
2017-03-08 19:08:40 +00:00
TreeHugger Robot
be167b088d Merge "Set Tron log event on NetworkScorerPicker." 2017-03-08 19:08:04 +00:00
TreeHugger Robot
9a8bae0838 Merge "Fix disabled WebView packages being shown as enabled in Dev Setting." 2017-03-08 18:39:03 +00:00
Daniel Nishi
8e457342f8 Merge "Fix a crash when transferring an app." 2017-03-08 18:19:26 +00:00
Daniel Nishi
abd92e0519 Update the Manage Storage preference.
Now, it is a master switch preference which can toggle the
automatic management on/off. This also removes the old
UI in the storage summary at the top.

Bug: 33199077
Test: SettingsRoboTests

Change-Id: I709fd2ca0687f760a5d97ad6bebe477b427b0464
2017-03-08 10:18:43 -08:00
Bartosz Fabianowski
1a8399ffd0 Update layout and strings for DO Disclosures
This CL updates the DO Disclosures page (aka "Enterprise Privacy")
to incorporate UI layout and string changes proposed since
implementation began. There are no logic changes.

Test: make RunSettingsRoboTests
Bug: 32692748

Change-Id: I6ae972e77bd90eb9c61d6a516046a6eb09981ad3
2017-03-08 19:07:29 +01:00
Bartosz Fabianowski
732d695985 Add CA certs Privacy Settings page
This CL adds information about CA certs installed by Device Owner and/or
Profile Owners to the Enterprise Privacy Setting page.

Test: make RunSettingsRoboTests
Bug: 32692748

Change-Id: I67bbe5af2b5b6326e4cd7224d0c6f17ab256dace
2017-03-08 10:51:12 +01:00
Suprabh Shukla
f59d2115ed Adding app specific screen for "External Sources"
Adding app specific screen so that third party apps and package
installer can directly intent there to direct users to change the
setting. Also added automater tests.

Test: adb shell am instrument -w -e class \
'com.android.settings.applications.ExternalSourcesSettingsTest' \
'com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner'

Bug: 33792674
Bug: 35487166

Change-Id: I5a481ee7032979df94a9e267ea74aa90da6a0906
2017-03-07 23:44:51 -08:00
TreeHugger Robot
fdb307bfc0 Merge "Display a hardware info dialog when click model number." 2017-03-08 03:52:33 +00:00
Dmitry Dementyev
e24780ed4c resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug: 33123882
Test: manual tests:
2017-03-07 19:52:02 -08:00
Stephen Chen
2d73008bae Create NetworkScorerPicker preference controller to set preference summary.
Bug: 35854552
Test: make ROBOTEST_FILTER=NetworkScorerPickerPreferenceControllerTest
RunSettingsRoboTests -j40

Change-Id: I6dbd18abd67613ed0f85a52f1a3e13fdab0dca6c
2017-03-07 18:52:01 -08:00
TreeHugger Robot
5b60b793ba Merge "Hide video preference when video is not avaiable." 2017-03-08 02:09:47 +00:00
TreeHugger Robot
a3a83470b5 Merge "VPN screen clean up" 2017-03-08 01:53:22 +00:00