PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,207 Commits 1 Branch 0 Tags
9c3313d79bcc6184d8ffeaf1c745d568f95dfc0c
Commit Graph

106207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
3091ed0dc7 Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe65 am: 408728d4ab am: 2ff3a05456 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18617746

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

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

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

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

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

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

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

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

Change-Id: I369ac936a08247bc7dd61fc875ac61d51be45342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 10:56:08 +00: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
2ff3a05456 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: Ied58d877d63ad065e783cadbf401589e065a0d07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 10:42:53 +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
Chaohui Wang
71961276bd 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: I5c6bbd8f0ab3f816492bcf1ecaf34a9acbcd3c63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 10:42:45 +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
Jason Chiu
9ac3a4c795 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: I16bdab3cae1f85976e34b8e0ce781cd2397a837d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 10:42:28 +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
0f62594f8e Merge "Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f am: 968da5c582" into tm-d1-dev-plus-aosp am: 35f2cf8104 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

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

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

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

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

Change-Id: I2f7a0a2ee6b1497a77537371bc906d8570fcf640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 06:04:49 +00:00
SongFerng Wang
d2764c5fc9 Merge "Settings: Change array resource sim_color_light to an integer array" am: ed0f3c60ec am: 1ab90f4640 am: fc01fb0302 am: 1e24552f7f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2081598

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

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

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

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

Change-Id: Ib28e234c5b048342bd40a1c5c29cc301de540b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 06:03:17 +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
Chaohui Wang
bf0d192521 Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4 am: caabb4fe49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

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