PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,790 Commits 1 Branch 0 Tags
4f05fc52bfa71b50aeeca32f630ac4ff24c5dc12
Commit Graph

53790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
5a73aed8fb [automerger skipped] Import translations. DO NOT MERGE am: 23e86df342 -s ours 
am: afd0e671c7 -s ours
am skip reason: subject contains skip directive

Change-Id: I44ad85e5865a7ddf1d5865562376eee79c558d6e
 2019-06-18 07:56:58 -07:00
Bill Yi
2ee4922fc0 [automerger skipped] Import translations. DO NOT MERGE am: 23e86df342 -s ours 
am: 6fd15de6f6 -s ours
am skip reason: subject contains skip directive

Change-Id: I473acfaa712493f1968f3a34481f45b4f00718d1
 2019-06-18 07:55:30 -07:00
Bill Yi
6fd15de6f6 [automerger skipped] Import translations. DO NOT MERGE 
am: 23e86df342 -s ours
am skip reason: subject contains skip directive

Change-Id: I30e310a0e002907d0c0feff041d803dfe7705a54
 2019-06-18 07:51:33 -07:00
Bill Yi
afd0e671c7 [automerger skipped] Import translations. DO NOT MERGE 
am: 23e86df342 -s ours
am skip reason: subject contains skip directive

Change-Id: I849487ffafff0f0585ca6a8cf47c912870bbbca0
 2019-06-18 07:47:28 -07:00
Bill Yi
23e86df342 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Iac730b3d5c81a72cd072a25c203e67035fae3cf6
 2019-06-18 06:25:01 -07:00
Andrew Sapperstein
e54ccf67ec Merge "Add string for module license." into qt-dev am: 05ee8ba830 
am: e6f8d61135

Change-Id: I5f87f5fc3d107d3d6a3e72b672f928cb86efbda6
 2019-06-17 20:00:33 -07:00
Andrew Sapperstein
5022730330 Merge "Add string for module license." into qt-dev am: 05ee8ba830 
am: 935eac5c7f

Change-Id: I4366da3dc3205c78eae265ae24354a8a07e019bf
 2019-06-17 19:59:31 -07:00
Andrew Sapperstein
e6f8d61135 Merge "Add string for module license." into qt-dev 
am: 05ee8ba830

Change-Id: I92e73c1774cc32bfc9cfbb3f6ce9470e9410871a
 2019-06-17 19:45:27 -07:00
Andrew Sapperstein
935eac5c7f Merge "Add string for module license." into qt-dev 
am: 05ee8ba830

Change-Id: I186442a7015dc0fa60a9eadbb9a40b8c4dfdfb83
 2019-06-17 19:45:26 -07:00
TreeHugger Robot
05ee8ba830 Merge "Add string for module license." into qt-dev 2019-06-18 02:27:09 +00:00
Bookatz
778bac8717 Merge "If cannot add restricted profile, don't suggest it" into qt-dev am: a5018be48a 
am: 58f6926882

Change-Id: I01484fd5f19146dc37f23eeb66be7f053a55f43b
 2019-06-17 19:12:01 -07:00
Kevin Chyn
0a519b9cbb Merge "Do not allow toggle to be clickable/focusable" into qt-r1-dev 
am: 5ac3690908

Change-Id: I19725e4ddc93a162ee3570b81cc6810b9be57cff
 2019-06-17 19:07:53 -07:00
Bookatz
426d0a70fa Merge "If cannot add restricted profile, don't suggest it" into qt-dev am: a5018be48a 
am: 6a3f2bfe2a

Change-Id: Ic605faf3fbaf042ef9e9336a70973cb13fe38592
 2019-06-17 18:54:09 -07:00
Bookatz
58f6926882 Merge "If cannot add restricted profile, don't suggest it" into qt-dev 
am: a5018be48a

Change-Id: I76b1faf3e21f5b552ef3ad80660dee0786234d15
 2019-06-17 18:43:05 -07:00
Bookatz
6a3f2bfe2a Merge "If cannot add restricted profile, don't suggest it" into qt-dev 
am: a5018be48a

Change-Id: Ic94e5f918a0db96dd21d8f719231bb65f31bd613
 2019-06-17 18:43:04 -07:00
Kevin Chyn
5ac3690908 Merge "Do not allow toggle to be clickable/focusable" into qt-r1-dev 2019-06-18 01:40:35 +00:00
TreeHugger Robot
a5018be48a Merge "If cannot add restricted profile, don't suggest it" into qt-dev 2019-06-18 00:47:16 +00:00
Bill Yi
f0ae19caf4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 99808b4824 -s ours 
am: 2a96b7f13e -s ours
am skip reason: subject contains skip directive

Change-Id: I7fafbd896e3848f5db1750f6aa19986ad9c08b60
 2019-06-17 16:50:40 -07:00
Bill Yi
605e269e57 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 99808b4824 -s ours 
am: 8ca571f9be -s ours
am skip reason: subject contains skip directive

Change-Id: Ida3bd3cf5febf94828981e71997025170febedbf
 2019-06-17 16:49:44 -07:00
Android Build Merger (Role)
50bb07c812 Merge "Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc am: d13fb40c4c" into qt-r1-dev-plus-aosp 2019-06-17 23:48:22 +00:00
tmfang
dcfde9c65d Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc 
am: aa36567d4a

Change-Id: I9131887e90314e41bb7f431dd05675eee513486e
 2019-06-17 16:47:32 -07:00
tmfang
3cc51bc280 Merge "Get rid of "Assistant" from apps summary" into qt-dev am: a0ed4291dc 
am: d13fb40c4c

Change-Id: Ic35cea1804c77b44136823a3cf7cf422717b343d
 2019-06-17 16:47:32 -07:00
Bill Yi
2a96b7f13e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 99808b4824 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib835b3160d2394d5e1f177f16065b653804d62bd
 2019-06-17 16:46:18 -07:00
Bill Yi
8ca571f9be [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 99808b4824 -s ours
am skip reason: subject contains skip directive

Change-Id: Icfdb259298fe0246039daa2a518fc9a9492c92ab
 2019-06-17 16:44:18 -07:00
tmfang
aa36567d4a Merge "Get rid of "Assistant" from apps summary" into qt-dev 
am: a0ed4291dc

Change-Id: Ia0f9ef06ff90d8b355cceeb6302763119d8d29f0
 2019-06-17 16:35:20 -07:00
TreeHugger Robot
99808b4824 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-17 23:35:01 +00:00
tmfang
d13fb40c4c Merge "Get rid of "Assistant" from apps summary" into qt-dev 
am: a0ed4291dc

Change-Id: I35bbd8e9f3000160c077f630511993198ab4b321
 2019-06-17 16:34:20 -07:00
Andrew Sapperstein
25efb623eb Add string for module license. 
Bug: 135183006
Test: is string addition
Change-Id: I6764331d4ef33242b0bef913f32a62799df173c3
 2019-06-17 16:28:21 -07:00
TreeHugger Robot
a0ed4291dc Merge "Get rid of "Assistant" from apps summary" into qt-dev 2019-06-17 23:05:51 +00:00
Bill Yi
cbd3b1121b Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 135215049
Change-Id: I48aaceea6d191bf7af302ad0365505fe96c2e186
 2019-06-17 22:15:58 +00:00
Kevin Chyn
92d2aae337 Do not allow toggle to be clickable/focusable 
The entire preference is already clickable/focusable. Also, changed it so that
the entire preferenceview is clickable/focusable in non-accessibility mode as well
to better match Settings UX.

Also, no need to setClickable, since it is already by default

Fixes: 130398575

Test: With and without accessibility turned on, toggle works
Test: With accessibility turned on, toggle no longer takes a separate
      focus in addition to the preference

Change-Id: Iaff05cdf350f8d4f4c0f53b539770a7ad1f7d8ad
 2019-06-17 13:15:21 -07:00
Bookatz
673bc9d01c If cannot add restricted profile, don't suggest it 
Previously, on devices that cannot add a restricted profile (e.g. most
phones), the Multiple users menu had an option to "Add user", whereas
for devices that can, the option read "Add user or profile". Now it only
says the latter, due to ag/6412347. We add back the original wording
here.

Fixes: 135294519
Test: manual confirmation on a phone that text says "Add user"
Test: m -j ROBOTEST_FILTER=UserSettingsTest RunSettingsRoboTests
Change-Id: Ia166b6ff9c69c0042e8a781be1146a5622177121
 2019-06-17 18:33:16 +00:00
Android Build Merger (Role)
ada83062de Merge "Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a am: 72bb3cc1f6" into qt-r1-dev-plus-aosp 2019-06-17 12:56:46 +00:00
Ivan Podogov
aa813f5618 Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a 
am: 8573d27d31

Change-Id: Id273f48d67715e3dfdea60873a20c5ae7a7adefc
 2019-06-17 05:56:12 -07:00
Ivan Podogov
c30147fbeb Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a 
am: 72bb3cc1f6

Change-Id: If74071d670615083d308566edb7d0af4c6a9b42b
 2019-06-17 05:56:10 -07:00
Ivan Podogov
8573d27d31 Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev 
am: 9a1c75c57a

Change-Id: Ib61dae6c30e90500aaec381a6eb5f7f7a82bc610
 2019-06-17 05:49:13 -07:00
Ivan Podogov
72bb3cc1f6 Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev 
am: 9a1c75c57a

Change-Id: Idf96f32733b5a3aedab325cbeba4b67c1d20ce24
 2019-06-17 05:49:13 -07:00
Ivan Podogov
9a1c75c57a Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev 2019-06-17 12:39:10 +00:00
Sunny Shao
d7d4a7ce6d Fixed the IllegalStateException on removing account 
We display a dialog in AccountManager.removeAccountAsUser() callback, but at that
time fragment is onstop() which causes the IllegalStateException.

Fixes: 133253227
Fixes: 135004255
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.accounts
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.core
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.dashboard

Change-Id: I8534e8f7118234f6346607415698f9f91c3e5ffb
(cherry picked from commit d843ee85de)
 2019-06-17 10:30:21 +00:00
tmfang
720e92f62e Get rid of "Assistant" from apps summary 
Since "Notification Assistant" is no longer in Q,
we should remove the relevant name in summary.

Test: Rebuild
Fixes: 134180282
Change-Id: I0f41955769ec020d2dd7fbbc8424c95f1b5a32d9
 2019-06-17 18:10:06 +08:00
Kevin Chyn
031affb92b Merge "Update string for work profile face unlock" into qt-r1-dev 
am: 5d8cd009fa

Change-Id: I5f5cd08614bccf299ae153cf199bb9f466c4673b
 2019-06-14 18:13:03 -07:00
Kevin Chyn
5d8cd009fa Merge "Update string for work profile face unlock" into qt-r1-dev 2019-06-15 00:49:36 +00:00
Mehdi Alizadeh
123325c668 Show a dialog with a slider to set the back gesture's sensitivity am: 7d43125964 
am: d8818a5a21

Change-Id: I2dbd27085109489e56ef916f31bf325c862dae92
 2019-06-14 17:23:12 -07:00
Mehdi Alizadeh
d8220f8a46 Show a dialog with a slider to set the back gesture's sensitivity am: 7d43125964 
am: 2fbd41a326

Change-Id: Iafbfb63497ff9b207bae3695ef1f660292e89804
 2019-06-14 17:20:45 -07:00
Mehdi Alizadeh
2fbd41a326 Show a dialog with a slider to set the back gesture's sensitivity 
am: 7d43125964

Change-Id: I64cf3b8725efb8f8377e4f9dac545743066b2cbb
 2019-06-14 17:11:54 -07:00
Mehdi Alizadeh
d8818a5a21 Show a dialog with a slider to set the back gesture's sensitivity 
am: 7d43125964

Change-Id: I8db63be340f8cf465599ad76ea52f8b2453de3c0
 2019-06-14 17:09:54 -07:00
Mehdi Alizadeh
7d43125964 Show a dialog with a slider to set the back gesture's sensitivity 
Bug: 131447780
Test: Manual test on device
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest

Change-Id: I9fcd1a50c77689118857326de0cf8082e835b491
 2019-06-14 23:40:11 +00:00
Lei Yu
feee521179 Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc 
am: 192367bef2

Change-Id: Ib92c2e2e2a2f72dcba2136433144cbe7bd342d45
 2019-06-14 16:06:52 -07:00
Lei Yu
daed3366ef Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc 
am: ab2a2b3d3f

Change-Id: Ic27910a58098eb4234e976cd2619a106bf4c347f
 2019-06-14 16:06:03 -07:00
Lei Yu
ab2a2b3d3f Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev 
am: b4d94a8ccc

Change-Id: I025073624de894f70216eb46bb9cd48e8435f9dd
 2019-06-14 15:59:10 -07:00