Commit Graph

41477 Commits

Author SHA1 Message Date
Ningyuan Wang
47750fc2e6 Enforce null check for mAccessPoint am: 6c12f06bf8
am: 1df7ba1cb6

Change-Id: I6b05dd3ee39ae242de89f2fbad1e271958219817
2017-11-08 21:41:15 +00:00
Ningyuan Wang
1df7ba1cb6 Enforce null check for mAccessPoint
am: 6c12f06bf8

Change-Id: I0fbf4a19a6e28bc66bc6f320dae90bbe438c3341
2017-11-08 21:37:34 +00:00
TreeHugger Robot
f558d4663b Merge "Forward wallpaper activity results to the caller." 2017-11-08 21:18:57 +00:00
TreeHugger Robot
d2278be756 Merge "Change network detail page title." 2017-11-08 20:27:30 +00:00
Ajay Nadathur
d473e38c74 Forward wallpaper activity results to the caller.
- Added Activity.FLAG_ACTIVITY_FORWARD_RESULT to the intent that
launches the wallpaper activities.
- WallpaperSuggestionActivity also finishes itself after launching
intent.

Bug: 65691577
Test: Added robolectric test. Also verified manually that result code is
being forwarded
Change-Id: I2f8b0fac7a35c38e14c4a733b7552fd2e58dd0db
2017-11-08 11:03:04 -08:00
Ningyuan Wang
6c12f06bf8 Enforce null check for mAccessPoint
mAccessPoint == null implies this is a new network.
In this case, we don't need to check if it's a carrier AP.

Bug: 68846574
Test: compile, manually test that crash does not happen again.
Test: make RunSettingsRoboTests -j40 aROBOTEST_FILTER=WifiConfigControllerTest

Change-Id: I03b1da5e8f0b8e4270c0c52c67bbc90c999be078
(cherry picked from commit 0117b995f4)
2017-11-08 18:24:48 +00:00
Julia Reynolds
d0965a21e4 Merge "PreferenceControllers are the way of the future." 2017-11-08 13:33:40 +00:00
TreeHugger Robot
d85cd117c8 Merge "Remove DynamicAvailabilityPreferenceController." 2017-11-08 02:26:16 +00:00
TreeHugger Robot
07e63ea23d Merge "Add ConnectedAccessPointPreference" 2017-11-07 22:48:52 +00:00
Jeffrey Huang
75623cb854 Merge "Update hardware info dialog styles to support rtl" 2017-11-07 21:07:54 +00:00
Fan Zhang
b5f5ffbece Remove DynamicAvailabilityPreferenceController.
- This class is over complex to use, and get in the way of show/hide
  pref when availability change.
- The function from DynamicAvailabilityPreferenceController can be done
  with PreferenceCategoryController.

Bug: 68956750
Bug: 32953042
Test: robotests
Change-Id: Ia7b7e214c072b8c77f5de3d959fdb1dc79217f76
2017-11-07 12:58:48 -08:00
TreeHugger Robot
2260321fd8 Merge "Move Index provider conversion into Settings provider" 2017-11-07 20:52:51 +00:00
TreeHugger Robot
c7652b9933 Merge "Remove a second unwanted search result" 2017-11-07 20:43:52 +00:00
TreeHugger Robot
7036377d72 Merge "Prevent monkey from changing usb settings" 2017-11-07 19:37:03 +00:00
Jeff Sharkey
00824b2714 Merge "Abort long-running benchmarks, report progress." 2017-11-07 19:23:21 +00:00
Matthew Fritze
55ce64dcd9 Move Index provider conversion into Settings provider
Pre-patch, settings search provider would push all of its
fragments into to search via SearchIndexableResources with
an implicit contract of if the resource's xml == 0, then
it was a settings fragment with an Index provider.

One, implicit contract is bad. Two, it was messy at indexing time.

So this patch moves htat conversion into the search index provider.
Such that all of the indexables are either real Resources or Raw.

Change-Id: I39f4351c03d123bb9b45edb4df7f924cfaff2b38
Fixes: 65376542
Fixes: 37741509
Test: robotests
2017-11-07 11:18:26 -08:00
jeffreyhuang
8c5bc0abf0 Remove a second unwanted search result
- Remove Security and location from the search query for lock screen message

Change-Id: Ifa8985c78b403867377cca351e11b3f58d5c60f2
Fixes: 65492727
Test: Manual using settings app
2017-11-07 11:00:49 -08:00
jeffreyhuang
ae3bec2a25 Update hardware info dialog styles to support rtl
Bug: 36458278
Test: Manual using settings app
Change-Id: I60f4fdfc3b8f3282e14591a5842e8a9e95070fa5
2017-11-07 10:59:32 -08:00
jeffreyhuang
7b17780134 Prevent monkey from changing usb settings
- Prevent monkey from revoking usb debugging authorizations
 - Prevent monkey from changing usb configurations

Bug: 68707778
Test: make RunSettingsRoboTests -j40
Change-Id: Idce99d60f0fbce5a9d93aceb0c2a07d27482de10
2017-11-07 09:58:42 -08:00
Jeffrey Huang
a414573d62 Merge "Move iccid number to sim status dialog" 2017-11-07 17:58:01 +00:00
Jeff Sharkey
287d31f180 Abort long-running benchmarks, report progress.
A typical storage device finishes the benchmark in under 10 seconds,
but some extremely slow devices can take minutes, resulting in a
confusing UX that looks like we've frozen.  Even worse, we keep
churning through all that I/O even though we know the device will
blow past our user-warning threshold.

So periodically check if we've timed out, and also use that to report
progress up into the Settings UI.

Test: manual
Bug: 62201209, 65639764, 67055204
Exempt-From-Owner-Approval: I wrote the original code.
Change-Id: Idd9d8c181651202d1434af879cff9355478a25c1
2017-11-07 09:52:03 -07:00
songkailun
199cb39de9 remove unused code in PrivacySettings
factory_reset is already removed from privacy_settings.xml,
so it need to be removed from PrivacySettings.java too

Change-Id: I0d295b90173102efb962dde496cf7a8b15d1e0a9
Signed-off-by: songkailun <songkailun@xiaomi.com>
2017-11-07 11:51:57 +00:00
songkailun
fb1440952b translate array in res/values-ar
"None" should be translated

Change-Id: I9cd1b21947834a070ba66a7ee7641d0b6617de52
Signed-off-by: songkailun <songkailun@xiaomi.com>
2017-11-07 11:51:02 +00:00
Bill Yi
ba4c4575ab Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 7b75c5a338 -s ours
am: c8de736ea2  -s ours

Change-Id: I07ed77f89000af9d409cb74b5183c4c564b464ae
2017-11-07 09:50:32 +00:00
Bill Yi
c8de736ea2 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 7b75c5a338  -s ours

Change-Id: I129fdafc703d9cb714a49c00c9367b520fc86519
2017-11-07 09:48:01 +00:00
TreeHugger Robot
7b75c5a338 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-11-07 09:41:30 +00:00
Bill Yi
9f5ee21464 Import translations. DO NOT MERGE am: 73120a4cdb -s ours am: f74efef4fb -s ours
am: f2b1de1435  -s ours

Change-Id: I98bb3bafb87997c2dc334e912991aabbc6bf178c
2017-11-07 09:37:58 +00:00
Bill Yi
f2b1de1435 Import translations. DO NOT MERGE am: 73120a4cdb -s ours
am: f74efef4fb  -s ours

Change-Id: I1841bd7c3fe428749e74e3bda23f3765effb6735
2017-11-07 09:35:56 +00:00
Bill Yi
f74efef4fb Import translations. DO NOT MERGE
am: 73120a4cdb  -s ours

Change-Id: Ida543e80dd13e3b5653c8676fe3032d5693a224d
2017-11-07 09:33:26 +00:00
Bill Yi
73120a4cdb Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I16dfb5a1bbcd9d062c9f24914c0715c5f0cfe95e
2017-11-06 23:21:01 -08:00
Bill Yi
80f3654189 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I5e47736d365f0c8e75ec8e9ac0c84d599fbf7180
2017-11-06 23:20:38 -08:00
Erik Kline
b573ea7a05 Merge "Replace dns_tls with private_dns_mode setting" am: ca92fb5e2b am: 768f467089
am: 3194e6cbb8

Change-Id: Iee5ceb25248a7611b84fc06f93f52e287062cecd
2017-11-07 06:18:39 +00:00
Erik Kline
3194e6cbb8 Merge "Replace dns_tls with private_dns_mode setting" am: ca92fb5e2b
am: 768f467089

Change-Id: I70b86f3e2ebf823fea8a1516031f9137b2813bb3
2017-11-07 06:08:59 +00:00
Erik Kline
768f467089 Merge "Replace dns_tls with private_dns_mode setting"
am: ca92fb5e2b

Change-Id: I58c44a04ef75d025f63e9470ed9624a437a7956c
2017-11-07 06:00:15 +00:00
Treehugger Robot
ca92fb5e2b Merge "Replace dns_tls with private_dns_mode setting" 2017-11-07 05:54:28 +00:00
Erik Kline
1ea5dd05c3 Replace dns_tls with private_dns_mode setting
Also includes:
    - new layout fragment for private DNS configuration
    - PrivateDnsModeDialogPreference handler class

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual interaction with private dns developer option works
Bug: 34953048
Bug: 6413396
Change-Id: I3a5490c21f7f3b3e523a247c287f213d19b75a8b
2017-11-07 12:28:48 +09:00
TreeHugger Robot
c41646606d Merge "Fix robolectric test failure" 2017-11-07 02:40:18 +00:00
Fan Zhang
d9f5d1ca06 Merge "Convert SecuritySubSetting into DashboardFragment" 2017-11-07 01:58:42 +00:00
Fan Zhang
a681094e8a Convert SecuritySubSetting into DashboardFragment
Bug: 32953042
Test: robotests
Change-Id: Iecdb0a42695644ff8aa095bcd49b5ccb16aa46d4
2017-11-06 17:26:25 -08:00
TreeHugger Robot
4b6d4211e3 Merge "Update Wi-Fi Calling "Emergency address" text" 2017-11-07 00:38:44 +00:00
Fan Zhang
491e475dfb Fix robolectric test failure
Bug: 36971201
Test: robotests
Change-Id: I5adc98b8bc42b98b39d38bf08e2ac1bfa5139819
2017-11-06 15:12:14 -08:00
TreeHugger Robot
fd1b6f408c Merge "Revert the change that remove the video layout listener." 2017-11-06 22:57:12 +00:00
Jeffrey Huang
67d9347bd4 Merge "Add connectivity controllers to about phone v2" 2017-11-06 22:32:46 +00:00
Lei Yu
d854eec1a8 Merge "Fix crash in settings robo test." 2017-11-06 21:16:37 +00:00
jeffreyhuang
5b8202a296 Move iccid number to sim status dialog
- Remove iccid number logic from imei dialog
 - Add iccid number log to sim status dialog

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I087688645169b387b9d65264e2c8b70ca565a44e
2017-11-06 12:38:45 -08:00
TreeHugger Robot
5f6c80a288 Merge "Guard against a NPE when disconnecting suggestion service." 2017-11-06 20:29:56 +00:00
jackqdyulei
fbede9c080 Add ConnectedAccessPointPreference
This preference contains:
1. All the logic from AccessPointPreference
2. Gear icon on the right

Bug: 68807544
Test: RunSettingsRoboTests & Screenshot
Change-Id: I128401d81b075c4e9c5ca711562de26e73147745
2017-11-06 12:27:26 -08:00
jeffreyhuang
e72cd30868 Add connectivity controllers to about phone v2
- Add IpAddressPreferenceController
 - Add WifiMacAddressPreferenceController
 - Add BluetoothAddressPreferenceController

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Idf55784721d28ac27b1b8186e26268e21c40688e
2017-11-06 11:46:17 -08:00
jackqdyulei
65370d21fd Fix crash in settings robo test.
This is a regression from ag/3120176. In AnomalyDialogFragment when
creating the real dialog, it creates the RuntimePermissionPresenter
which causes the stub error.

In this cl we shadow the RuntimePermissionPresenter since in this
test we only focus on that created dialog has the correct message
(dialog title, dialog message)

Bug: 68941201
Test: RunSettingsRoboTests
Change-Id: I9c09922453f7797f375d0f61b9d8eba660bfbfef
2017-11-06 11:16:36 -08:00
Julia Reynolds
ac3f7e80dc PreferenceControllers are the way of the future.
Migrates Notification settings (app level, group level, and channel
level) into PreferenceControllers (and most importantly:
PreferenceControllerTest)

Note: this removes the 'Advanced' preference group, but does
not yet use the standard system 'Advanced' grouping as it does
not currently support our use case (where we don't know how many
fields to show outside of 'Advanced' until onResume() and also
where we need fields to show below the 'Advanced' group).

Test: make RunSettingsRoboTests
Change-Id: Iddd1b4771922db322e5f73562e9d63ed077c5396
2017-11-06 13:50:26 -05:00