Commit Graph

35869 Commits

Author SHA1 Message Date
TreeHugger Robot
ff174c73b2 Merge "Create RestrictedDashboardFragment." 2017-05-08 22:14:21 +00:00
jackqdyulei
e407e67a3b Create RestrictedDashboardFragment.
RestrictedDashboardFragment has all the same logic coming from
RestrcitedSettingsFragment but extends from DashboardFragment.
As a result, we could use preferenceController in child class of
RestrictedDashboardFragment.

This cl also make DeviceListPreferenceFragment as child of
RestrictedDashboardFragment, which enfluences the bluetooth page.

Bug: 38041586
Test: Build
Change-Id: I01395d506176c5cc584948478f7ca16c1c7c7045
2017-05-08 13:34:54 -07:00
Fan Zhang
8b422ba448 Merge "Remove summary template in sleep timeout setting." into oc-dev am: 014ff46fa6
am: f7ba1e7209

Change-Id: I867a5237475be372bcc183b038c9539a3c4a8087
2017-05-08 19:14:59 +00:00
Svetoslav Ganov
77590cd1fc Merge "Report normalized package name as default key" into oc-dev am: 0560127e9d
am: bf3ad99a38

Change-Id: Id4d90c665262151bc4413a8143cd131c1d069543
2017-05-08 19:14:28 +00:00
Fan Zhang
f7ba1e7209 Merge "Remove summary template in sleep timeout setting." into oc-dev
am: 014ff46fa6

Change-Id: I9f9e924be57552eebfe5d8bff5463182463f6845
2017-05-08 19:08:20 +00:00
Svetoslav Ganov
bf3ad99a38 Merge "Report normalized package name as default key" into oc-dev
am: 0560127e9d

Change-Id: Id09f3e8efd951de0a96a604cab336cef0bdcd265
2017-05-08 19:07:55 +00:00
TreeHugger Robot
014ff46fa6 Merge "Remove summary template in sleep timeout setting." into oc-dev 2017-05-08 18:57:57 +00:00
Svetoslav Ganov
0560127e9d Merge "Report normalized package name as default key" into oc-dev 2017-05-08 18:57:23 +00:00
Svet Ganov
7d3fb0481d Report normalized package name as default key
Test: make RunSettingsRoboTests -j90

bug:36978445

Change-Id: I593de89c4fa4e9c63a86b9844736e38dce30a258
2017-05-08 18:56:47 +00:00
TreeHugger Robot
fa4f30e09f Merge "Use a SwitchPreference for auto-rotate instead" 2017-05-08 18:22:30 +00:00
Daniel Sheng
e18b787084 Merge "Camera lift preference now saves correctly" 2017-05-08 18:07:05 +00:00
TreeHugger Robot
0ba42b0eac Merge "Use framework pref layout for SwitchPreference" 2017-05-08 17:31:10 +00:00
Amin Shaikh
f577c3250f Merge "Show "Forget" button for ephemeral networks." into oc-dev am: 3f303d5fd8
am: 293a0f003a

Change-Id: Id7c648e3d3b80ff1e983f992c553ef81df964b99
2017-05-08 17:14:51 +00:00
Amin Shaikh
293a0f003a Merge "Show "Forget" button for ephemeral networks." into oc-dev
am: 3f303d5fd8

Change-Id: Ic8c5028ac48b36a03871423cb867518fd5d38dc4
2017-05-08 17:11:48 +00:00
TreeHugger Robot
3f303d5fd8 Merge "Show "Forget" button for ephemeral networks." into oc-dev 2017-05-08 17:07:33 +00:00
Daniel Nishi
708ee39aa7 Merge "Fix Settings crash in Storage settings." into oc-dev am: 816956d249
am: bc628dfdd9

Change-Id: I47b9bd56c6a7bb6f2a640ae067623a4f5395d455
2017-05-08 16:53:21 +00:00
Daniel Nishi
bc628dfdd9 Merge "Fix Settings crash in Storage settings." into oc-dev
am: 816956d249

Change-Id: I3bd38a5cd716df4d4c91ab762870ad74c626de6d
2017-05-08 16:50:17 +00:00
Daniel Nishi
816956d249 Merge "Fix Settings crash in Storage settings." into oc-dev 2017-05-08 16:45:07 +00:00
Fan Zhang
670410c04e Use a SwitchPreference for auto-rotate instead
- Change the UI to SwitchPreference
- Remove old string used by DropDownPreference
- Attach listener to monitor setting change

Change-Id: If42cceb74296814311eb0eff8e26b4a48a1c4d29
Fix: 35959797
Test: robotests
2017-05-06 10:42:37 -07:00
Fan Zhang
e1c68df27e Use framework pref layout for SwitchPreference
Test: manual
Change-Id: Id9add8d5669cbb34e93c9bfd2e25e75d9cc56a56
2017-05-06 09:43:25 -07:00
nharold
87dd45a3f1 Merge "Update references to use PhoneConstantConversion" am: 79694e79d1 am: 98f209c6e5 am: 2e4950879a
am: d460c1a6b3

Change-Id: Icdb6c3cb600a65189ce0e7f7dd27a9fe975feb8e
2017-05-06 03:26:23 +00:00
nharold
d460c1a6b3 Merge "Update references to use PhoneConstantConversion" am: 79694e79d1 am: 98f209c6e5
am: 2e4950879a

Change-Id: I656450f32a00f9a761a6d0069d2f3c59b729e0f5
2017-05-06 02:55:47 +00:00
Fan Zhang
db6380973a Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev am: 4f5b13f97a
am: 779548122b

Change-Id: Ie1f2b075461dc0546cb1cfe2149cbda6254a33af
2017-05-06 02:48:38 +00:00
Fan Zhang
779548122b Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev
am: 4f5b13f97a

Change-Id: I7166624e96ed82f523545f390457661dfb7c3d42
2017-05-06 02:46:38 +00:00
TreeHugger Robot
4f5b13f97a Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev 2017-05-06 02:42:38 +00:00
nharold
2e4950879a Merge "Update references to use PhoneConstantConversion" am: 79694e79d1
am: 98f209c6e5

Change-Id: I5c7760471d2e48df20955122507b503ca546954e
2017-05-06 02:07:30 +00:00
nharold
98f209c6e5 Merge "Update references to use PhoneConstantConversion"
am: 79694e79d1

Change-Id: I809133a80c00b932b00637920f2c4c89a5a69a22
2017-05-06 01:57:56 +00:00
nharold
79694e79d1 Merge "Update references to use PhoneConstantConversion" 2017-05-06 01:45:37 +00:00
Roozbeh Pournader
16db0413f1 Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev am: 869d246021
am: 6b06aa1099

Change-Id: I3db0d2e88659b4cd1822a368845b9179521a69e6
2017-05-06 01:41:43 +00:00
Roozbeh Pournader
6b06aa1099 Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev
am: 869d246021

Change-Id: Idb17d5f38526c926ddf2d0ca55d30f806c52d574
2017-05-06 01:39:29 +00:00
TreeHugger Robot
869d246021 Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev 2017-05-06 01:34:47 +00:00
Fan Zhang
0335cd1e9b Fix crash when there is no emergencybroadcast app on device
Some devices do not have emergencybroadcast app installed, so we should
not show the preference item for it. Add the preference controller into
AppAndNotificationFragment properly hides it.

Change-Id: Ic39ba24da9bd8f3200a5e44232a5489e35c48c0a
Fix: 37945069
Test: make RunSettingsRoboTests
2017-05-05 17:42:25 -07:00
TreeHugger Robot
1ca442e66e Merge "Prevent race conditions after dropping database" 2017-05-06 00:37:11 +00:00
Doris Ling
a39f7c2906 Merge "Fix crash when primary user select app installed by secondary user." into oc-dev am: f9d9524574
am: 7c5ef68505

Change-Id: Ia7956ad53ecb8aed962f2d0f3950243ab4c6b06e
2017-05-06 00:11:39 +00:00
Doris Ling
7c5ef68505 Merge "Fix crash when primary user select app installed by secondary user." into oc-dev
am: f9d9524574

Change-Id: I8b02370267e682ec17efcdf877c960e4189304ae
2017-05-06 00:02:54 +00:00
TreeHugger Robot
f9d9524574 Merge "Fix crash when primary user select app installed by secondary user." into oc-dev 2017-05-05 23:59:29 +00:00
Fan Zhang
4f8b9ebd58 Merge "Update tether summary text when airplane mode turns on" into oc-dev am: fe5d64feb0
am: 12cc6aad3c

Change-Id: If61ae23a8a908452f26c07c7908d1cdd365feb4a
2017-05-05 22:54:11 +00:00
Matthew Fritze
be0989cc61 Prevent race conditions after dropping database
Manual merge from: ag/2155898

Bug: 37501479
Test: make RunSettingsRoboTests
Change-Id: I02f8423c0ffc27abbb8ceb61a8c47d2f0796d0bb
2017-05-05 15:30:39 -07:00
TreeHugger Robot
52836c2191 Merge "Tether screen cleanup" 2017-05-05 22:27:58 +00:00
Fan Zhang
12cc6aad3c Merge "Update tether summary text when airplane mode turns on" into oc-dev
am: fe5d64feb0

Change-Id: I3bfc37b5bcdcf562faf2c528048e0a5c9427a8f2
2017-05-05 22:14:10 +00:00
Doris Ling
cc28cb372d Fix crash when primary user select app installed by secondary user.
- PackageManager.getPackageInfo() can return null. When trying to check
the app permission info, check for null package info and only process
the permission info when package info is available.
- Update usage of PackageManager.MATCH_UNINSTALLED_PACKAGES to
PackageManager.MATCH_ANY_USER, as the implementation for querying
packages for other users have been changed.
- Add PackageManager APIs used by AppStateAppOpsBridge to
IPackageManagerWrapper for test purpose.
- Change UserManager.get() to Context.getSystemService() to fix test
failure.

Change-Id: I52de924618aa252ffaae02b8f06ebe5b1d0def61
Fix: 37409266
Test: make RunSettingsRoboTests
2017-05-05 14:53:32 -07:00
TreeHugger Robot
fe5d64feb0 Merge "Update tether summary text when airplane mode turns on" into oc-dev 2017-05-05 21:52:07 +00:00
Suprabh Shukla
3dea2a9654 Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev am: 43083b4332
am: 3cadb80e8d

Change-Id: I6503c03ce91af9c3059135160abcdebe8d6fd6b8
2017-05-05 21:02:10 +00:00
Suprabh Shukla
3cadb80e8d Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
am: 43083b4332

Change-Id: I0df3898794b7bc7d5f31a33dbe4363e7502edb5c
2017-05-05 20:56:10 +00:00
TreeHugger Robot
43083b4332 Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev 2017-05-05 20:48:50 +00:00
TreeHugger Robot
4ae7816fb6 Merge "Revert "Remove custom layout for expandpreference."" 2017-05-05 20:41:49 +00:00
Fan Zhang
cdca63c4c7 Remove summary template in sleep timeout setting.
The template causes incorrect display in search, and it's not
needded by anyone in code.

Bug: 36101902
Test: rerun robotests
Change-Id: Ib399e15c799e08d377b124e88eda0b8f13494ed3
2017-05-05 13:40:36 -07:00
Roozbeh Pournader
15bebece94 Fix bidi direction of dialog and bidi-wrap service name
Previously, the name of the service being in a different direction
from the locale could cause bidi artifacts.

Now, we explicitly set the direction of the dialog to the locale, and
bidi-wrap the service name.

Test: Manual
Change-Id: I563299866b24a4ce90fa2d09781aa269d8de2edd
Fixes: 37761152
2017-05-05 13:40:05 -07:00
Fan Zhang
768824d7ad Update tether summary text when airplane mode turns on
Change-Id: I62c52351abbad50aeac077785afb21822773956e
Fix: 37934871
Test: make RunSettingsRoboTests
2017-05-05 12:55:11 -07:00
jackqdyulei
72cce92768 Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev am: 651261c7dd
am: 83e2511d45

Change-Id: I217d9f4a835f8352dcc7868067f09a5cd9b313ae
2017-05-05 19:35:55 +00:00