PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,494 Commits 1 Branch 0 Tags
7f395f18b240490dbbe0bafd1e61d0f10727363f
Commit Graph

84494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
7f395f18b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0ff01146a726074ee24afd7c141df16750ec611f
 2021-09-24 17:00:07 +00:00
Bill Yi
78abb83343 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I37b3fc803bb1b033f24467dc54f43a8d7e1f4cb1
 2021-09-24 16:44:26 +00:00
Treehugger Robot
da36a07df1 Merge "[Settings] backport missing CL" am: a8ee80e95a am: 15c0678ca8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1836333

Change-Id: I687c80bc2f50b242151edffdb8ab97307d08b9d9
 2021-09-24 10:40:36 +00:00
Treehugger Robot
15c0678ca8 Merge "[Settings] backport missing CL" am: a8ee80e95a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1836333

Change-Id: I09f384d8d7073270d4bf460e91a52021a69e3e19
 2021-09-24 10:24:31 +00:00
Treehugger Robot
a8ee80e95a Merge "[Settings] backport missing CL" 2021-09-24 10:10:37 +00:00
Bonian Chen
dc3c1e8a4b [Settings] backport missing CL 
aosp/1258356 got missing when merging several CLs of refactor code in
aosp/1281915.

Bug: 186543910
Test: local
Change-Id: I34287b22fec4da660c7b44b5953eb16591cfb2d7
 2021-09-24 15:45:30 +08:00
Bill Yi
20df40e783 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia87ff5a7993ad94c6b9e910380d5b758dfb6363e
 2021-09-23 17:49:59 +00:00
vichang
b9bebd5bd9 Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" am: 3166166bdd am: e6bf1a83d8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1831314

Change-Id: If94d8a65c9902180466481f157224a5389d9b117
 2021-09-21 11:06:23 +00:00
vichang
e6bf1a83d8 Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" am: 3166166bdd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1831314

Change-Id: I458bf767bbea8b5921f00afae884d309d270f7b0
 2021-09-21 10:52:53 +00:00
vichang
3166166bdd Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" 2021-09-21 10:42:27 +00:00
Victor Chang
fc4589448b Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest 
The time zone transitions can be obtained via the public API
ZoneId.getRules() instead.

Bug: 119751170
Test: atest SettingsRoboTests
     com.android.settings.datetime.timezone.TimeZoneInfoPreferenceControllerTest passes
Change-Id: I2c7864580b2a36b725ee250253e97f6cc86d72a4
 2021-09-20 15:57:42 +01:00
TreeHugger Robot
3fa671bab4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iadbd3da5a10bed29a0988acf9c64fbb54614b451
 2021-09-20 14:29:18 +00:00
Bill Yi
6280ce466c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02500142f53249a3f17b775d14baca98c3c60a14
 2021-09-20 14:28:32 +00:00
TreeHugger Robot
8fc132c073 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If21bd8380189f5615c8531bab311cbb7847742d7
 2021-09-20 14:16:53 +00:00
Bill Yi
977610714f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc00c683438341c8024aa8050982745a71f32840
 2021-09-20 14:16:34 +00:00
TreeHugger Robot
7a8b043da7 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-09-20 14:04:47 +00:00
Bill Yi
2cf7817de7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I89cb67f37af3095da61f90fe665e6814bd592dfe
 2021-09-20 13:27:54 +00:00
Bill Yi
66375d4530 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-20 13:13:42 +00:00
Bill Yi
6bff29a287 Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-20 13:13:42 +00:00
Bill Yi
15c729b335 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed 
Blank merge reason: commit message contains skip directive

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

Change-Id: I1e2d0d4f545ec2d4bf09ae29ecbd96baae53a432
 2021-09-18 17:21:27 +00:00
Bill Yi
47ea4adaed Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iac26620cda40d2696577626befff4c5d811d35b7
 2021-09-18 17:21:13 +00:00
Bill Yi
6c50635319 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643 
Blank merge reason: commit message contains skip directive

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

Change-Id: If6b26166c7bc75f1879cd1cb5c34641732aa7a2e
 2021-09-18 17:10:55 +00:00
Bill Yi
cc5e2f9643 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1b3e386baf72d68cdbb895055f61ed1f54817389
 2021-09-18 17:10:42 +00:00
Bill Yi
7b93c3ea98 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaa16a73368d1b88512291d10b9c46abd127ab62e
 2021-09-18 17:06:21 +00:00
Bill Yi
57b68bafb9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I78923511c8cd2c48b25e2105d234d4b510b5fe6b
 2021-09-18 17:02:50 +00:00
Neil Fuller
4546286779 Merge "Swap ownership to mingaleev@" am: f6fe44dc91 am: d2eca211d4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1824113

Change-Id: I93dfc80658af894e720cec0a2c0e0489ee67c53e
 2021-09-13 11:30:54 +00:00
Neil Fuller
d2eca211d4 Merge "Swap ownership to mingaleev@" am: f6fe44dc91 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1824113

Change-Id: I9be5d173953df0a90ee1309feceed35f9240c18c
 2021-09-13 11:17:50 +00:00
Neil Fuller
f6fe44dc91 Merge "Swap ownership to mingaleev@" 2021-09-13 11:03:08 +00:00
Bill Yi
7b59a40d17 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours am: 75d96641c6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib76fa3621571832716728f486aafc0d01b6e6a60
 2021-09-12 13:27:23 +00:00
Bill Yi
080db6b64d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3dfaff3154b221dc5c5e46c8434fefcb735bec2
 2021-09-12 13:27:16 +00:00
Bill Yi
75d96641c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieff57a9bcb1cb08bfff67c882d2d23d40bf8881c
 2021-09-12 13:11:17 +00:00
Bill Yi
2bc492b5a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c98246752b54a166967392171d412f79fa3dfce
 2021-09-12 13:11:08 +00:00
Bill Yi
98945e949e Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-09-12 12:57:50 +00:00
Bill Yi
78d0880792 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 
Blank merge reason: commit message contains skip directive

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

Change-Id: Icab5517ddc19bbe60183846d4f85bef549b0e3e8
 2021-09-11 09:10:05 +00:00
Bill Yi
a5d4317641 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I89637d7c6419239e93a6dd005268adcf378c2291
 2021-09-11 09:09:53 +00:00
Bill Yi
b2e42cabd4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9a37f3d6526c53393d047d99f8c19f2054e932f7
 2021-09-11 09:05:32 +00:00
Bill Yi
24917c6fce Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id7feff6bce69e46b992f5062c6fe2679f3fdd429
 2021-09-11 09:02:07 +00:00
Neil Fuller
b46adff0f4 Swap ownership to mingaleev@ 
BUG=189810551

Change-Id: I6304545540947d6695117753309c80b27cf2669a
 2021-09-10 12:20:39 +00:00
Bonian Chen
58d30bf442 [automerger skipped] Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" am: 4c3f454c92 -s ours am: 6c1c8934a2 -s ours 
am skip reason: Merged-In Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77 with SHA-1 f56682808e is already in history

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

Change-Id: I9d32b04abf40f188d302fe752f44ed7d03aa2bcd
 2021-09-10 10:11:19 +00:00
Bonian Chen
6c1c8934a2 [automerger skipped] Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" am: 4c3f454c92 -s ours 
am skip reason: Merged-In Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77 with SHA-1 f56682808e is already in history

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

Change-Id: Iab613dc14204401318bd69648dad6c7d2f49e723
 2021-09-10 09:59:38 +00:00
Bonian Chen
4c3f454c92 Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" 2021-09-10 09:46:32 +00:00
Ting Yu
638f12a6c8 Fix Text of VoLTE setting cannot be updated when SIM state is changed 
Text of setting menu for VoLTE should be changed from "VoLTE" to
"4G Calling" if "show_4g_for_lte_data_icon_bool" is true. However, it
is not changed in the following steps.
1. Turn Use SIM off on Mobile Network Setting and close Mobile Network
   Setting screen.
2. Open Mobile Network Setting screen again and turn Use SIM on.

Root cause is that the carrier config value is loaded only when SIM's
subid is changed. So, remove checking subId so that the carrier config
value is updated.

Additional fix:
Removed checking #isModeMatched in # onStart because "4G calling"
Setting was grayed out. It needs to listen to call state change
regardless of display status of the preference because Preference may
be switched even after the screen is displayed.

Test: manual
Test: make RunSettingsRoboTests \
      ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Bug: 196030198
Change-Id: Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77
Merged-In: Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77
 2021-09-10 01:17:26 +00:00
Bill Yi
2180784c46 [automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: f4e2f69f3a -s ours am: 74305a655a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9fc84c95f481cbb8dd75d47047dc99cc11b977bd
 2021-09-09 22:11:53 +00:00
Bill Yi
74305a655a [automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: f4e2f69f3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4f2be01ba3bd1251dda73f1852463b5e6b6b5f3
 2021-09-09 21:39:31 +00:00
Bill Yi
f4e2f69f3a Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" 2021-09-09 21:27:25 +00:00
Treehugger Robot
8a57649765 Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa am: fbf2d0bc55 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: Iaf54828eaec9c24a83aaddec90d775dafab6dd34
 2021-09-09 10:46:10 +00:00
Treehugger Robot
fbf2d0bc55 Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: I74de819b9c6eefb93d9447efe8398ddd27470933
 2021-09-09 10:28:50 +00:00
Treehugger Robot
604c7a7cfa Merge "Remove the option of resetting Euicc data." 2021-09-09 10:09:30 +00:00
TreeHugger Robot
514c49510d Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688

Change-Id: I6968521de3a4ac2bccc83d934c2c9c897fb10fce
 2021-09-09 10:00:22 +00:00
TreeHugger Robot
bb1dd00d0b Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master 2021-09-09 09:47:14 +00:00