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

9122 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Jay Aliomer
204b82e2e7 Add settings for scheduling dark theme 
am: 7141b142df

Change-Id: Ib58ca2eceaea6638e29028126c377802cac9df1d
 2019-11-21 13:48:14 -08:00
Jay Aliomer
7141b142df Add settings for scheduling dark theme 
Adding a settings page similar to night light for Dark theme. it will allow the user to schedule
dark mode from sunrise to sunset

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"

Fixes: 141567787

Change-Id: I3094b655c04f59c23a95162a1be5ee8260e28a48
(cherry picked from commit 0828e6be9c)
 2019-11-21 20:07:24 +00:00
Andrei Onea
486fd49e87 Add compatibility change preference 
Add UI for modifying the compatibility change overrides per-app.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 138280620
Change-Id: I07c7602e7a439e47b0b1fa59b047231afbbc0ab6
 2019-11-21 11:48:07 +00:00
Bonian Chen
04b12dd0ae Merge "[Settings] Fix robotest build breakage" am: 6c9b9f41d6 
am: 635c2fa095

Change-Id: I2bbd23c7600dc608abd42cb350324cd42cecc00f
 2019-11-20 19:14:51 -08:00
Bonian Chen
635c2fa095 Merge "[Settings] Fix robotest build breakage" 
am: 6c9b9f41d6

Change-Id: I0b52f783c5dd46a06ebfb0a51650666c0e52b961
 2019-11-20 19:11:18 -08:00
Bonian Chen
4a1dbccac6 [Settings] Fix robotest build breakage 
Add annotation library into test build

Bug: 144810473
Test: build pass
Change-Id: Idb4e056fb73a349ac268e5d2292a31fe7d9a6642
 2019-11-20 23:05:55 +08:00
Sunny Shao
e565a793be Merge "Add a dark theme slice" into qt-qpr1-dev 
am: 713143df37

Change-Id: Ie026d122cb1aedd629d2860143aace2bdd599ae9
 2019-11-18 17:38:13 -08:00
TreeHugger Robot
713143df37 Merge "Add a dark theme slice" into qt-qpr1-dev 2019-11-19 01:26:30 +00:00
Bill Yi
60f2a277e0 Import translations. DO NOT MERGE 
Change-Id: I8c576fcd3e758334750e0fa24253cff9ee95466b
Auto-generated-cl: translation import
 2019-11-15 12:09:15 -08:00
Hunter Knepshield
b0b539946f Merge "Synced the code from master branch" am: 64efbe1240 
am: 418ef9973e

Change-Id: I430b9c45d007de822c87733b1eb4fc71b36ff23c
 2019-11-15 10:54:38 -08:00
Hunter Knepshield
418ef9973e Merge "Synced the code from master branch" 
am: 64efbe1240

Change-Id: I042c2bb85876bf67acc98113f01186e831adeae5
 2019-11-15 10:45:58 -08:00
Sunny Shao
abcbc79d7d Add a dark theme slice 
Fixes: 142476879
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.slices.DarkThemeSliceTest
Change-Id: I4865c3c4a807bc4ac96762a882b193a3e2595019
 2019-11-15 13:41:49 +08:00
Sunny Shao
f3865e9264 Synced the code from master branch 
Fixes: 144364245
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.PhoneNumberPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.simstatus.SimStatusDialogControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony.RenameMobileNetworkDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSliceTest
Change-Id: Ibb26f5a63a969b28915a226a0197bc4033c91346
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
 2019-11-14 21:57:12 +08:00
Raff Tsai
5d0c49e9ef Merge "Fix Battery page animation" into qt-qpr1-dev 
am: 8b348f1f30

Change-Id: I922be1ac21e17c9ae71d7721401a08bbd56ca020
 2019-11-04 22:15:20 -08:00
Raff Tsai
6a3433b67a Fix Battery page animation 
TextView summary1 has default height 2 line. If the content is longer
than 2 line, the TextView increases itself which causes the animation.
By increasing minLines to 3, it can avoid the animation. And remove
summary2 because it is only for debug purpose, the debug information
can be merged to summary1.

Fixes: 139554919
Test: visual, make RunSettingsRoboTests
Change-Id: I167ac87c9bd83035e00d4991961599e76f4f69e1
(cherry picked from commit 648ada031d)
Merged-In: I167ac87c9bd83035e00d4991961599e76f4f69e1
 2019-11-05 12:11:51 +08:00
Xin Li
c73fd84126 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master 
Bug: 142003500
Change-Id: Ibae6b218a616a93cfda05dd77a5ea6f3a2dc4cea
 2019-10-30 11:49:56 -07:00
Raff Tsai
54ef0fcbc0 Merge "Settings: Respect preference's visibility in VideoPreferenceController" am: 0e40f46fe2 am: 447674e100 
am: 4cbb60c344

Change-Id: I2c4a9774c2ae463ed80810dc95a298e1302f4b5f
 2019-10-29 10:24:05 -07:00
Raff Tsai
4cbb60c344 Merge "Settings: Respect preference's visibility in VideoPreferenceController" am: 0e40f46fe2 
am: 447674e100

Change-Id: I9680dc02dc96fc324b019c027d08271fb27b4506
 2019-10-29 10:19:05 -07:00
Raff Tsai
447674e100 Merge "Settings: Respect preference's visibility in VideoPreferenceController" 
am: 0e40f46fe2

Change-Id: Iecf7610d41896a5fa0ae7d6aa0ca0de75463eb7e
 2019-10-29 10:12:05 -07:00
Raff Tsai
0e40f46fe2 Merge "Settings: Respect preference's visibility in VideoPreferenceController" 2019-10-29 16:39:13 +00:00
LuK1337
9c3ab97182 Settings: Respect preference's visibility in VideoPreferenceController 
* Since AbstractPreferenceController's displayPreference()
  sets the visibility based on isAvailable() we need to
  set mVideoPreference early and make getAvailabilityStatus()
  return UNSUPPORTED_ON_DEVICE if needed.

Test: manual, open battery manager
Change-Id: Ibf72971b49fa1162fb99f9fc61cbb54ba39a2dfa
 2019-10-29 15:39:27 +01:00
Josh Hou
0fe6fc26ad Merge changes Ibec13fbe,If89c67c0 am: 27bf33e053 am: e8a6c02fd2 
am: 03c9ec1223

Change-Id: I8dc1754d631ac16a99e1c92776a2756ca5b8269e
 2019-10-28 05:43:11 -07:00
Josh Hou
03c9ec1223 Merge changes Ibec13fbe,If89c67c0 am: 27bf33e053 
am: e8a6c02fd2

Change-Id: I1823e81857f95d7bcd6c1d5e7d840900b38c9d2d
 2019-10-28 05:37:47 -07:00
Josh Hou
e8a6c02fd2 Merge changes Ibec13fbe,If89c67c0 
am: 27bf33e053

Change-Id: I661976aa6161d80aa23f47424828336cc7ca6ae6
 2019-10-28 05:31:32 -07:00
Josh Hou
e2cdd74174 Fix ViLTE is not available when WiFi Calling is disabled 
Bug: 141831293
Test: 1. Set carrier config carrier_wfc_ims_available_bool to false,
then verify Wi-Fi calling option is not shown.
      2. Set carrier config carrier_vt_available_bool to false, then
      verify video calling option is not shown.
      3. Set both carrier_wfc_ims_available_bool and
      carrier_vt_available_bool to false, then verify calling category
      is not shown.

Change-Id: Ibec13fbeb5acf1d62342286687b2ba969beb4e14
Merged-In: Ibec13fbeb5acf1d62342286687b2ba969beb4e14
 2019-10-28 11:12:49 +00:00
Youming Ye
001a2e774d Check the missing useHomeWfMode case 
Bug: 133812904
Test: Build
Change-Id: If89c67c0595808a1339517c6084f1d1e23f5974b
Merged-In: If89c67c0595808a1339517c6084f1d1e23f5974b
 2019-10-28 10:16:24 +00:00
Lucas Lin
06b7986eff Merge "Improve the wifi description for the case of private DNS broken" am: 37b17ae752 am: 5eda5a3e7f 
am: 9b29332cd3

Change-Id: I3cd916c67afaebfd62863301eca5f6aeb8b0d1c5
 2019-10-23 03:20:15 -07:00
Lucas Lin
9b29332cd3 Merge "Improve the wifi description for the case of private DNS broken" am: 37b17ae752 
am: 5eda5a3e7f

Change-Id: Idd568b71dab954a6b018594e15d3f695ea2aeac2
 2019-10-23 03:07:20 -07:00
Lucas Lin
5eda5a3e7f Merge "Improve the wifi description for the case of private DNS broken" 
am: 37b17ae752

Change-Id: I46ad5cff3809191483b48fe292dba220a0d699c6
 2019-10-23 02:52:01 -07:00
Lucas Lin
37b17ae752 Merge "Improve the wifi description for the case of private DNS broken" 2019-10-23 09:20:09 +00:00