Commit Graph

45883 Commits

Author SHA1 Message Date
Doris Ling
94ea2dad5b DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
2018-08-02 18:00:29 -07:00
Doris Ling
770f4abf9d Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page
- remove the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
2018-08-01 10:30:51 -07:00
android-build-team Robot
d276458c27 Snap for 4916303 from 0a8de9d763 to pi-qpr1-release
Change-Id: Idbb0c2f838e3b48caf9404e69155e5f665570343
2018-07-27 03:05:35 +00:00
Dario Freni
1237373743 [automerger skipped] Merge "Include NOTICE file in /product partition." am: aa2ec5f239 -s ours
am: 1e56e69a46  -s ours

Change-Id: I0282749b861a6571326c725b5c62a0ebda99dff9
2018-07-24 04:02:45 -07:00
Dario Freni
1e56e69a46 [automerger skipped] Merge "Include NOTICE file in /product partition."
am: aa2ec5f239  -s ours

Change-Id: I5341a7ab21758d1a47b0618cd8b1779f063b1406
2018-07-24 03:58:08 -07:00
Treehugger Robot
aa2ec5f239 Merge "Include NOTICE file in /product partition." 2018-07-24 10:35:44 +00:00
Chalard Jean
92295f0953 Merge "Use the SSID of the network in the no internet dialog" am: 692f989b98 am: 9971303508
am: 28a2b521cf

Change-Id: Iae1632372659849d2f61377d0b31d171c50491ab
2018-07-20 12:33:56 -07:00
Chalard Jean
28a2b521cf Merge "Use the SSID of the network in the no internet dialog" am: 692f989b98
am: 9971303508

Change-Id: Ie1eecd52e31477bf7cac2fbe542f34be308ec5b6
2018-07-20 12:29:46 -07:00
Chalard Jean
9971303508 Merge "Use the SSID of the network in the no internet dialog"
am: 692f989b98

Change-Id: I6921cab3a99a3b4e2ad5919acb1e01f814d26289
2018-07-20 12:25:39 -07:00
Treehugger Robot
692f989b98 Merge "Use the SSID of the network in the no internet dialog" 2018-07-20 18:57:09 +00:00
Bill Yi
9551717c69 [automerger skipped] Import translations. DO NOT MERGE
am: 0a8de9d763  -s ours

Change-Id: Ic192d76bf26a37373d18944f459bcacae754c174
2018-07-20 11:33:55 -07:00
Xin Li
9652d9ec5b Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: e8858cc954

Change-Id: Ide9e745efe8952ac27fb9fb79053557aa6a1caef
2018-07-19 23:45:48 -07:00
Bill Yi
0a8de9d763 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I26fa1f1f72571d0541556649bf104446c9522830
2018-07-19 19:35:10 -07:00
Xin Li
e8858cc954 Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
Bug: 111615259
Change-Id: I0bbc44c97afd0ed6ff7799e866d4b36beee6c3be
2018-07-19 13:50:34 -07:00
android-build-team Robot
73b36ef8f7 Merge cherrypicks of [4562103, 4560827, 4563998, 4563999, 4564000, 4564001, 4564351, 4564352, 4564333, 4564033, 4560455, 4564034, 4560674, 4560675, 4563620, 4561607, 4561062, 4561063] into pi-release
Change-Id: Ie308d644fd0a0f4f72fd54d7bf86c1cf63e720b7
2018-07-17 23:29:09 +00:00
Pavel Grafov
0844fb92d8 Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS.
Only primary user can set LOCK_SCREEN_SHOW_NOTIFICATIONS,
profile can only set notifications to be redacted. When the
user changes notification settings for a work app, this class
is invoked from the profile, meaning it attempts to read
LOCK_SCREEN_SHOW_NOTIFICATIONS for the profile, which is not
there. As a result the function always returs 0 for work apps.

Bug: 111112011
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
Change-Id: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
(cherry picked from commit f14de789f4)
2018-07-17 23:28:34 +00:00
Lei Yu
1582ec3db7 Unrestrict app if it been set as device admin app
Bug: 110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf
Merged-In: I8229bee97d970f8b16351193cfd99ca05ff041bf
(cherry picked from commit f87897b84c)
2018-07-17 23:28:31 +00:00
Brad Ebinger
aca1e304bd Merge "IMS: Use the slot based ImsManager factory reset API." am: 9e4ff6fca6
am: 15ca33865c

Change-Id: I5fcdcb5b74a828d4377d2bc4e8e567f61ff9a899
2018-07-16 13:55:25 -07:00
Brad Ebinger
15ca33865c Merge "IMS: Use the slot based ImsManager factory reset API."
am: 9e4ff6fca6

Change-Id: I42b0a06ed5707475d105646233ac49958de29d75
2018-07-16 13:32:55 -07:00
Brad Ebinger
9e4ff6fca6 Merge "IMS: Use the slot based ImsManager factory reset API." 2018-07-16 19:57:31 +00:00
Doris Ling
ca9617ac6b [automerger skipped] DO NOT MERGE Fix summary text for advanced button.
am: 20e7c9d0ba  -s ours

Change-Id: I357656196bb6d24404aa797f380e1935264c1ac6
2018-07-16 11:46:54 -07:00
Doris Ling
20e7c9d0ba DO NOT MERGE Fix summary text for advanced button.
- the resource for the summary text is in the support library. However,
the prebuilt version in the build does not contain the latest change for
the summary text. Add the overlay for the summary resource here with the
updated translation to remove the redundant summary prefix in the
advanced button.

Change-Id: Ib6db0c402d79a2d965e6060b1851d7b898ae3f94
Fixes: 111195268
Test: manual
2018-07-13 12:32:00 -07:00
Hall Liu
f9b76dfda1 Fix usage of SubscriptionInfo ctor
am: f0072b7345

Change-Id: I0ec1335abfef8fc30c638636e3bb1ac24a221743
2018-07-13 11:27:19 -07:00
Hall Liu
f0072b7345 Fix usage of SubscriptionInfo ctor
Use string arguments instead of ints for mcc/mnc

Bug: 35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit 02c5f3c7ac)
2018-07-13 10:13:46 -07:00
Hall Liu
1b3985010d Fix usage of SubscriptionInfo ctor
Use string arguments instead of ints for mcc/mnc

Bug: 35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit 02c5f3c7ac)
2018-07-13 00:24:39 +00:00
xiamin
7ed2928876 Merge "new password shouldn't be empty string" am: dd7bd6b15a
am: bfb61ed2ed

Change-Id: I97c536fc0aaaec4e317944564519a908a762e9f5
2018-07-11 15:16:20 -07:00
xiamin
bfb61ed2ed Merge "new password shouldn't be empty string"
am: dd7bd6b15a

Change-Id: I8e3fb81aba487df22573b6fa67a36e2973c9a54b
2018-07-11 14:51:09 -07:00
Treehugger Robot
dd7bd6b15a Merge "new password shouldn't be empty string" 2018-07-11 20:23:29 +00:00
Bill Yi
78f73c3352 [automerger skipped] Import translations. DO NOT MERGE
am: 11ebb14241  -s ours

Change-Id: Idb03e6fbae91f20729a4ebbd504255c99bbba606
2018-07-11 10:48:27 -07:00
Dario Freni
e9d83796ac Include NOTICE file in /product partition.
Test: flashed on a device with /product partition and verified licences
are correctly loaded
Bug: 111179267

Change-Id: I2667029128a56baefbec376b0ec4e4ecdb3c3ad4
Merged-In: I12e9169b1d3d313a6c5da0d575a6526327268381
2018-07-11 10:52:53 +01:00
Bill Yi
11ebb14241 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id9deb2f66c09d1b17c35d8226673768d40d7eef7
2018-07-10 22:28:21 -07:00
Salvador Martinez
94bebd2f80 Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev
am: 4804c2c7a5

Change-Id: I81b835965ee39d8c877e834820ca21543d18d654
2018-07-10 12:41:50 -07:00
TreeHugger Robot
4804c2c7a5 Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev 2018-07-10 19:33:29 +00:00
xiamin
3c2956a08c new password shouldn't be empty string
enter "Home screen backup password" in "Developer Settings",
do nothings and then click "Set backup password", There will
be a toast display "New backup password set".
The new password field cannot be empty.

Bug: https://partnerissuetracker.corp.google.com/u/2/issues/111261338
Test: empty string can not be set as a password

Signed-off-by: xiamin <xiamin@xiaomi.com>
2018-07-10 10:48:56 +08:00
Salvador Martinez
78c3f368c3 Fix incorrect method call to wifiManager in Tether
In the WifiTetherApBandController the incorrect method was
being called to check if the device is 5Ghz compatible. We
were calling is5GhzBandSupported directly, but we were
supposed to call isDualBandSupported instead.

Test: robotests updated
Bug: 110793581
Change-Id: I61d3ff10abedde6196b8e29591ebfd3272dbbcd9
2018-07-09 11:52:34 -07:00
Pavel Grafov
0886bf2271 Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev
am: dc2db6c6c9

Change-Id: Id0362b8917255d81dfc83ecccc913aaa8c8349a2
2018-07-09 10:49:22 -07:00
TreeHugger Robot
dc2db6c6c9 Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev 2018-07-09 17:37:19 +00:00
Bill Yi
1d8eba660f [automerger skipped] Import translations. DO NOT MERGE
am: e338a41dac  -s ours

Change-Id: Ifb7f5f0271381fb960b74722457a58ddb82429cf
2018-07-05 20:03:16 -07:00
Bill Yi
e338a41dac Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id2d2fbe5bc2473fa6de24605fc5dbef0ae4e626f
2018-07-04 21:09:50 -07:00
Pavel Grafov
f9429262d2 Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS.
Only primary user can set LOCK_SCREEN_SHOW_NOTIFICATIONS,
profile can only set notifications to be redacted. When the
user changes notification settings for a work app, this class
is invoked from the profile, meaning it attempts to read
LOCK_SCREEN_SHOW_NOTIFICATIONS for the profile, which is not
there. As a result the function always returs 0 for work apps.

Bug: 111112011
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
Change-Id: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
Merged-In: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
(cherry picked from commit f14de789f4)
2018-07-04 13:02:03 +00:00
Matthew Fritze
76acf317a5 Merge "Conditionally block battery percantage from search" into pi-dev
am: ea97a66383

Change-Id: If61f6e81aebd70c88e8fc75a525f53bed3ddbac1
2018-07-03 14:39:07 -07:00
TreeHugger Robot
ea97a66383 Merge "Conditionally block battery percantage from search" into pi-dev 2018-07-03 21:35:32 +00:00
Lei Yu
13d51cd39a Merge "Unrestrict app if it been set as device admin app" into pi-dev
am: f406fd7976

Change-Id: Ic085eeee8d18999d56e7432bb13af342c0e00786
2018-07-03 13:42:30 -07:00
TreeHugger Robot
f406fd7976 Merge "Unrestrict app if it been set as device admin app" into pi-dev 2018-07-03 20:24:58 +00:00
Matthew Fritze
5e8005db42 Conditionally block battery percantage from search
The PowerUsageSummary fragment doesn't use the regular pattern
of a static method to build preference controllers, which can be
accessed by both DashboardFragment and BaseSearchIndexProvider,
because it depends on the Activity & Fragment in the creation of
the preference controllers.

The correct & long-term solution here would be to move those dependencies
out of the getPreferenceControllers method, such that the we could use a
static buildPreferenceControllers method, as seen in DisplaySettings.java.

In the mean time, we know that BatteryPercentagePrefController should not
show up on devices, so we conditionally add the the preference controller's
into getNonIndexableKeys method based on controller Availability, which
BasePreferenceController normally does automatically with a getPreferenceController
method in the host fragment's SEARCH_INDEX_DATA_PROVIDER.

Since this is a short-term solution, it should not be merged into master, and thus
I am not marking the bug as fixed.

Bug: 110894466
Test: Robotests
Change-Id: I06f814571d0b72fbf020dd11a9d23a9eb9907bfd
Merged-In: I5993d332dbd218c981ef5432aebb735d0000f67a
2018-07-03 18:32:35 +00:00
Bill Yi
219ffa7e4e [automerger skipped] Import translations. DO NOT MERGE
am: 20fa188802  -s ours

Change-Id: If51e678c0621df0150bb22fbcbee9b16964b1215
2018-07-02 19:27:51 -07:00
Bill Yi
20fa188802 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 110524699
Change-Id: I80e63cc3fe9148fa5c6986dfc7b470e870d683ca
2018-07-02 18:11:20 -07:00
Lei Yu
f87897b84c Unrestrict app if it been set as device admin app
Bug: 110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf
Merged-In: I8229bee97d970f8b16351193cfd99ca05ff041bf
2018-07-02 18:07:25 -07:00
Fan Zhang
37f143d601 [automerger skipped] Delete obsolete activity alias for dev settings am: 0e1393ae8c am: afbdbeb7d5 am: 192cc156b0 -s ours
am: e9b64753e7  -s ours

Change-Id: Ida92ee646fe101c1c886fecc9351257435571d39
2018-06-27 22:07:14 -07:00
Fan Zhang
e9b64753e7 [automerger skipped] Delete obsolete activity alias for dev settings am: 0e1393ae8c am: afbdbeb7d5
am: 192cc156b0  -s ours

Change-Id: Ib02c4b16500eaf479106c2e70b02fdaa401141e7
2018-06-27 22:01:57 -07:00