PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,509 Commits 1 Branch 0 Tags
90168c06dd3fea000be1784cc69b3f621f2fe51c
Commit Graph

104509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
8720510d2d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-27 16:45:14 +00:00
TreeHugger Robot
a55b8573ef Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-27 16:45:14 +00:00
TreeHugger Robot
232db4bfb1 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 1340a91c73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: Id2d8b1c03ee685c0d0bca85ac9a569102d8aa239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:14:27 +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
SongFerng Wang
edddac92a4 [automerger skipped] Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487 am: 640e337b19 -s ours am: 81d910a3bd -s ours 
am skip reason: Merged-In Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719 with SHA-1 18f10bb8b1 is already in history

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

Change-Id: If7af8332cc0fa264020e72cae7c5a8d415b4f9a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:56:21 +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
SongFerngWang
033d0d96a0 [automerger skipped] Changing the condition since the esim may be removable am: 82bf2a66b7 am: 5de8fbc299 -s ours am: 0cdfaf2eed -s ours 
am skip reason: Merged-In I47dc068e57a0faa7f7ce85af7933a48caa2c93e4 with SHA-1 948f512098 is already in history

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

Change-Id: I98ee0541846246d87e03eadfd07326d41a61966f
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
81d910a3bd [automerger skipped] Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487 am: 640e337b19 -s ours 
am skip reason: Merged-In Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719 with SHA-1 18f10bb8b1 is already in history

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

Change-Id: I024566b56adef549b2992c235d4b202c00c7743f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:34:04 +00:00
SongFerngWang
0cdfaf2eed [automerger skipped] Changing the condition since the esim may be removable am: 82bf2a66b7 am: 5de8fbc299 -s ours 
am skip reason: Merged-In I47dc068e57a0faa7f7ce85af7933a48caa2c93e4 with SHA-1 948f512098 is already in history

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

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

Change-Id: I6d335c12227d1be9bc6d753e940ac1994c050011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:33:56 +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
Betty Chang
d1e2280136 [automerger skipped] Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d am: e300781fb8 -s ours am: 34c513f0d4 -s ours 
am skip reason: Merged-In I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427 with SHA-1 dacce1fae3 is already in history

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

Change-Id: I3b9751da93651df23cbba4319d540943eced5d9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:26:12 +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
Betty Chang
34c513f0d4 [automerger skipped] Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d am: e300781fb8 -s ours 
am skip reason: Merged-In I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427 with SHA-1 dacce1fae3 is already in history

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

Change-Id: I1e1d2af2be4b97cbbeaa579963a7865f1c25ba40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:03:07 +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
Zoey Chen
badca36723 [LeAudio] Remove the QrCamera and decorateView in Settings 
Bug: 214340362
Test: Manual test
Change-Id: Ibc29f0e90af28e14a11164fa8940920745545c7e
Merged-In: Ibc29f0e90af28e14a11164fa8940920745545c7e
 2022-05-27 22:39:58 +08:00
Betty Chang
e5a21d345d Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" 2022-05-27 14:30:02 +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
fec8a4ebea Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65 am: 408728d4ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746

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

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

Change-Id: Ib48b185d69442e1abdfec35850e639f8f7fbe303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 10:42:30 +00: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
Automerger Merge Worker
35f2cf8104 Merge "Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f am: 968da5c582" into tm-d1-dev-plus-aosp 2022-05-27 06:55:47 +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
a3d8337609 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f am: 968da5c582 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: I5cc24a8c9aa23886ed740d08f7adc01c22e0753f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 06:55:41 +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
aa3a9c683a Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa am: 349b36bb91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Icfff8b1937f72b2e58b697ebed4a939581c6672b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 05:50:28 +00:00