PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,961 Commits 1 Branch 0 Tags
6e3bbccf2da3edfae68b5043d24ffcb57754bbcc
Commit Graph

74961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
András Klöczl
d037ba59a7 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 62f8eba220 am: 5f1984a185 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: Icb990b7b55ecf61eda908eab2467f2b080b3e228
 2020-07-15 14:34:18 +00:00
András Klöczl
0e8881b6a0 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 850263d0c6 am: 3bc6e61a44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: I3a474956dd0591bc760ab9aba86fd7476f776eb8
 2020-07-15 14:34:10 +00:00
András Klöczl
5f1984a185 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 62f8eba220 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: I5c3c52b369634f0fd531eabc23397033c1ec2919
 2020-07-15 14:19:56 +00:00
András Klöczl
46922c26f6 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 850263d0c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: I20cc9c95340b76f81ab6c207ad0dcc2fcbf1d3eb
 2020-07-15 14:19:44 +00:00
András Klöczl
3bc6e61a44 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 850263d0c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: Ibc484a119111a84ac0fc6d9ab2b0ab42062fe71d
 2020-07-15 14:19:30 +00:00
Eran Messeri
f37c8cb4f7 [DO NOT MERGE] Rollup Cert-related changes from R 
This change includes the following commits from internal R branch
which are related to certificate management:

0206e76f46 CredentialStorage: Install keys using KeyChain
09ceea53d9 Added functionality to select type of certificate to be installed from the Settings app
3acf3f5433 WiFi certificates installable from Wifi sub-preference
8439fd15f7 Fix strings for certificate installation in Settings

Bug: 161347472
Test: builds & manual testing
Change-Id: Ia59dc4780254fab4f34c2f61b25f3b4e56ed7b77
 2020-07-15 15:12:06 +01:00
András Klöczl
62f8eba220 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: I74c9bb596375c68bf414f208d8ad4b6058cf4d37
 2020-07-15 14:04:09 +00:00
András Klöczl
850263d0c6 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: I149473b03717cdbb10aede744e00e34f813b44ac
 2020-07-15 14:03:57 +00:00
András Klöczl
15d9351ba0 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev 2020-07-15 13:50:34 +00:00
Bonian Chen
a5f08854e3 [Settings] Inclusive language for Data Usage 
Change wordings in data usage part into inclusive language.

Bug: 160707804
Test: make RunSettingsRoboTests
Change-Id: I713e52df8201413b884257a51bc1f71a0d43179d
 2020-07-15 02:52:32 +00:00
TreeHugger Robot
721980f0e0 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 0d34f6c80b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148946

Change-Id: I5057ed485a93b06f47edc0fa00d2e050a35bd996
 2020-07-14 17:25:03 +00:00
TreeHugger Robot
0d34f6c80b Merge "Import translations. DO NOT MERGE" 2020-07-14 17:08:29 +00:00
Bill Yi
4acd7e2fc3 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: d3265e35db -s ours am: 697f0fc11d -s ours am: 151541c799 -s ours am: cc67039237 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: Ib8ee3e372d0f635b3e0b0acd557bf498678a27cb
 2020-07-14 16:51:18 +00:00
Bill Yi
eb13c0f950 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: 0e7fdac130 -s ours am: 7871d50a53 -s ours am: f7b0915e1b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: I7c26b636bb4168229728df852948a8ad9603ba81
 2020-07-14 16:51:10 +00:00
Bill Yi
35940af77f [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: f9cf7d32ec -s ours am: cad5554144 -s ours am: 16c7d140f8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: I3e65ad5f3ec93472b7993736609b40519e640d31
 2020-07-14 16:51:04 +00:00
Automerger Merge Worker
a3ae061a57 Merge "[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 2580a067e1 -s ours" into rvc-qpr-dev-plus-aosp am: adb5b7c931 -s ours am: f782f2c357 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941

Change-Id: I8a59810e40f2bca92f4e168d3709d8cb63ed5aeb
 2020-07-14 16:50:59 +00:00
Bill Yi
2231174c27 [automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 182290e9b8 -s ours am: 78f997a771 -s ours am: 9d194989c3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941

Change-Id: I2cbe7933d3f55076800fe4293a615fc4e3c56ab7
 2020-07-14 16:50:50 +00:00
Bill Yi
cc67039237 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: d3265e35db -s ours am: 697f0fc11d -s ours am: 151541c799 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: Ie4f7cff75bf87654b3bdb323f0c9de15143f0f1c
 2020-07-14 16:33:33 +00:00
Bill Yi
f7b0915e1b [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: 0e7fdac130 -s ours am: 7871d50a53 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: I75aebcd1025af49cfd36c7d86b209f3ad8e00b81
 2020-07-14 16:33:27 +00:00
Bill Yi
16c7d140f8 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: f9cf7d32ec -s ours am: cad5554144 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: Ide8c612ccfa5bc5677005563bd2221dd55b381af
 2020-07-14 16:33:21 +00:00
Automerger Merge Worker
f782f2c357 Merge "[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 2580a067e1 -s ours" into rvc-qpr-dev-plus-aosp am: adb5b7c931 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941

Change-Id: I6dc136cce85c1115b2003566984f4274023d3ab2
 2020-07-14 16:33:16 +00:00
Bill Yi
9d194989c3 [automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 182290e9b8 -s ours am: 78f997a771 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941

Change-Id: Ie094c69976f3c5d0cf7d8da8850830558ea247ae
 2020-07-14 16:33:02 +00:00
Bill Yi
151541c799 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: d3265e35db -s ours am: 697f0fc11d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: Iaedccbda4b1463dcf0a59747eb806e6b2b78f261
 2020-07-14 16:19:34 +00:00
Bill Yi
7871d50a53 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: 0e7fdac130 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: I3b00968bc0b9079dbd022cc18bd877f6d7646cb8
 2020-07-14 16:19:27 +00:00
Bill Yi
697f0fc11d [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: d3265e35db -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: Ib535f86258804daf779ed6267509978332564780
 2020-07-14 16:19:23 +00:00
Bill Yi
cad5554144 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: f9cf7d32ec -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: Ic0caea5e5332f9bb11208e4eee81d367037dcb79
 2020-07-14 16:19:13 +00:00
Automerger Merge Worker
adb5b7c931 Merge "[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 2580a067e1 -s ours" into rvc-qpr-dev-plus-aosp 2020-07-14 16:19:10 +00:00
Bill Yi
9808f1f5f7 [automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 2580a067e1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941

Change-Id: I9138a2e6f5de4811b14fcfe4f94ae7c65423d68b
 2020-07-14 16:19:05 +00:00
Bill Yi
78f997a771 [automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 182290e9b8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941

Change-Id: Iee9dd527d25ce6f7e7887ffdae99dd2cd568c6bb
 2020-07-14 16:19:01 +00:00
Bill Yi
f9cf7d32ec [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: I2e7ca6f0d84fd0f4606f76f2aace8e7968710c0b
 2020-07-14 16:05:13 +00:00
Bill Yi
2580a067e1 [automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941

Change-Id: Ic80d575d02bc7a2886b527c3fa4fa8886b68c21f
 2020-07-14 16:05:07 +00:00
Bill Yi
0e7fdac130 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: I2689b64d28c8959cf3f61d31ebca5bdcb610a6ea
 2020-07-14 16:05:02 +00:00
Bill Yi
d3265e35db [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: Id91d7e77943acb2d0b08d64615b20da8577ecf83
 2020-07-14 16:04:59 +00:00
Bill Yi
182290e9b8 [automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941

Change-Id: If81c15739006a0e476938a21e5739163f07ad565
 2020-07-14 16:04:50 +00:00
Bill Yi
35632cb1c2 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: Id35fed36fc4331df55138a82a2f4ead80d7c5d4a
 2020-07-14 16:04:49 +00:00
Andras Kloczl
57154fbac3 Fix multi user crash when Add guest was tapped multiple times 
When "Add guest" got tapped multiple times then the first click starts
the guest creation process which blocks the UI thread for around 2-3
seconds, then triggers the open guest details intent, and the second
tap event starts another guest creation, but it fails (since there
can't be more than 1 guest on the device) and returns null, and in the
openUserDetails we get NullPointerException.

Test: manual test
Video: http://shortn/_i4Dce33yhl
Bug: 160267016
Change-Id: I9a4f0a91295e336d246abe5f5470682a14cb510f
 2020-07-14 14:34:57 +01:00
Bill Yi
289d2bf059 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: If55c745f90b6527fc1e0cf1d570ee0e2463b68a6
 2020-07-14 06:25:04 -07:00
Bill Yi
a58e5de4c9 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I3d7b397ba8a39c5f6a7ac75e0fa505be39b48775
 2020-07-14 04:13:50 -07:00
Bill Yi
2532f0b32c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I30a4580a86030d499cdaa42ee082af185543ee6d
 2020-07-14 02:03:30 -07:00
TreeHugger Robot
d43819f810 Merge "Restore original importance when unblocking notif channel" into rvc-qpr-dev am: 8fca94f56c am: 8870591ab3 am: 29aad71c6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139829

Change-Id: Iec588d59a9e0a1272aea1ea9d9a70417b992c44b
 2020-07-14 00:33:57 +00:00
Julia Reynolds
796af9d51b Update font family am: 1a44a98f34 am: 63a9f32547 am: a00e6960ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139828

Change-Id: Iee0d5decc56966919c39446b1b26c624239c599a
 2020-07-14 00:32:55 +00:00
TreeHugger Robot
29aad71c6e Merge "Restore original importance when unblocking notif channel" into rvc-qpr-dev am: 8fca94f56c am: 8870591ab3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139829

Change-Id: If460eff74cfc509c5e49bf98f1742a1de187805d
 2020-07-14 00:01:36 +00:00
Julia Reynolds
a00e6960ea Update font family am: 1a44a98f34 am: 63a9f32547 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139828

Change-Id: I84e1d696e29a2099ed671e83e4c1f579bfd55bd9
 2020-07-14 00:01:18 +00:00
TreeHugger Robot
8870591ab3 Merge "Restore original importance when unblocking notif channel" into rvc-qpr-dev am: 8fca94f56c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139829

Change-Id: I3a2a93b4cc2f0e5630f51635cc9313845bb05015
 2020-07-13 23:46:24 +00:00
Julia Reynolds
63a9f32547 Update font family am: 1a44a98f34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12139828

Change-Id: I3a4d2eb6abcbf531f94f21c23abe85070f71bd84
 2020-07-13 23:46:10 +00:00
TreeHugger Robot
8fca94f56c Merge "Restore original importance when unblocking notif channel" into rvc-qpr-dev 2020-07-13 23:34:13 +00:00
Julia Reynolds
2700b83c48 Restore original importance when unblocking notif channel 
Test: atest
Fixes: 62355992
Change-Id: I5d764d0ade68b2ce5708ae79e9ef488ab57bb141
(cherry picked from commit e2a8266328)
 2020-07-13 20:13:43 +00:00
Julia Reynolds
1a44a98f34 Update font family 
For notification settings, to match the inline settings

Test: manual
Fixes: 153886531
Change-Id: Ie338080bd35a8dc2715330f3b82c272b0be81d54
(cherry picked from commit edb8dd0ec4)
 2020-07-13 20:11:20 +00:00
Automerger Merge Worker
8f63a8890b Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56" into rvc-d1-dev-plus-aosp am: b1a75b7f66 am: b5ec6fafda am: b9035f6bab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: Ie57fa5a2f470d963542b3f4c0cb0f5ccda11c27b
 2020-07-13 17:59:47 +00:00
Automerger Merge Worker
7a8d2df9e3 Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a am: 03edb83f56 am: ffda931026" into rvc-qpr-dev-plus-aosp am: 567afca630 am: 8cbd1da319 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974

Change-Id: I8bf8ed0a4f75e93ece1726ac2f1e53765686c6f1
 2020-07-13 17:59:22 +00:00