PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,528 Commits 1 Branch 0 Tags
b37895268a6611b337d45dd94f66c89abfe80c44
Commit Graph

86528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
48c945e9b5 [Settings] Expand the display area of PIN error message 
PIN error message when user operating on PIN lock got long text string.
Which not fit into 2 lines of display area.

This is a change to expand the display area to max. capacity but remain
tightly wrap the text.

Bug: 211176734
Test: local
Change-Id: If175a53de4646d2479b15b10f6b59e4e0870d521
 2021-12-21 14:08:58 +08:00
Xin Li
3be43ae165 Merge "Merge SP1A.211205.008" am: 0bf1802bb3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1930705

Change-Id: I8ce5af67e19d864ad3951c15252b0c3496fd56d0
 2021-12-21 05:21:38 +00:00
Xin Li
0bf1802bb3 Merge "Merge SP1A.211205.008" 2021-12-21 05:02:44 +00:00
Xin Li
971abb190b Merge SP1A.211205.008 
Bug: 205056467
Merged-In: I84848a2801172b46f7cc3ff39d88ad57e34514a4
Change-Id: I4227cf287bd7adffb3241954bd47284b7cd44fdf
 2021-12-20 14:15:09 -08:00
William Escande
23ebda4c12 Add QUERY_AUDIO_STATE permission 
This permission is added to getLastAudibleStream
Bug: 190422401
Tag: #refactor
Test: Build + start a2dp + play music + change volume from DUT/speaker

Change-Id: I65c5e6f50e7b440af57b2a0bd6656db91446578b
 2021-12-20 13:45:47 +01:00
Treehugger Robot
9713bec956 Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74 am: 9c2293ca92 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621

Change-Id: I8501963b7bd636b08107a1acd1495e74b355fea4
 2021-12-20 03:31:28 +00:00
Treehugger Robot
9c2293ca92 Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621

Change-Id: Ic05e38726cd2f42e919553a11eb0ce6944ce0d20
 2021-12-20 03:14:04 +00:00
Treehugger Robot
a3d97ecd74 Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" 2021-12-20 02:53:33 +00:00
Alice Kuo
27a0274d6e Add test case - forceUpdate_deviceIsSubDevice_doNothing 
Bug: 201472540
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest
Change-Id: I1aef6429b39109a09931a94b61f15e9470de3854
 2021-12-20 01:35:40 +00:00
Alex Johnston
6a8cbc9fac Fix USB tether option 
* USB tether option will be grayed out before
  USB cable is plugged in.

Bug: 192225597
Test: manual testing
Change-Id: Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e
Merged-In: Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e
(cherry picked from commit 685cacb540)
 2021-12-15 13:57:04 +00:00
Treehugger Robot
26bf610fd9 Merge "Settings: Extend the data role swap timeout value" am: bb994f627f am: df2a22f104 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1912875

Change-Id: I0d456509b02715b141a6110ef89a476995ce5d67
 2021-12-15 07:23:26 +00:00
Treehugger Robot
df2a22f104 Merge "Settings: Extend the data role swap timeout value" am: bb994f627f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1912875

Change-Id: I42a32278a74fd99f6f397c2c9d489f4bd94b3dc0
 2021-12-15 07:06:33 +00:00
Treehugger Robot
bb994f627f Merge "Settings: Extend the data role swap timeout value" 2021-12-15 06:49:44 +00:00
Android Build Coastguard Worker
0f86669be4 Merge cherrypicks of [16100469, 16184933, 16414971] into sc-qpr1-release. 
Change-Id: Id8b92050daec05bb9f6f4a94d120af46b15ee1f1
 2021-12-15 00:05:26 +00:00
Alex Johnston
3dd874316a Add non system overlay flag to InstallCaCertificateWarning 
Bug: 196969991
Test: Manual testing with Settings
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Change-Id: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
(cherry picked from commit 2f193c8157)
(cherry picked from commit 02e8f56e67)
Merged-In:Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
 2021-12-15 00:03:15 +00:00
Bill Yi
d2d3da3850 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6966abfdfdbf672b27528c1761eb23b95aefe521
(cherry picked from commit ffc0ed7b89)
Merged-In:I6966abfdfdbf672b27528c1761eb23b95aefe521
 2021-12-15 00:03:06 +00:00
Yanting Yang
a36d55e8f8 Rephrase dialog message of clear storage dialog for security concern 
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620)
(cherry picked from commit 5549bf8cd0)
Merged-In:I8f0b066de710169ee8b922c44b6519ca21b9c7ef
 2021-12-15 00:02:58 +00:00
Xin Li
54916e10e8 [automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11 -s ours am: 50d6b616d7 -s ours 
am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717db8 is already in history

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

Change-Id: I5eeeaca9b47404dafc838583ff60cabf80184161
 2021-12-14 21:24:07 +00:00
Xin Li
50d6b616d7 [automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11 -s ours 
am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717db8 is already in history

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

Change-Id: I14e4d4bad0bf56de1031170010143763bcb4300d
 2021-12-14 21:00:16 +00:00
Xin Li
798e3d7d11 Merge "Merge Android 12 QPR1" 2021-12-14 20:26:01 +00:00
Xin Li
475d27801f Merge Android 12 QPR1 
Bug: 210511427
Merged-In: Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed
Change-Id: I750e1a1f03c22a58637ff65825756d849ab089b5
 2021-12-14 08:39:13 -08:00
Bonian Chen
718c17039e Merge "[Settings] Fix failure test case" am: 57a7978f8c am: 54ee717db8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457

Change-Id: I2da154061359ad72ffa736873f06052be93ed721
 2021-12-14 02:46:06 +00:00
Bonian Chen
2bed540284 Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc am: 54e4845d54 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791

Change-Id: Icba1cb39911ec1e06b3952117e95ccf03630aeae
 2021-12-14 02:46:04 +00:00
Bonian Chen
54ee717db8 Merge "[Settings] Fix failure test case" am: 57a7978f8c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457

Change-Id: Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed
 2021-12-14 02:30:55 +00:00
Bonian Chen
54e4845d54 Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791

Change-Id: I9c1bd5949a1c76ef3ef97868ada3b850af5bc68e
 2021-12-14 02:30:53 +00:00
SongFerng Wang
38a109d745 Merge "To disable the preferred network mode UI during calling." am: 9dec28892c am: a74e6cd2ec 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331

Change-Id: Id3a811f5d3d37fc0e361811b27d76c8a0806c95b
 2021-12-14 02:22:54 +00:00
Bonian Chen
57a7978f8c Merge "[Settings] Fix failure test case" 2021-12-14 02:09:36 +00:00
Bonian Chen
078f873ccc Merge "[Settings] Refactor Wifi Calling description text" 2021-12-14 02:09:36 +00:00
SongFerng Wang
a74e6cd2ec Merge "To disable the preferred network mode UI during calling." am: 9dec28892c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331

Change-Id: Ibdad65e0fc67eed1f57bcf076fe5e8ea577fa21d
 2021-12-14 01:58:22 +00:00
SongFerng Wang
9dec28892c Merge "To disable the preferred network mode UI during calling." 2021-12-14 01:40:36 +00:00
SongFerngWang
ce7d4b730c To disable the preferred network mode UI during calling. 
It is the modem limitation, so disable the preferred network mode UI
during calling.

Bug: 206973375
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Ibb2904b4c6ff6de82063862188cc57e5c14b3aa5
Merged-In: Ibb2904b4c6ff6de82063862188cc57e5c14b3aa5
 2021-12-14 04:16:44 +08:00
Treehugger Robot
38d4bfc954 Merge "Set the EID in the SIM status page to be copyable" am: eba925809d am: 43c08cc42f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715

Change-Id: Ib89b68b80bbfec649ddf54b50de568c94ce8d6b3
 2021-12-13 15:03:49 +00:00
Treehugger Robot
43c08cc42f Merge "Set the EID in the SIM status page to be copyable" am: eba925809d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715

Change-Id: Icbf909388b53ab1846fc2fca27c7c6bb7201a3e6
 2021-12-13 14:48:47 +00:00
Treehugger Robot
eba925809d Merge "Set the EID in the SIM status page to be copyable" 2021-12-13 14:25:11 +00:00
jason thedjoisworo
5923723b4d Set the EID in the SIM status page to be copyable 
Add new textIsSelectable attributes to the EID textview

Bug: 210374141
Change-Id: I3b4f223319ee0ab8ae89dc2b0984ae9f9dbe32ae
 2021-12-13 06:39:20 +00:00
SongFerng Wang
80aafc5629 Merge "[Settings] Avoid crash from rotation screen." am: 04e416d68c am: 095e4093b0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916818

Change-Id: If245b0d5fd4eeb161effae1c4f26c9cab6ed9860
 2021-12-10 07:12:54 +00:00
SongFerng Wang
095e4093b0 Merge "[Settings] Avoid crash from rotation screen." am: 04e416d68c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916818

Change-Id: I33dcb20edcdd04ba2401df931ce8c345341ce3d2
 2021-12-10 06:57:58 +00:00
SongFerng Wang
04e416d68c Merge "[Settings] Avoid crash from rotation screen." 2021-12-10 06:33:59 +00:00
tom hsu
4a7f809e41 [Settings] Avoid crash from rotation screen. 
Bug: b/200822579
Test: Local test

Change-Id: Ie25b2ab4284d47abdd5db23676d05b6d547b2a73
Merged-In: Ie25b2ab4284d47abdd5db23676d05b6d547b2a73
 2021-12-10 05:14:46 +00:00
Bonian Chen
6e0429af35 [Settings] Fix failure test case 
Fix test case in Robolectric.

Bug: 209344934
Test: local test
Change-Id: Ia635f977e2262e08ca6bc56436aed624b49a0e30
(cherry picked from commit c4e09e6950)
 2021-12-09 21:30:06 +08:00
Alex Johnston
51d6a6cc87 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 6f8ba573a8 -s ours am: edb4843063 -s ours am: 179d757227 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

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

Change-Id: I8dd11f5a4baec7dae48303a86373e446d24c5ac4
 2021-12-09 12:52:27 +00:00
Alex Johnston
fc4e559d89 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 88b7d05d76 -s ours am: a849920dce -s ours am: 8d273f425e -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67 is already in history

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

Change-Id: I500cca9261e8f5cda0851a8820e29147a8e16e00
 2021-12-09 12:52:21 +00:00
Alex Johnston
179d757227 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 6f8ba573a8 -s ours am: edb4843063 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

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

Change-Id: I2768955dccdde79767163ba69565f67a9646e8e9
 2021-12-09 12:37:18 +00:00
Alex Johnston
8d273f425e [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 88b7d05d76 -s ours am: a849920dce -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67 is already in history

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

Change-Id: I1c7f2a199b03858a67d999060a57b14fbe4c5dfb
 2021-12-09 12:37:12 +00:00
Alex Johnston
6b792ce56b Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67 am: c745bc427e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414971

Change-Id: I02c96d91aa737bbe07fe6095be07eda384cc3a17
 2021-12-09 12:21:39 +00:00
Alex Johnston
edb4843063 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 6f8ba573a8 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

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

Change-Id: I57cd5f04f66b1874bf1d1e1c164eba7789af9ad8
 2021-12-09 12:21:13 +00:00
Alex Johnston
a849920dce [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 88b7d05d76 -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67 is already in history

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

Change-Id: Ia158b48a9af8910eff034da0847b1d43aa2dc3a7
 2021-12-09 12:19:33 +00:00
Alex Johnston
c745bc427e Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414971

Change-Id: Ib4a03feff7c118afaeae5553f94d9915881c2e4e
 2021-12-09 12:05:20 +00:00
Alex Johnston
6f8ba573a8 Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873

Change-Id: I1a2d3a106cfedb8cb43b2eae446e1de9efef955c
 2021-12-09 12:04:49 +00:00
Alex Johnston
88b7d05d76 Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873

Change-Id: I6b616fa81ce4c5c53e553f8e692fdc059bb894fe
 2021-12-09 12:03:22 +00:00