Commit Graph

56173 Commits

Author SHA1 Message Date
TreeHugger Robot
62950f61fe Merge "Removed deprecated permission" 2019-08-28 02:41:53 +00:00
TreeHugger Robot
dd57ca7abe Merge "Fixed type missmatch" 2019-08-28 00:30:39 +00:00
joshmccloskey
d1fd424dc8 Fixed type missmatch
Test: Verified that fingerprint enrolling no longer dumps the message
in logcat/
Fixes: 123905104

Change-Id: Ic739bd5416bec15b36b256b3f6b51efaedc01c36
2019-08-27 15:45:27 -07:00
Quang Luong
cfa94dfee1 Merge "Add initial WifiTracker2 into WifiSettings2" 2019-08-27 20:10:31 +00:00
joshmccloskey
d30db87bc8 Removed deprecated permission
Fixes: 135968171
Test: Can still use fingerprint
Change-Id: I767919a2bf14ebd7e44003460536e0f67b9f1f4f
2019-08-27 12:07:08 -07:00
joshmccloskey
fc397f7406 Set the content description of pin/password boxes
Fixes: 79711253
Test: Talkback announces the correct string correctly upon
using either flow.

Change-Id: I01c4e308b8ef9d501f1f5d37e716956a12bea6dc
2019-08-27 12:01:30 -07:00
Al Sutton
0717e24f7d Adapt to refactoring of display config code in SettingsLib
Bug: 139449903
Test: atest SettingsUnitTest SettingsRoboTests
Change-Id: Ic188fdc02c3fa9590be27ad1bc770255e70b6276
2019-08-27 11:20:01 +00:00
Bill Yi
a220381b6d [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours am: 272f241fd4 -s ours am: 2c4800b4f4 -s ours
am: 0003d9a87f -s ours
am skip reason: subject contains skip directive

Change-Id: Idacff7924ac4307c2a4464d744ae9c7a2e0e08fb
2019-08-27 02:58:10 -07:00
Bill Yi
0003d9a87f [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours am: 272f241fd4 -s ours
am: 2c4800b4f4 -s ours
am skip reason: subject contains skip directive

Change-Id: Idcc1af57aafcb361f267ab0defd607b6a70361f0
2019-08-27 02:28:55 -07:00
Bill Yi
a63c2ced9f [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours am: 272f241fd4 -s ours
am: 2c4800b4f4 -s ours
am skip reason: subject contains skip directive

Change-Id: I35935d3c0f92a547906346ca014756334dfd9889
2019-08-27 02:12:00 -07:00
Bill Yi
fd6bdf1c3b [automerger skipped] Import translations. DO NOT MERGE am: 18183ad552 -s ours am: b23b8117ef -s ours
am: 2153c15c96 -s ours
am skip reason: subject contains skip directive

Change-Id: I5525fb081870d234eb2639418813035c014fcb4a
2019-08-27 02:10:57 -07:00
Jayachandran Chinnakkannu
e54e142af6 Merge "[Settings] hide preferred network mode UI" into qt-r1-dev am: 7afb9854a7 am: ddc7dda71b
am: d693325ff1

Change-Id: I2a2088d7d1cedee9573d8d81a8a66764c191763c
2019-08-27 01:55:38 -07:00
Bill Yi
2153c15c96 [automerger skipped] Import translations. DO NOT MERGE am: 18183ad552 -s ours
am: b23b8117ef -s ours
am skip reason: subject contains skip directive

Change-Id: Iabaa0a3482336a741165f15d9602299fb71a422e
2019-08-27 01:39:27 -07:00
Jayachandran Chinnakkannu
d693325ff1 Merge "[Settings] hide preferred network mode UI" into qt-r1-dev am: 7afb9854a7
am: ddc7dda71b

Change-Id: I9ba6cd2c3202f293b834fd70876bc7e7ee540245
2019-08-27 01:24:28 -07:00
Bill Yi
2c4800b4f4 [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours
am: 272f241fd4 -s ours
am skip reason: subject contains skip directive

Change-Id: I35eee950f35028f93b5fd93732076ea1e59777b8
2019-08-27 01:18:06 -07:00
Bill Yi
6e9c3ee3b5 [automerger skipped] Import translations. DO NOT MERGE am: 18183ad552 -s ours
am: b23b8117ef -s ours
am skip reason: subject contains skip directive

Change-Id: I7f6ca5313e2ea952b31b12fb8d7611414bbc8e22
2019-08-27 01:17:04 -07:00
Jayachandran Chinnakkannu
ef97b13354 Merge "[Settings] hide preferred network mode UI" into qt-r1-dev am: 7afb9854a7
am: ddc7dda71b

Change-Id: Ie4c47911942926efe0ba8295e9ba9ef05ec98826
2019-08-27 01:14:37 -07:00
Bill Yi
b23b8117ef [automerger skipped] Import translations. DO NOT MERGE
am: 18183ad552 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifd79b8618022e2ae80e21af4e0677f0049304f33
2019-08-27 00:50:02 -07:00
Jayachandran Chinnakkannu
ddc7dda71b Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
am: 7afb9854a7

Change-Id: Idfbc3f765fc834ab3cb7e07ec340a98606ce87ad
2019-08-27 00:40:42 -07:00
TreeHugger Robot
552e5cef78 Merge "Use FooterPreference in xml explicitly" 2019-08-27 06:54:51 +00:00
Sunny Shao
b47cccf6a0 Use FooterPreference in xml explicitly
Removed the FooterPreferenceMixin from the DeviceAdminSettings page.

Fixes: 140015273
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.applications
Change-Id: I91c10946ae35f9a5cde30399e231dbc8a1481b23
2019-08-27 10:41:13 +08:00
TreeHugger Robot
2e010612ee Merge "Don't allow Settings to change its own standby bucket." 2019-08-26 23:57:35 +00:00
Varun Shah
778d38a551 Don't allow Settings to change its own standby bucket.
When on the "Standby apps" developer options screen, the Settings app
will be greyed out, indicating that its standby bucket cannot be
changed.

Manual Test 1: Go to the "Standby apps" screen in developer options and
observe that the Settings app is greyed out.
Manual Test 2: Turn off "Adaptive Battery" in Settings and then go to
the "Standby apps" screen in developer options - observe that the
Settings app is greyed out.

Bug: 132922935
Test: manual (listed above)
Change-Id: Idb29e6105024feacc270867e46156fc6a0396b01
2019-08-26 14:46:45 -07:00
Hai Zhang
51b76855f9 Add RoleControllerManager.isApplicationVisibleForRole().
Settings doesn't actually need to know whether an application
qualifies for a role, but only whether the default app setting should
be visible for an application. Qualification and visibility differs in
cases such as FallbackHome inside Settings which is a qualifying home
activity but should never be shown in default apps UI.

Fixes: 138636320
Test: manual
Change-Id: I2995b6fa5c7920d14fa644748db9c41b442ce53b
2019-08-26 14:23:44 -07:00
Bill Yi
286c3948dd [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours am: 272f241fd4 -s ours am: ce22e01572 -s ours
am: f1f45f8be9 -s ours
am skip reason: subject contains skip directive

Change-Id: Icf5a0a472da082c1b6fe07cac70b4b7e31be4818
2019-08-26 14:17:14 -07:00
Bill Yi
1cc9baf510 [automerger skipped] Import translations. DO NOT MERGE am: 18183ad552 -s ours am: 89f71578fc -s ours
am: bc86400e94 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie6f37961134fe151a7992ccf29e652f4b689bd6d
2019-08-26 13:55:18 -07:00
Bill Yi
55fa430030 [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours am: acd8a48b6c -s ours am: 0a4c821751 -s ours
am: 050918c710 -s ours
am skip reason: subject contains skip directive

Change-Id: I18edde858159ab2015f1bcee0c7042161cd1b50f
2019-08-26 13:49:07 -07:00
Xin Li
158de1bee6 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bd8030e8b2 -s ours am: aba2be1b76 am: cfb15a41ff
am: 353864df86 -s ours
am skip reason: subject contains skip directive

Change-Id: I12ae6bc3326bb77bac23bb96897e25fff6545284
2019-08-26 13:35:26 -07:00
Bill Yi
f1f45f8be9 [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours am: 272f241fd4 -s ours
am: ce22e01572 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifca4d60381bfa6a02231fffc129613ee2d85d80a
2019-08-26 13:33:07 -07:00
Bill Yi
bc86400e94 [automerger skipped] Import translations. DO NOT MERGE am: 18183ad552 -s ours
am: 89f71578fc -s ours
am skip reason: subject contains skip directive

Change-Id: Ib3a283cbe6ce6304774bb5b69481bd209f704e6a
2019-08-26 12:57:21 -07:00
Bill Yi
050918c710 [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours am: acd8a48b6c -s ours
am: 0a4c821751 -s ours
am skip reason: subject contains skip directive

Change-Id: I89dda01cb409f7eba0d8e31e8ef76baf22bc9a87
2019-08-26 12:53:09 -07:00
Xin Li
00eaea634e [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: f92905cfe9 -s ours am: 657ac4e451 am: 2b7dd17756
am: 64f11bf200 -s ours
am skip reason: subject contains skip directive

Change-Id: I7c8ff7878faf8398bd37273987237347f2719570
2019-08-26 12:40:31 -07:00
Xin Li
353864df86 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bd8030e8b2 -s ours am: aba2be1b76
am: cfb15a41ff

Change-Id: I1a9e295c603ad011d184abb3fba2389174286f31
2019-08-26 12:37:17 -07:00
TreeHugger Robot
d9989fc62b Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev 2019-08-26 19:04:13 +00:00
Jayachandran Chinnakkannu
0dc28d0187 Merge "[Settings] hide preferred network mode UI" into qt-r1-dev am: 7afb9854a7 am: b5617b6f21
am: f51fdf64a9

Change-Id: Iebcaff0317b527481618ed076859ecb03cc879e3
2019-08-26 11:52:28 -07:00
Xin Li
64f11bf200 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: f92905cfe9 -s ours am: 657ac4e451
am: 2b7dd17756

Change-Id: I3e80710150b862745a3469c762e4028a4fa23299
2019-08-26 11:39:51 -07:00
Jayachandran Chinnakkannu
f51fdf64a9 Merge "[Settings] hide preferred network mode UI" into qt-r1-dev am: 7afb9854a7
am: b5617b6f21

Change-Id: Ia137a3f3454cff7af7c3aa7195eb89c049fadaf2
2019-08-26 11:39:22 -07:00
TreeHugger Robot
02b3cf16aa Merge "Import translations. DO NOT MERGE" 2019-08-26 18:15:35 +00:00
Bill Yi
ce22e01572 [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours
am: 272f241fd4 -s ours
am skip reason: subject contains skip directive

Change-Id: I087b9c5b1524db8692a51d6d648fbcc4391d6d21
2019-08-26 10:57:36 -07:00
Bill Yi
89f71578fc [automerger skipped] Import translations. DO NOT MERGE
am: 18183ad552 -s ours
am skip reason: subject contains skip directive

Change-Id: Idfa1574adf65da278f9f428610e30c0c258d915b
2019-08-26 10:55:23 -07:00
Bill Yi
0a4c821751 [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours
am: acd8a48b6c -s ours
am skip reason: subject contains skip directive

Change-Id: Id08d6339706794b2ea849de8285f0882e1a31d75
2019-08-26 10:54:50 -07:00
Bill Yi
80589d367d [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours
am: 272f241fd4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ieaabc566a4f74cc640f6f7bd5ddc4fc66ca45d69
2019-08-26 10:52:55 -07:00
Bill Yi
b671fd6e92 [automerger skipped] Import translations. DO NOT MERGE am: 9781a780e4 -s ours
am: 3f81ee5f55 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib65073f9a1161dba172d249004409041d8c604be
2019-08-26 10:52:20 -07:00
Bill Yi
1168870624 [automerger skipped] Import translations. DO NOT MERGE
am: 18183ad552 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaef7f84ffabe3b1238ed4c3f65330fbb9b43ed38
2019-08-26 10:52:18 -07:00
Bill Yi
272f241fd4 [automerger skipped] Import translations. DO NOT MERGE
am: 2a7b5e2abc -s ours
am skip reason: subject contains skip directive

Change-Id: Id5178f84c020fa9a56f7159f44df89f7c069c5f9
2019-08-26 10:48:23 -07:00
Bill Yi
acd8a48b6c [automerger skipped] Import translations. DO NOT MERGE
am: 2a7b5e2abc -s ours
am skip reason: subject contains skip directive

Change-Id: Ie41ed82249c2c5296d1bb030e37518bcbf1bcb5b
2019-08-26 10:47:40 -07:00
Bill Yi
c6b2785d65 [automerger skipped] Import translations. DO NOT MERGE
am: 9781a780e4 -s ours
am skip reason: subject contains skip directive

Change-Id: I702fcf7582392b0e0b6d20a19844702786a90d5e
2019-08-26 10:47:16 -07:00
Bill Yi
3f81ee5f55 [automerger skipped] Import translations. DO NOT MERGE
am: 9781a780e4 -s ours
am skip reason: subject contains skip directive

Change-Id: Id9c07a0e7ae93ab863f31bacdd6447c9118af59a
2019-08-26 10:45:16 -07:00
Bill Yi
e3cbf6a8d1 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If0c4f3a5f240a8da2bfd94c4496f4a86fabb02e9
2019-08-26 05:46:44 -07:00
Bill Yi
29e2efdad1 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8f245fc67033985824bbd6e410f0163c39d6c162
2019-08-26 05:32:34 -07:00