PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,297 Commits 1 Branch 0 Tags
28b3a9a7aea190c55fb654799a9d8050354ea7b0
Commit Graph

42846 Commits

Author SHA1 Message Date
TreeHugger Robot
28b3a9a7ae Merge "Update biometrics OWNERS" into tm-d1-dev am: 715ffb6f0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18641304

Change-Id: I9e12101cb0fd246ec5dde24754f298173a1fda80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-31 22:54:33 +00:00
TreeHugger Robot
715ffb6f0e Merge "Update biometrics OWNERS" into tm-d1-dev 2022-05-31 22:34:46 +00:00
Amith Yamasani
6cbe791c94 Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b am: 390236115a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I31e002c94128935ef811033da62b831299925df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-31 12:40:00 +00:00
Amith Yamasani
390236115a Use Uri.toString() instead of Uri.toSafeString() am: 1b27c91a7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18646683

Change-Id: I69c616bb66f0a440e654fe8c324bd222d1b3e612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-31 12:25:01 +00:00
Amith Yamasani
1b27c91a7b Use Uri.toString() instead of Uri.toSafeString() 
Uri.toSafeString strips out paths and shouldn't be used
for situations other than logging.

Bug: 232694281
Test: PtsPowerTestCases
Change-Id: Iec835b738c3e928e922bd6a14573106f2ce4f526
 2022-05-30 23:22:25 -07:00
Edgar Wang
67e1606b5e Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I1dd67111c2d18b8f41a318860ee751a3f6ec6aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:05:31 +00:00
Edgar Wang
1767504702 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I584713ed38df60ecb9742f79f5cbc2e0c2ea90bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 04:36:10 +00:00
Edgar Wang
610538e10b Merge "Enable hyphenation on most of preference." into tm-dev 2022-05-30 04:00:19 +00:00
Treehugger Robot
7cf2c08b53 Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e am: 2341b91f32 am: 22c4b4009b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I68e18d34ee0f28caac1da18f76472082eb524430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 03:59:47 +00:00
Treehugger Robot
22c4b4009b Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e am: 2341b91f32 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I1fd069da08f2931ee00c7adb08df56fc4fb976b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 03:44:42 +00:00
Treehugger Robot
2341b91f32 Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I3435e3bf2ee61ad4be971334f791543d9c26856d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 03:27:45 +00:00
Treehugger Robot
24f96c2c2e Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" 2022-05-30 03:01:23 +00:00
Ilya Matyukhin
28608774cb Update biometrics OWNERS 
Bug: 234195983
Test: N/A
Change-Id: I9843d0d6fad638cd14296624b11f86a273baab1c
 2022-05-28 05:36:43 +00:00
TreeHugger Robot
a00962e0c7 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 58cc75e217 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: I028d9908e9510f2ae7cbebc36f9f23c0498155cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:56:37 +00:00
TreeHugger Robot
1340a91c73 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: Ifdd591d7f032facbfe0f0f6dfe6db587271ec386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:56:19 +00:00
TreeHugger Robot
58cc75e217 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: I9da420078509e6aa2a8ec37f1929fcdd5f2b4ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:54:53 +00:00
TreeHugger Robot
07db5f4362 Merge "Fix can't change notification sound for work profile." into tm-dev 2022-05-27 15:36:13 +00:00
SongFerng Wang
86fd225f79 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: d879d59a86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I76b7ecd27dcf6b1e682cc104a389c9653b31320b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:26:31 +00:00
SongFerng Wang
e4d42c1515 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I4c163ea303beefcf265ba6b67585d7559aab9ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:18:44 +00:00
SongFerng Wang
640e337b19 Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107797

Change-Id: Idcc44c3a8d41c74cb485c5cba0764989adc17a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:18:30 +00:00
SongFerngWang
5de8fbc299 Changing the condition since the esim may be removable am: 82bf2a66b7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107795

Change-Id: If58f4e897785dd92ed6de2bd847bb5a7a9728294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:18:28 +00:00
SongFerng Wang
d879d59a86 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I74352201ea603e7786ca6ee686fc9d6f142e7ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:17:25 +00:00
SongFerng Wang
d3a7c75487 Merge changes Ic2ac6a5c,I47dc068e 
* changes:
  [MEP] The removale slot can read the esim card
  Changing the condition since the esim may be removable
 2022-05-27 14:59:48 +00:00
SongFerng Wang
a67d5e25a3 Merge "[MEP] The removale slot can read the esim card" into tm-dev 2022-05-27 14:58:43 +00:00
Betty Chang
e300781fb8 Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107794

Change-Id: I9fedeeaf397e15e8c6a9421604a0cf6def4c743c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 14:47:51 +00:00
Tsung-Mao Fang
40fbcf333f Fix can't change notification sound for work profile. 
Use correct user id context to query the type,
so we won't get empty result unexpectedly.

If we get the null result, then we won't set sound sucessfully.

Fix: 233580016
Test: Manual test and set work profile sound works.
Change-Id: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
 2022-05-27 21:13:33 +08:00
Chaohui Wang
551549cf98 Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65 am: c20f0cabf7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746

Change-Id: I80cdbf81ecfdd995c7ebd2838059828ac5caea95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 10:34:58 +00:00
Chaohui Wang
0b3be6bd9a Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64 am: 4eaa0027e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832

Change-Id: I28c760ff5825b823fd94b277baa54d4f17cc0454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 10:34:51 +00:00
Chaohui Wang
408728d4ab Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746

Change-Id: I47ff02a503fd52cd79be438647d0f45c74c22a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 10:34:44 +00:00
Jason Chiu
fa6e470288 Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172 am: b83449af1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833

Change-Id: I857211b2f211e54c83ac5457bb8878db44efc069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 10:34:43 +00:00
Chaohui Wang
c20f0cabf7 Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746

Change-Id: Ie214b97a1019488909831453470f0d250c11913f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 10:33:25 +00:00
Chaohui Wang
98429fbe65 Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev 2022-05-27 10:29:51 +00:00
Chaohui Wang
7f4341f9aa Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832

Change-Id: I98bd7e8de5893d0f39fe91c99472346a3a9cadae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 10:18:53 +00:00
Jason Chiu
aaa3ad0890 Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833

Change-Id: I62b60adb13e8068ef8c16aef67ef01c2ad988161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 10:18:46 +00:00
Chaohui Wang
4eaa0027e7 Merge "Fix flicker for AppDataUsagePreference" into tm-dev am: 05f6617b64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603832

Change-Id: Iec9150fcc43cac98b72e523be28f2dac79d90c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 10:17:40 +00:00
Jason Chiu
b83449af1a Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d172 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603833

Change-Id: Ic9302d7b34e827ca55f8cd14709d4e8710823b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 10:17:29 +00:00
Chaohui Wang
05f6617b64 Merge "Fix flicker for AppDataUsagePreference" into tm-dev 2022-05-27 10:13:41 +00:00
Jason Chiu
bd6107d172 Merge "Don't start two pane for singleInstance deep links" into tm-dev 2022-05-27 09:52:30 +00:00
SongFerngWang
7d71d3f451 [MEP] The removale slot can read the esim card 
Revert the wrong logic for removale slot part at ag/18579901,
the removable slot can read the esim card.

Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719
Merged-In: Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719
 2022-05-27 08:54:09 +00:00
SongFerngWang
18f10bb8b1 [MEP] The removale slot can read the esim card 
Revert the wrong logic for removale slot part at ag/18579901,
the removable slot can read the esim card.

Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719
 2022-05-27 16:44:52 +08:00
SongFerngWang
82bf2a66b7 Changing the condition since the esim may be removable 
The condition whether the slot is esim slot should use getIsEuicc
api since the esim may be removable.

Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: I47dc068e57a0faa7f7ce85af7933a48caa2c93e4
Merged-In: I47dc068e57a0faa7f7ce85af7933a48caa2c93e4
 2022-05-27 07:10:28 +00:00
SongFerng Wang
6b3b355975 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f am: 15c33001a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: Id41eb349f1edf18d7f964b99e0887b12edc16620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 06:55:42 +00:00
SongFerng Wang
15c33001a2 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: If3afab7ab294f3ce2836f96c12ba1d95dd82fbb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 06:41:11 +00:00
SongFerng Wang
968da5c582 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: Idbd1cd2b051e08b2a284c98f2343ce6acfe3a2ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 06:39:48 +00:00
SongFerng Wang
fa5407c60f Merge "Changing the condition since the esim may be removable" into tm-dev 2022-05-27 06:23:16 +00:00
Hank Sheng
3e3978ce80 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa am: 0c8e9b6510 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: I4f7589d5d38f61098468d37ad242b73f8af796c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 05:48:36 +00:00
Hank Sheng
349b36bb91 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Id2d1766f508dd02f8412131c25f12f82d92a3833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 05:48:03 +00:00
Chaohui Wang
f9bfc59281 Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4 am: 4bcaccf8d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: I1333dc9c30937b37a397138e69147e1b88286fd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 05:48:01 +00:00
Hank Sheng
0c8e9b6510 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Id4abc52bcccaec23a580f757b345c7d763ed1a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 05:46:43 +00:00
Hank Sheng
3dfcc708aa Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev 2022-05-27 05:32:47 +00:00