Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,315 Commits 1 Branch 0 Tags
5486a2fdd48c647be4e047a2d76323f8a70f82f8
Commit Graph

62315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
5486a2fdd4 Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6 am: 3366290e20 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268

Change-Id: Iad124b74fc6c55d2220d340fbe14ae85ddcb1d13
 2020-07-28 19:33:12 +00:00
Treehugger Robot
3366290e20 Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268

Change-Id: Icebef90c2b18b36e5112d94aae02ae770ab300d3
 2020-07-28 19:05:02 +00:00
Treehugger Robot
ed7662f6f6 Merge "BluetoothPairingRequest: Add null check for action" 2020-07-28 18:51:00 +00:00
Treehugger Robot
b2a470166e Merge "More inclusive language." am: 4be2b5c2f6 am: ef56fb20c3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: I4cd918e07ced74d846b75f01550f57e447229d51
 2020-07-28 10:58:05 +00:00
Treehugger Robot
ef56fb20c3 Merge "More inclusive language." am: 4be2b5c2f6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: I4848004145a681e49a75a3f2d6e267b32c424585
 2020-07-28 10:42:13 +00:00
Treehugger Robot
4be2b5c2f6 Merge "More inclusive language." 2020-07-28 10:25:10 +00:00
Alan Stokes
cd2c453cbd More inclusive language. 
Test: Builds
Bug: 161896447
Change-Id: Ie4d64dca9f4720eea532b534162e47ed81aea03b
 2020-07-27 18:21:56 +01:00
Chen Chen
fc7b6693ee BluetoothPairingRequest: Add null check for action 
Bug: 159728132
Test: Build

Change-Id: I24668e20accf96c7469c9e1ab589b1383ab59d18
Merged-In: I24668e20accf96c7469c9e1ab589b1383ab59d18
(cherry picked from commit 1805f666e7)
 2020-07-24 14:54:35 -07:00
Anton Hansson
afc6e0ac41 [automerger skipped] Merge "Add explicit dep on ims-common" am: 0f6b2ec233 am: 7fe08c1923 -s ours 
am skip reason: Change-Id Ic663e206a0e2e780be2f27b5d539c274d4eef245 with SHA-1 d3c9df3e7e is in history

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

Change-Id: I5a18c3037d6533ff85bf1f812cdc5214f99f2f50
 2020-07-22 16:33:32 +00:00
Anton Hansson
7fe08c1923 Merge "Add explicit dep on ims-common" am: 0f6b2ec233 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1370159

Change-Id: I4a02bab9e52768605891f076f504256b3198fa4a
 2020-07-22 16:11:05 +00:00
Anton Hansson
0f6b2ec233 Merge "Add explicit dep on ims-common" 2020-07-22 15:55:41 +00:00
Anton Hansson
3d12fcb246 Add explicit dep on ims-common 
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Bug: 157451444
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval: cp from internal
Change-Id: Ic663e206a0e2e780be2f27b5d539c274d4eef245
Merged-In: Ic663e206a0e2e780be2f27b5d539c274d4eef245
 2020-07-22 14:40:27 +00:00
Treehugger Robot
7643891ae7 Merge "Remove "storage type" preference from Settings" am: d6ac86d602 am: 44c538ccef 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609

Change-Id: I2e9fc90f247f4b088f749afeb75a0b3e67e73198
 2020-07-22 09:07:27 +00:00
Treehugger Robot
44c538ccef Merge "Remove "storage type" preference from Settings" am: d6ac86d602 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609

Change-Id: I2c12af92fc35cbfc73a58773023bd2f36edeab15
 2020-07-22 08:52:21 +00:00
Treehugger Robot
d6ac86d602 Merge "Remove "storage type" preference from Settings" 2020-07-22 08:34:56 +00:00
Treehugger Robot
b85a454835 Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1 am: bf44d4eed2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1369637

Change-Id: I8a0952d30e00f35779fd127abe9677a002f83186
 2020-07-22 06:58:04 +00:00
Treehugger Robot
bf44d4eed2 Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1369637

Change-Id: I46f554c200cb9f1c20e03a98f7188f3799bb6b5d
 2020-07-22 06:46:52 +00:00
Treehugger Robot
01eeece2f1 Merge "Improve the performance of displaying preference - multithread." 2020-07-22 06:33:42 +00:00
Zoey Chen
c33f162fc9 Improve the performance of displaying preference - multithread. 
Test: manual test, use command to run MobileNetworkSettings and record it.
Bug: 161691402
Change-Id: I33be3fab9eb470b48c0d0870d4c03cdaecbac334
Merged-In: I33be3fab9eb470b48c0d0870d4c03cdaecbac334
 2020-07-22 13:17:43 +08:00
Bill Yi
cd282d2f47 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e3e30c796380b104bffd9e627231fa76eb6f8d8
 2020-07-21 19:29:08 +00:00
joffenberg
43ee102921 Remove "storage type" preference from Settings 
Since storage type is mandated as hardware-backed, this preference is no longer meaningful.

Bug: 160225361
Test: atest SettingsRoboTests
Change-Id: I9b6c1d6afdd3563201b1e85673acf4d8cb81c0a1
 2020-07-21 17:18:47 +02:00
Anton Hansson
40a8846e54 Add explicit dep on framework-wifi.impl 
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Bug: 157451444
Bug: 161767237
Test: m RunSettingsRoboTests
Merged-In: I800b434c8049121db115cff87d51e164e4529999
Change-Id: I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb
 2020-07-21 10:18:51 +01:00
Anton Hansson
d3c9df3e7e Add explicit dep on ims-common 
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Bug: 157451444
Test: m RunSettingsRoboTests
Change-Id: Ic663e206a0e2e780be2f27b5d539c274d4eef245
 2020-07-21 10:18:39 +01:00
Treehugger Robot
f876f3d0cc Merge "Fix mvno data field summary not update issue" am: 4615179fc5 am: 36c9ca1f2c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603

Change-Id: I21df066581d1f2a43b693026a7a389da81922f05
 2020-07-21 07:12:31 +00:00
Treehugger Robot
36c9ca1f2c Merge "Fix mvno data field summary not update issue" am: 4615179fc5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603

Change-Id: Idf9f8b66f9b65f4118b8b2abd32eca2a076aea79
 2020-07-21 06:58:14 +00:00
Treehugger Robot
4615179fc5 Merge "Fix mvno data field summary not update issue" 2020-07-21 06:44:08 +00:00
Bill Yi
708e1e4f9e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I71c7609f5c78b3042c980428f08dbe0eb6db5b67
 2020-07-20 21:45:04 -07:00
Neil Fuller
173a7e73b3 Merge "Track core platform API change" am: 1d45573eb2 am: 83d7191a22 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136

Change-Id: I7cb7175a827aae27836324e0865c9a6d5ff6b5ed
 2020-07-20 15:07:02 +00:00
Neil Fuller
83d7191a22 Merge "Track core platform API change" am: 1d45573eb2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136

Change-Id: Ib891567707808332c1fda6228fbb191b13f7df38
 2020-07-20 14:45:41 +00:00
Neil Fuller
1d45573eb2 Merge "Track core platform API change" 2020-07-20 14:39:35 +00:00
Neil Fuller
d1c4ea906f Track core platform API change 
This commit tracks changes in libcore to extend the IDs recognized
to be associated with a country.

Bug: 155738410
Test: treehugger
Change-Id: I0d75b6c41cdce4a373f73761ccd2d7db357d6548
 2020-07-20 11:26:14 +01:00
TreeHugger Robot
733eed05c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9d2c4d6d4618a167af1c5627d5d7918a404f398
 2020-07-18 22:30:28 +00:00
TreeHugger Robot
a118c94070 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-07-18 22:14:24 +00:00
Bill Yi
504c673017 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If5aefe4449fb12bc20991bc9f55da58264b9bb72
 2020-07-18 01:41:07 -07:00
TreeHugger Robot
2101d1230a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic225851e46b0907dcb136e74b46b09c01e3b0b8c
 2020-07-18 01:01:32 +00:00
TreeHugger Robot
8469a447c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-07-18 00:49:01 +00:00
Treehugger Robot
b66acd05db [automerger skipped] Merge "Remove NR NSA from voice network type" am: 46a50b35be am: df7e42a213 -s ours 
am skip reason: Change-Id I77d92fab0020da356ae43293016237be7494c1e2 with SHA-1 4b5e95daa1 is in history

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

Change-Id: I0b5fe9de55e71422abb8f82fb6ca85c5d627b123
 2020-07-17 18:48:00 +00:00
Treehugger Robot
df7e42a213 Merge "Remove NR NSA from voice network type" am: 46a50b35be 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930

Change-Id: Ic9f0a1b78d4bd5321dbc8ab814246d62d419a563
 2020-07-17 18:16:14 +00:00
Treehugger Robot
46a50b35be Merge "Remove NR NSA from voice network type" 2020-07-17 17:57:43 +00:00
Bill Yi
706bd58d00 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic3517eef64e0f59a1f7f46d3138e3898a62eb7b9
 2020-07-17 08:35:46 -07:00
Treehugger Robot
3330abffe8 [automerger skipped] Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6 am: 73a28754f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1dd28625768cf364bbaee112a8b2ad4a767cb556
 2020-07-17 09:01:21 +00:00
Eran Messeri
f853d0fd25 [automerger skipped] [DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7 am: 091c73f768 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida2e692c72cd1c79d95ae6b0e99196d05fa843e0
 2020-07-17 09:01:18 +00:00
Treehugger Robot
73a28754f1 Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547

Change-Id: I5c4f7993abf41fbbefca12962061451345c2e62e
 2020-07-17 08:43:40 +00:00
Eran Messeri
091c73f768 [DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547

Change-Id: Ie170b54b9b15d3abff3ec883d943d597b3719a77
 2020-07-17 08:43:38 +00:00
Treehugger Robot
01ec6774e6 Merge "[DO NOT MERGE] Rollup Cert-related changes from R" 2020-07-17 08:28:38 +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
15d9351ba0 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev 2020-07-15 13:50:34 +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
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