PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,623 Commits 1 Branch 0 Tags
63da73532d9534775865d479cb7f40ae5c6fd22c
Commit Graph

55623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
6c1861b3c0 Merge "Consider subId when loading Wfc string resources" am: 9c2c1b4784 
am: 944689abd6

Change-Id: I6bfa2099cdb382109c90f0c3b9ea76a2a7df4d19
 2019-11-28 07:28:07 -08:00
Bonian Chen
944689abd6 Merge "Consider subId when loading Wfc string resources" 
am: 9c2c1b4784

Change-Id: Ib680198aff74daa31d5ca0413ca3dd869b3126af
 2019-11-28 07:26:07 -08:00
Bonian Chen
9c2c1b4784 Merge "Consider subId when loading Wfc string resources" 2019-11-28 15:22:21 +00:00
Neil Fuller
3296857f38 Merge "Switch settings to use TimeDetector" am: d32eee26e3 
am: 5ef64ad89b

Change-Id: I8901a6595677380013cc3d063426a4dfead18b97
 2019-11-28 00:59:44 -08:00
Neil Fuller
5ef64ad89b Merge "Switch settings to use TimeDetector" 
am: d32eee26e3

Change-Id: I1f3c05b986768be9c29043eea51143d6ab22bd12
 2019-11-28 00:54:40 -08:00
Neil Fuller
d32eee26e3 Merge "Switch settings to use TimeDetector" 2019-11-28 08:47:32 +00:00
Neil Fuller
3c794261a5 Switch settings to use TimeDetector 
Switch settings to use TimeDetector when setting the system clock rather
than using AlarmManager directly.

Bug: 140712361
Test: treehugger
Test: manual
Test: make -j30 RunSettingsRoboTests ROBOTEST_FILTER=TimePreferenceControllerTest
Test: make -j30 RunSettingsRoboTests ROBOTEST_FILTER=DatePreferenceControllerTest
Change-Id: I671bf0e7e7364f64f1397d524c6277591eb4e22e
Merged-In: I671bf0e7e7364f64f1397d524c6277591eb4e22e
(cherry picked from commit 9861696306)
 2019-11-27 16:36:59 +00:00
Torbjorn Eklund
4f44b44168 Consider subId when loading Wfc string resources 
Consider subId when loading string resources in screen
WifiCallingSettingsForSub and Wi-Fi Calling slice.

This ensures that correct string resources is loaded in multi sim
scenario when operators are using customized strings.

Bug: 129893058
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingPreferenceController
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSliceHelper
Change-Id: Ia5b763d4b59f7e738cb741b778bb859884a85198
 2019-11-27 14:35:07 +01:00
Bonian Chen
b61f54519b Merge "IMS: Grey out Wifi calling option when either sub is having call." am: 262b4f7434 
am: 37e02742a4

Change-Id: I81eac0ecd2948e7b5bd6b92ae90b349ab46675e7
 2019-11-26 17:49:06 -08:00
Bonian Chen
37e02742a4 Merge "IMS: Grey out Wifi calling option when either sub is having call." 
am: 262b4f7434

Change-Id: I59a18265dc053386854c6c4b4b30e90c287b34e8
 2019-11-26 17:46:38 -08:00
Bonian Chen
262b4f7434 Merge "IMS: Grey out Wifi calling option when either sub is having call." 2019-11-27 01:35:23 +00:00
Bonian Chen
42eec15834 Merge "[Setting] Fix merge conflict" am: 67805d8e5e 
am: ec4e1a14e0

Change-Id: I716436a78316eb111fa53bb6834d81934f7830f1
 2019-11-26 02:11:19 -08:00
Bonian Chen
ec4e1a14e0 Merge "[Setting] Fix merge conflict" 
am: 67805d8e5e

Change-Id: Ie7f67b9a80efdceb1e3c5fd3054dd4eb71c4dcd8
 2019-11-26 02:02:03 -08:00
Bonian Chen
67805d8e5e Merge "[Setting] Fix merge conflict" 2019-11-26 08:45:05 +00:00
Raff Tsai
14990a1901 Merge "Prevent null point exception" am: 45b03edd00 
am: bfa1f2979e

Change-Id: Ib0afc6d71113b52fc63caf5b960ca7239a5c364c
 2019-11-26 00:04:15 -08:00
Raff Tsai
bfa1f2979e Merge "Prevent null point exception" 
am: 45b03edd00

Change-Id: Ifbcf83606e115cb1a759382b38949f49af4e4112
 2019-11-26 00:02:27 -08:00
Bonian Chen
dfba6f8720 [Setting] Fix merge conflict 
Fix merge conflict for I367ae3a5f97ff92e03312bed6fe37727ae3798ab

Bug: 144960427
Test: build pass
Change-Id: I24d684b4e695e8ab777f2ba7811b93f6028260d9
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
 2019-11-26 07:20:30 +00:00
Treehugger Robot
45b03edd00 Merge "Prevent null point exception" 2019-11-26 07:10:47 +00:00
Bonian Chen
5b6dcf42af Merge "[Settings] Fix test case" am: 9d66571966 
am: 1aac3bb569

Change-Id: I699e94aef7180509ca1f8bf4dd8d4f6ade7413fd
 2019-11-25 21:46:21 -08:00
Bonian Chen
1aac3bb569 Merge "[Settings] Fix test case" 
am: 9d66571966

Change-Id: Ieea99bd4da19962a6d7bd826b6678168e755cf2f
 2019-11-25 21:43:52 -08:00
Bonian Chen
9d66571966 Merge "[Settings] Fix test case" 2019-11-26 05:32:00 +00:00
timhypeng
953eb229c0 Sync dimen from SystemUI 
Bug: 141139595
Test: manual
Change-Id: Ifa9a31750b9a926e09aec9262aa89e8de66c91e2
(cherry picked from commit 3dd4f2cc19)
Merged-In: Ifa9a31750b9a926e09aec9262aa89e8de66c91e2
 2019-11-26 12:39:43 +08:00
timhypeng
b6b29c1af0 Battery icon is too large 
-sync layout from SystemUI

Bug: 141139595
Test: make -j42 RunSettingsRoboTests
Change-Id: I5e165e953682fcfdebf0d06475bb1abd171684d9
(cherry picked from commit c71f996da9)
Merged-In: I5e165e953682fcfdebf0d06475bb1abd171684d9
 2019-11-26 12:35:22 +08:00
Raff Tsai
0e8a45a7f5 Prevent null point exception 
Test: Settings -> click search bar, not seeing null point exception
Change-Id: Ib9df9d97b374246fa36c79f531760b57d7c6c508
 2019-11-26 12:05:58 +08:00
Bill Yi
2245b41b31 [automerger skipped] Import translations. DO NOT MERGE 
am: 5dd4272ee4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb0fffe0070fe272970636fa012c26900ad4e3e1
 2019-11-25 07:32:53 -08:00
Bonian Chen
6c25c29464 [Settings] Fix test case 
Change annotation library

Bug: 144664534
Test: build pass
Change-Id: Iffafc3a9a7dadc961d180c6a1ef2764c8d72eb2f
 2019-11-25 22:28:22 +08:00
Bonian Chen
8efd95c413 Merge "[Settings] Fix conflict of AOSP merge on wifi call" am: 95e1c8d099 
am: d7f0fb6cc1

Change-Id: Ic6268671ff092174866dbd6341a9d7113bd2a4bd
 2019-11-25 05:53:45 -08:00
Bonian Chen
d7f0fb6cc1 Merge "[Settings] Fix conflict of AOSP merge on wifi call" 
am: 95e1c8d099

Change-Id: Ia69e14def5abf09d286d20f7922ea6900e9d61f1
 2019-11-25 05:43:18 -08:00
Pooja Jain
812f8e9065 IMS: Grey out Wifi calling option when either sub is having call. 
The WifiCallingSettingsForSub was not checking for call state reported
by telephony manager, hence, when call was on other sub, the option was not
getting greyed out.
Use the TelephonyManager API to fetch callstate.

Test: Manual

Bug: 130706399
Change-Id: Ib4b0e1191c83e23377ccf8ed013252728ef9dd95
 2019-11-25 12:10:03 +05:30
Bonian Chen
95e1c8d099 Merge "[Settings] Fix conflict of AOSP merge on wifi call" 2019-11-25 03:07:16 +00:00
Bill Yi
5dd4272ee4 Import translations. DO NOT MERGE 
Change-Id: I0258ef130ec225a374ae445da558755f621556d0
Auto-generated-cl: translation import
 2019-11-24 04:38:04 -08:00
Jay Aliomer
c2302a3d93 Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev 
am: 26ce6885c9

Change-Id: If216838715772b9d45624e77213ec81f0c84bd60
 2019-11-22 14:42:52 -08:00
Jay Aliomer
26ce6885c9 Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev 2019-11-22 22:29:43 +00:00
Jay Aliomer
53ad4fedc6 Revert "Revert "Add settings for scheduling dark theme"" 
This reverts commit 50c0fa136c.

Reason for revert: Fixed the error which is code incompatibility
Test: run all settings tests
Change-Id: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Merged-In: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Bug: 141567787
 2019-11-22 20:58:23 +00:00
Bonian Chen
cacf047daa [Settings] Fix conflict of AOSP merge on wifi call 
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95

Bug: 144960427
Test: build pass
Change-Id: I2979a9a2ee1bc690486e25b7d470cf905cf02d17
Merged-In: Idb063bdab3d3b11c348804c1c0ecb268cca3068e
 2019-11-22 20:38:13 +00:00
Bill Yi
0014dd2d63 [automerger skipped] Import translations. DO NOT MERGE 
am: adfc51a550 -s ours
am skip reason: subject contains skip directive

Change-Id: Ieddaa832f55b0414da39936c058b95c31d7b3aca
 2019-11-22 12:05:37 -08:00
Bill Yi
adfc51a550 Import translations. DO NOT MERGE 
Change-Id: I64d2c2f4a3053bf7d163962d8a27929fd055b24b
Auto-generated-cl: translation import
 2019-11-22 10:44:01 -08:00
Andrei-Valentin Onea
555425a990 Merge "Add compatibility change preference" am: 0e7b8f7a93 
am: 5f2ee93a4b

Change-Id: I04714e52df6c5e967af744d584f5d2db38cb5680
 2019-11-22 06:12:52 -08:00
Andrei-Valentin Onea
5f2ee93a4b Merge "Add compatibility change preference" 
am: 0e7b8f7a93

Change-Id: Ied50da0e1cdda7c390603f184ae614dd8584025b
 2019-11-22 06:06:39 -08:00
Andrei-Valentin Onea
0e7b8f7a93 Merge "Add compatibility change preference" 2019-11-22 13:02:45 +00:00
Bonian Chen
3f413f1a17 [automerger skipped] Merge "[Settings] Fix conflict of AOSP merge" am: 56385ed9f8 -s ours 
am: 88594b8bf7 -s ours
am skip reason: change_id I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3 with SHA1 c7c84d2c87 is in history

Change-Id: I62b7db5b6b08a48b90c3a23f1d72cb97f36a085f
 2019-11-22 01:16:57 -08:00
Bonian Chen
88594b8bf7 [automerger skipped] Merge "[Settings] Fix conflict of AOSP merge" 
am: 56385ed9f8 -s ours
am skip reason: change_id I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3 with SHA1 c7c84d2c87 is in history

Change-Id: Ifaf20e18a9c5e9e8a890b4d3ffa5040c624dc0dd
 2019-11-22 01:13:28 -08:00
Bonian Chen
56385ed9f8 Merge "[Settings] Fix conflict of AOSP merge" 2019-11-22 09:05:29 +00:00
Hai Shalom
59185d0931 Merge "Revert submission" into qt-qpr1-dev 
am: 775106e40d

Change-Id: I90ea8783da54caf1f3e140b7eb768129d8332f61
 2019-11-21 19:57:51 -08:00
Hai Shalom
775106e40d Merge "Revert submission" into qt-qpr1-dev 2019-11-22 03:46:02 +00:00
Bonian Chen
821a1259e7 [Settings] Fix conflict of AOSP merge 
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95

Bug: 144960427
Test: build pass
Change-Id: I0e8c9b060f23547cec541819e657fc5560d6312c
Merged-In: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3
 2019-11-22 02:36:11 +00:00
Hai Shalom
40e7c05e53 Revert submission 
Reason for revert: Incomplete fix that causes additional issues which were not anticipated earlier.

Change-Id: I65868205cc8241f8179006256e6e13698ad79d64
Merged-In: I5f3a6e31dc96fbc016e6ab5f56c3c68eb9e7723f
 2019-11-21 23:09:22 +00:00
Preston O'Neal
1a67e3048e Merge "Revert "Add settings for scheduling dark theme"" into qt-qpr1-dev 
am: a3e26f10f2

Change-Id: I3ab3f5c219789a2b48d90607c17188e634e0c448
 2019-11-21 15:01:23 -08:00
Preston O'Neal
a3e26f10f2 Merge "Revert "Add settings for scheduling dark theme"" into qt-qpr1-dev 2019-11-21 22:41:18 +00:00
Preston O'Neal
50c0fa136c Revert "Add settings for scheduling dark theme" 
This reverts commit 7141b142df.

Reason for revert: This is breaking builds on git_qt-qpr1-dev

Change-Id: I7766826d3fc86a12fc8411b027a52eceb5a66019
 2019-11-21 22:09:53 +00:00