PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,038 Commits 1 Branch 0 Tags
83ce10847fa4bb722b32e73e1cea63acac0286db
Commit Graph

95038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
7ad96282b3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I833bb37f1ed91e685017879fefe173d30ab447fc
 2021-09-11 08:55:27 +00:00
Bill Yi
6c6cfeb024 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0aff4035e8 
Blank merge reason: commit message contains skip directive

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

Change-Id: I75fe9ddc750ebfcef15aedfc29f286e7dcacbaf0
 2021-09-11 08:51:58 +00:00
Bill Yi
0aff4035e8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4a64879a0fd4b69657dd45a18463d70d04f61cde
 2021-09-11 08:51:47 +00:00
Yi-Ling Chuang
5fc96844e5 Correct how the injection mechanism starts activities 
Settings Injection used to start activities with
startActivityForResult() and its extension, where there was not result
really being handled. Hence, this CL corrects the way it starts
activities by removing the "ForResult" part.

Fixes: 197704126
Test: robotest and launch Android Auto to see it being launched in
another task.

Change-Id: I259b2555cf62f8966afdf664b337af5f216b3843
 2021-09-11 16:48:37 +08:00
ykhung
27d9bdfb82 Fix the icon flash issue cause from the shared drawable icon am: a3b89868f4 am: e44128f021 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15802168

Change-Id: If1a9387932316ff3b4addea1075d8d69853d38dc
 2021-09-11 00:24:09 +00:00
ykhung
e44128f021 Fix the icon flash issue cause from the shared drawable icon am: a3b89868f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15802168

Change-Id: I4b3e87e071a2fec6ace88afe1336be08e77c4075
 2021-09-11 00:13:28 +00:00
ykhung
a3b89868f4 Fix the icon flash issue cause from the shared drawable icon 
different time slot may have the same application entry, we should not make them share the same drawable instance to impact the states, we will use newDrawable() method to create a new one for each application entry

Bug: 198553245
Test: make SettingsRoboTests
Change-Id: I4a321133ba171817fca1ab7ad47b9af8f7450675
 2021-09-10 16:50:43 +00:00
Neil Fuller
b46adff0f4 Swap ownership to mingaleev@ 
BUG=189810551

Change-Id: I6304545540947d6695117753309c80b27cf2669a
 2021-09-10 12:20:39 +00:00
Bonian Chen
2c3f21ad76 [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: 58d30bf442 -s ours am: d010033f00 -s ours am: 05727f206b -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: I91e6577c8e3e716b13654c1f7ecfc6d1c9f59a98
 2021-09-10 11:03:09 +00:00
Bonian Chen
05727f206b [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: 58d30bf442 -s ours am: d010033f00 -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: I0d7901c7b0e11ee5c5e2327c4c509dd0b307266a
 2021-09-10 10:48:04 +00:00
Bonian Chen
d010033f00 [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: 58d30bf442 -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: I4aa99ad4e762506fb17feb8d6ffc3d8f03f2d15b
 2021-09-10 10:31:13 +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
ykhung
f27d0c2935 Move allowed list definition in the battery usage to feature provider am: b62cdecc67 am: bb535f4bce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785737

Change-Id: I4a19dcc41b14af235c3e1d94675d14fc8f05e3a0
 2021-09-10 05:14:37 +00:00
ykhung
bb535f4bce Move allowed list definition in the battery usage to feature provider am: b62cdecc67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785737

Change-Id: I01745bccfb5cf44fbdfeedd1db6ad2b88a0c71a2
 2021-09-10 05:03: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
4304572a44 [automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: f4e2f69f3a -s ours am: 74305a655a -s ours am: 2180784c46 -s ours am: a66a06e20a -s ours am: 3ce2bc2361 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf185e19e71662de3e46a6d4f2c356a64eb3f405
 2021-09-09 23:18:41 +00:00
Bill Yi
3ce2bc2361 [automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: f4e2f69f3a -s ours am: 74305a655a -s ours am: 2180784c46 -s ours am: a66a06e20a -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I36d53b74ccde439c5c6b96f2a2f8f2622d538c38
 2021-09-09 22:29:33 +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
ykhung
b62cdecc67 Move allowed list definition in the battery usage to feature provider 
Bug: 199367609
Test: make SettingsRoboTests
Change-Id: I321426e6ff1b9586ee493792f1d39aed35ecc34d
Signed-off-by: ykhung <ykhung@google.com>
 2021-09-10 01:29:32 +08:00
TreeHugger Robot
a88e272300 [automerger skipped] Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4 am: 88cd5025e1 -s ours am: 82203dc6c1 -s ours 
am skip reason: Merged-In I0901c56ae93691c984376852da78cde9078caaf0 with SHA-1 083ace54d5 is already in history

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

Change-Id: I21254dae35228d8b1d2cb4650e175aa50275fc0d
 2021-09-09 16:17:23 +00:00
TreeHugger Robot
ecec305283 [automerger skipped] Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4 am: 63a22fd735 am: e1740e2faa -s ours 
am skip reason: Merged-In I0901c56ae93691c984376852da78cde9078caaf0 with SHA-1 0849672890 is already in history

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

Change-Id: I978729682e0c229028f97b979ae319480e418570
 2021-09-09 16:15:43 +00:00
TreeHugger Robot
82203dc6c1 [automerger skipped] Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4 am: 88cd5025e1 -s ours 
am skip reason: Merged-In I0901c56ae93691c984376852da78cde9078caaf0 with SHA-1 083ace54d5 is already in history

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

Change-Id: I90b61e9a71a7f8b85719a06e48ced09472956f10
 2021-09-09 15:57:41 +00:00
TreeHugger Robot
e1740e2faa Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4 am: 63a22fd735 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143

Change-Id: I69864e3efbdb8e191c5f098c004e5bee06f0351c
 2021-09-09 15:57:13 +00:00
TreeHugger Robot
88cd5025e1 Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143

Change-Id: If2c47f007a67865ad9aaf8040eddc638f46f7964
 2021-09-09 15:40:14 +00:00
TreeHugger Robot
63a22fd735 Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143

Change-Id: Id85a00a0673b59ae514b56a8f197aaa65ddd32e6
 2021-09-09 15:40:11 +00:00
TreeHugger Robot
daaf1728b4 Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev 2021-09-09 15:28:01 +00:00
Wesley.CW Wang
083ace54d5 Enhance battery settings limit charge tip 
- Add dialog for limit charge tips
 - Add action button to make limit charge tips can bypass charge limited
 - Fix layout typo
 Screenshot: https://screenshot.googleplex.com/5ngtD2sJAKSQZD3.png

Bug: 196315151
Bug: 197769934
Test: make SettingsRoboTests
Change-Id: I0901c56ae93691c984376852da78cde9078caaf0
Merged-In: I0901c56ae93691c984376852da78cde9078caaf0
 2021-09-09 22:13:33 +08:00
Treehugger Robot
980ae6ce14 Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa am: fbf2d0bc55 am: 8a57649765 am: 972166204d am: 11c064519b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: I0a80d051eed7132d963aef5f18e68b8031c62a47
 2021-09-09 11:20:09 +00:00
Treehugger Robot
11c064519b Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa am: fbf2d0bc55 am: 8a57649765 am: 972166204d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

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

Change-Id: I1845ebaf808192d3b28cc72f3548d0f489a4ce7c
 2021-09-09 11:00:58 +00:00
TreeHugger Robot
cd9b8203c2 Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b am: 514c49510d am: c0ca45a9b9 am: 8786402d97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688

Change-Id: I6a2d4a12cd46a1d2a125948feeba81e5d3e7fcfe
 2021-09-09 11:00:34 +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
8786402d97 Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b am: 514c49510d am: c0ca45a9b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688

Change-Id: I9547d5bef833318068f212915fba68b93b69538e
 2021-09-09 10:45:48 +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
c0ca45a9b9 Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b am: 514c49510d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688

Change-Id: I53a3e0d9353f93f0ca42d6e34decfe77bce63c29
 2021-09-09 10:25:01 +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
818a503116 Merge "Set 2-pane placeholder for all alias of SettingsHomepageActivity" into sc-v2-dev am: 72cef4f393 am: 47bab41397 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785733

Change-Id: I5c38ac0638a77873b24a09c9c0474c1e0dca06db
 2021-09-09 09:55: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
TreeHugger Robot
47bab41397 Merge "Set 2-pane placeholder for all alias of SettingsHomepageActivity" into sc-v2-dev am: 72cef4f393 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785733

Change-Id: Ibf734408fb84dc9af71f158264296d56cc286c5c
 2021-09-09 09:40:05 +00:00
TreeHugger Robot
72cef4f393 Merge "Set 2-pane placeholder for all alias of SettingsHomepageActivity" into sc-v2-dev 2021-09-09 09:28:14 +00:00
Tsung-Mao Fang
bf5a327c5d Merge "Revert "Extends the criteria width of split mode"" into sc-v2-dev am: fcfaaff20f am: 692342a1b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785734

Change-Id: Icb8a54cdbfb7736660dd6027811765875fc37e12
 2021-09-09 09:27:18 +00:00
Tsung-Mao Fang
692342a1b1 Merge "Revert "Extends the criteria width of split mode"" into sc-v2-dev am: fcfaaff20f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785734

Change-Id: I045d23673cb443694d28dc10575a6710b698be30
 2021-09-09 09:08:42 +00:00
Tsung-Mao Fang
fcfaaff20f Merge "Revert "Extends the criteria width of split mode"" into sc-v2-dev 2021-09-09 08:37:10 +00:00
Tsung-Mao Fang
600672c91d Revert "Extends the criteria width of split mode" 
This reverts commit c829a97f13.

Reason for revert: <Observe behavior error after rotating the device>
Bug: 15786013

Change-Id: I58024f143f8c59f8b0cf50d5cd284f84600e36e6
 2021-09-09 08:35:01 +00:00