PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,862 Commits 1 Branch 0 Tags
42ca8b88010c185e77bc6765ae5bc1e946fd958c
Commit Graph

57862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
ac4d2898d7 Merge "[Settings] Replace Robolectric#setupActivity()" am: 6aee4f9548 am: 69f67d996b am: f5b6c700fc 
Change-Id: Ie5eecef02577c4aacbb84ab1ec4ca5e89d6e7850
 2019-12-23 08:29:14 +00:00
Automerger Merge Worker
f5b6c700fc Merge "[Settings] Replace Robolectric#setupActivity()" am: 6aee4f9548 am: 69f67d996b 
Change-Id: I2b2622c16d23347b8d0a709ea7e1b681e6be7480
 2019-12-23 08:16:16 +00:00
Bonian Chen
69f67d996b Merge "[Settings] Replace Robolectric#setupActivity()" 
am: 6aee4f9548

Change-Id: I4113d68bb4363dc5c847ab802c0cee16d726e444
 2019-12-23 00:02:22 -08:00
Bonian Chen
67f7ab3f2b [Settings] Replace TelephonyManager#from() 
Replacing TelephonyManager#from() by public API.

Bug: 146752167
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=EuiccPreferenceControllerTest
Change-Id: I8f6e8bc57c20782540f8b26bdeb163d881e70a2e
 2019-12-23 15:44:52 +08:00
Bonian Chen
6aee4f9548 Merge "[Settings] Replace Robolectric#setupActivity()" 2019-12-23 07:38:44 +00:00
TreeHugger Robot
0d8583332e Merge "Get package name on worker instead of on slice" 2019-12-23 06:59:12 +00:00
Automerger Merge Worker
d79b1ca9b9 [automerger skipped] Merge "[Settings] Add owners to support network part" am: 661f006bb2 am: 0ed7376449 am: 4af546197b -s ours 
am skip reason: Change-Id Ic2820bc113bc26fc0d162c42c7925477177127ae with SHA-1 2d41dbf141 is in history

Change-Id: Ib1a8bc3c206bebf441c94973513fb8b30ad30849
 2019-12-23 06:36:55 +00:00
Automerger Merge Worker
98d4dad16a Merge "Retrieve EID from each card" am: 2f5ad9cb4d am: d34e17143f am: 0988f8cfec 
Change-Id: I7867a8a6cc547e139facdfaee172066a4bd977b2
 2019-12-23 06:32:29 +00:00
Automerger Merge Worker
4af546197b Merge "[Settings] Add owners to support network part" am: 661f006bb2 am: 0ed7376449 
Change-Id: I480f8f481e200c3c551e621ba52e435c4fb0cf5b
 2019-12-23 06:22:32 +00:00
Automerger Merge Worker
0988f8cfec Merge "Retrieve EID from each card" am: 2f5ad9cb4d am: d34e17143f 
Change-Id: Iee9c974eef13599eebc4dfd82f7fbc5f10e7ca58
 2019-12-23 06:21:54 +00:00
SongFerngWang
d6bc6dee08 Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs 
- telephonymanager set subid by createForSubscriptionId
  -getDataNetworkType(I)
  -getVoiceNetworkType(I)
  -getSimSerialNumber(I)
  -getServiceStateForSubscriber(I)
- copy getNetworkTypeName() to SimStatusDialogController

Bug: 143998492
Test: Build pass.
      make RunSettingsRoboTests ROBOTEST_FILTER\
      =SimStatusDialogControllerTest

Change-Id: Ieb8547496a4b0da7332abd227056f9b786c7ef6a
 2019-12-23 14:12:56 +08:00
Bonian Chen
0ed7376449 Merge "[Settings] Add owners to support network part" 
am: 661f006bb2

Change-Id: I716f8391987f4d1feaf5e2df2d176d82236c0af9
 2019-12-22 22:09:28 -08:00
Bonian Chen
d34e17143f Merge "Retrieve EID from each card" 
am: 2f5ad9cb4d

Change-Id: I0a9f6ac304af1be0960adb16d5125de43c9ad4b0
 2019-12-22 22:06:32 -08:00
Bonian Chen
661f006bb2 Merge "[Settings] Add owners to support network part" 2019-12-23 05:57:59 +00:00
Bonian Chen
2f5ad9cb4d Merge "Retrieve EID from each card" 2019-12-23 05:53:14 +00:00
Edgar Wang
fee49421c7 Update Reset options summary 
- Update summary when user does not have permission to reset network or factory reset

Fixes: 126295214
Test: rototest & manual
Change-Id: I710f0abcd3df1560eb3e7bc53a7427d7a6a5aad7
 2019-12-23 13:47:46 +08:00
Bonian Chen
a0b942a6f4 [Settings] Add owners to support network part 
Add more owners to support network part.

Bug: none
Test: none
Change-Id: I3fa0a72e75aace65887c461204fd9a33bd8fee13
Merged-In: Ic2820bc113bc26fc0d162c42c7925477177127ae
 2019-12-23 12:40:07 +08:00
Automerger Merge Worker
05de72e6d2 Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API" am: 990b0527aa am: c9e4e0b881 am: 4b7659a1ef 
Change-Id: I6541e0452750a9d58d25eab8e65d6b2018567aa6
 2019-12-23 04:03:35 +00:00
Automerger Merge Worker
4b7659a1ef Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API" am: 990b0527aa am: c9e4e0b881 
Change-Id: I8ea4f4ec0781ebb28b3aeb0681123d9d1e8ba69b
 2019-12-23 03:50:58 +00:00
Zoey Chen
c9e4e0b881 Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API" 
am: 990b0527aa

Change-Id: I04c6d51db223bbdbcb18007e77c75103aed150ba
 2019-12-22 19:35:11 -08:00
Zoey Chen
990b0527aa Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API" 2019-12-23 03:33:35 +00:00
hughchen
6b3856d5de Get package name on worker instead of on slice 
Bug: 144535188
Test: make -j42 RunSettingsRoboTests
Change-Id: I3aa9c7ccf8df23527b8d2b79033c96ec1289c7ea
 2019-12-23 11:20:13 +08:00
Bonian Chen
6435164abf [Settings] Replace Robolectric#setupActivity() 
Avoid from accessing Robolectric#setupActivity().

Bug: 140707056
Test: make RunSettingsRoboTests ROBOTEST_FILTER=EuiccPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataServiceSetupPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ApnPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsagePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest
Change-Id: I8552b181d2dc1c9a5d8aeb0b7e79bbec7252f67e
 2019-12-23 03:08:25 +00:00
Automerger Merge Worker
778653fe71 Merge "[Settings] Replace TelephonyManager#from()" am: 19cebd9eca am: fb72a1094f am: 737783d5e4 
Change-Id: I392268bd41ff76960107f137ae10ebf3dd151170
 2019-12-23 03:04:51 +00:00
Automerger Merge Worker
737783d5e4 Merge "[Settings] Replace TelephonyManager#from()" am: 19cebd9eca am: fb72a1094f 
Change-Id: Ib6869f626d9cb5f085ab77c150e245dec904b6fb
 2019-12-23 02:51:48 +00:00
Bonian Chen
fb72a1094f Merge "[Settings] Replace TelephonyManager#from()" 
am: 19cebd9eca

Change-Id: Id5539c4177dbf5dec92add4e1150d6beea4907e5
 2019-12-22 18:42:08 -08:00
Bonian Chen
19cebd9eca Merge "[Settings] Replace TelephonyManager#from()" 2019-12-23 02:40:01 +00:00
Bonian Chen
228dd34a8a [Settings] Replace TelephonyManager#from() 
Replacing TelephonyManager#from() by public API.

Bug: 146752167
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageUtilsTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaListPreferenceTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaSubscriptionPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaSystemSelectPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AutoSelectPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=OpenNetworkSelectPagePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataServiceSetupPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=EnabledNetworkModePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MmsMessagePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=PreferredNetworkModePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileDataPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkSettingsTest
Change-Id: If78ad37d4795d615b6f8db2f5687a28792a6764f
 2019-12-23 01:00:38 +00:00
Automerger Merge Worker
74d79b5cda [automerger skipped] Merge "Create some strings for RTT setting" into qt-qpr1-dev am: 1cdbed55f9 am: c547fc78c7 -s ours 
am skip reason: Change-Id I26f218caba46273796e52c244c9f022742f0bdeb with SHA-1 6e996bd8d7 is in history

Change-Id: Ia08be1ec108be1182195308a256d850a8da19fc4
 2019-12-21 02:47:06 +00:00
Automerger Merge Worker
c547fc78c7 Merge "Create some strings for RTT setting" into qt-qpr1-dev am: 1cdbed55f9 
Change-Id: I8ddf92c23c00c7b2958dbefdf5483e2b609e92c3
 2019-12-21 02:34:00 +00:00
TreeHugger Robot
1cdbed55f9 Merge "Create some strings for RTT setting" into qt-qpr1-dev 2019-12-21 02:20:47 +00:00
TreeHugger Robot
411fe5df15 Merge "Create some strings for RTT setting" 2019-12-21 01:47:51 +00:00
Hai Shalom
8cdf1871f4 Merge "[DPP R2] Added support for DPP R2 events" 2019-12-20 19:25:16 +00:00
Automerger Merge Worker
edb1ab6cee [automerger skipped] Merge "Add Tapjacking Protection for SettingsHomepageActivity" into qt-qpr1-dev am: 12510978c3 am: 925e9771ea -s ours 
am skip reason: Change-Id I72f9a947f57f74a8c09127d6c39173594c248ddc with SHA-1 647e49e7cf is in history

Change-Id: Iaebfc1e3fabfb4d6c7a4347f13bc91f5f3f920ef
 2019-12-20 18:37:01 +00:00
Automerger Merge Worker
925e9771ea Merge "Add Tapjacking Protection for SettingsHomepageActivity" into qt-qpr1-dev am: 12510978c3 
Change-Id: I0808583341d6f2a867dfa47cf08e7f529e3b0571
 2019-12-20 18:25:50 +00:00
TreeHugger Robot
8b2594393b Merge "Refactor GestureNavigationSeekBarPreference" 2019-12-20 18:23:45 +00:00
TreeHugger Robot
12510978c3 Merge "Add Tapjacking Protection for SettingsHomepageActivity" into qt-qpr1-dev 2019-12-20 18:11:29 +00:00
Raff Tsai
00c79aecd1 Refactor GestureNavigationSeekBarPreference 
- Make GestureNavigationSeekBarPreference more flexible to configure

Fixes: 146462894
Test: adb shell am start -a android.settings.ASSIST_GESTURE_SETTINGS
      adb shell am start -a com.android.settings.GESTURE_NAVIGATION_SETTINGS

Change-Id: Ibc7ed8456fe4a42f12f0d436f53756df268acfbe
 2019-12-21 01:24:16 +08:00
Tsung-Mao Fang
6e996bd8d7 Create some strings for RTT setting 
Test: Rebuild
Bug: 146540478
Change-Id: I26f218caba46273796e52c244c9f022742f0bdeb
 2019-12-21 00:16:53 +08:00
Tsung-Mao Fang
0f7b65b512 Create some strings for RTT setting 
Test: Rebuild
Bug: 146540478
Change-Id: I26f218caba46273796e52c244c9f022742f0bdeb
Merged-In: I26f218caba46273796e52c244c9f022742f0bdeb
 2019-12-20 16:03:27 +00:00
Automerger Merge Worker
1a33a04433 Merge "Update the behavior of the Dark theme slice" into qt-qpr1-dev am: bc96cf54cd am: 17bc83209f 
Change-Id: I99ef0de75926ba951dd27154f0651e97ea826945
 2019-12-20 15:56:50 +00:00
Automerger Merge Worker
17bc83209f Merge "Update the behavior of the Dark theme slice" into qt-qpr1-dev am: bc96cf54cd 
Change-Id: I9f59dac9b64f2cb0acf31448c10cb0ef5c04da62
 2019-12-20 15:35:13 +00:00
TreeHugger Robot
bc96cf54cd Merge "Update the behavior of the Dark theme slice" into qt-qpr1-dev 2019-12-20 15:23:53 +00:00
Automerger Merge Worker
08c879672e [automerger skipped] Remove permission bar chart in Privacy setting am: 8e58e2c7a5 am: 4b6beab35e -s ours 
am skip reason: Change-Id I51aca52bc605a3c6b0cafc084e8e491c280d770f with SHA-1 ab914adc00 is in history

Change-Id: Ia7856f6598336b1dab6f227da82f84c5225c2d91
 2019-12-20 10:44:29 +00:00
Automerger Merge Worker
4b6beab35e Remove permission bar chart in Privacy setting am: 8e58e2c7a5 
Change-Id: Id55e0078ce0eccc85a0ef15706ba07b26da5c3ab
 2019-12-20 10:31:03 +00:00
Yi-Ling Chuang
288200c27d Change DEFAULT_CARD_COUNT for settings homepage. 
In the new design, we only show up to three cards at a time.

Bug: 138754406
Test: robotests
Change-Id: Ie38c3ee4b33068b9ecb4d6dcd3fa71df3fbd7d07
 2019-12-20 17:57:33 +08:00
Alex Li
39c10adfb4 Merge "[Settings] Adds an intent extra when setup wizard start the WallpaperSuggestionActivity" 2019-12-20 06:54:40 +00:00
TreeHugger Robot
6df1b4b5e0 Merge "Fix focus on wrong tab" 2019-12-20 05:55:15 +00:00
Howard Chen
c87d7c6047 Fix SelectDSUPreferenceControllerTest 
Bug: 146316826
Test: make -j32 RunSettingsRoboTests
Change-Id: If12f40ea2f029773b9b016e69de5246ef27635af
 2019-12-20 13:46:37 +08:00
Sunny Shao
5f42f2f7a7 Update the behavior of the Dark theme slice 
- Dark theme slice disappear when battery saver is ON.

Bug: 146149658
Fixes: 142476879
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.slices.DarkThemeSliceTest
Change-Id: I071014d7f0658db2098e353717afda905f162ecd
 2019-12-20 13:25:49 +08:00