PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,546 Commits 1 Branch 0 Tags
e8af88794f198e51acc05a92d0a01df366de511c
Commit Graph

80546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wilson Wu
fb718d4f95 Merge "Apply ResultCallback to DevelopmentTiles" into sc-dev am: 70864998c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13425387

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaefc138d6691a0cb7de5e0e3e5a8e291445fcc63
 2021-02-02 08:09:16 +00:00
Wilson Wu
70864998c4 Merge "Apply ResultCallback to DevelopmentTiles" into sc-dev 2021-02-02 07:35:56 +00:00
Wesley.CW Wang
62eabdb6f2 Update battery saver column to PrimarySwitchPreference (1/2) am: 8d9fe815b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413813

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95996112b18e49d8696d3f3a6de5dc0779323f68
 2021-02-02 06:37:41 +00:00
Wesley.CW Wang
8d9fe815b0 Update battery saver column to PrimarySwitchPreference (1/2) 
- Change battery saver entry column to new design
 Screenshot: https://screenshot.googleplex.com/9a9Gxm3McJVmLkD.png

Bug: 177407113
Test: make RunSettingsRoboTests -j40
Change-Id: I513bc4371518645f4e725df27f2cb978cec284e8
 2021-02-02 06:13:08 +00:00
Chen Xu
f7e3d57023 UK emergency alert app rename 
Bug: 179052608
Test: Build
Change-Id: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
 2021-02-02 12:55:03 +08:00
Sarah Chin
123205e141 Update onSubscriptonOverride listener 
Test: atest FrameworksTelephonyTests
Test: atest SubscriptionManagerTest
Bug: 175723642
Change-Id: I9436b414608d7c964185d3d5c3f1f554c65b2c12
Merged-In: I9436b414608d7c964185d3d5c3f1f554c65b2c12
 2021-02-01 18:33:34 -08:00
Jiashen Wang
1c205502ef Merge "Slot Change Receiver Migration" into sc-dev am: 428273765b am: e6da71456f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13411837

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I506f49bf863d8f32b07dd93a5ce5ef27a5bc1d27
 2021-02-02 01:17:07 +00:00
Jiashen Wang
43714a0c71 Merge "Change Settings to be able to receive timeout values from LPA" into sc-dev am: 8cfa4c8c97 am: 966973f422 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13431258

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6d8f22db3a18610ca2110cca1cced61abda2566
 2021-02-02 01:15:47 +00:00
Jiashen Wang
e6da71456f Merge "Slot Change Receiver Migration" into sc-dev am: 428273765b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13411837

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb64c4ec83ccafb0f04d2554b791f5ab6bd2047b
 2021-02-02 00:54:50 +00:00
Jiashen Wang
966973f422 Merge "Change Settings to be able to receive timeout values from LPA" into sc-dev am: 8cfa4c8c97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13431258

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id66f32bc60a016ec2d31a632e68076b5248ea68f
 2021-02-02 00:09:25 +00:00
Jiashen Wang
428273765b Merge "Slot Change Receiver Migration" into sc-dev 2021-02-01 23:57:09 +00:00
Jiashen Wang
8cfa4c8c97 Merge "Change Settings to be able to receive timeout values from LPA" into sc-dev 2021-02-01 23:56:37 +00:00
Tom Hsu
b00c7722c5 [automerger skipped] Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3 am: 62f6b96b51 -s ours am: fd8531400d -s ours am: 58e6563250 -s ours 
am skip reason: Change-Id I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5 with SHA-1 ba845f7fe4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic50215d4f07d0d6498fd58644771bedcd75bd405
 2021-02-01 19:58:41 +00:00
Tom Hsu
58e6563250 [automerger skipped] Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3 am: 62f6b96b51 -s ours am: fd8531400d -s ours 
am skip reason: Change-Id I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5 with SHA-1 ba845f7fe4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43e7917951351bcf7ebe868f1a044a663d8dfaed
 2021-02-01 19:36:45 +00:00
Tom Hsu
fd8531400d [automerger skipped] Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3 am: 62f6b96b51 -s ours 
am skip reason: Change-Id I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5 with SHA-1 ba845f7fe4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I317d66aebf3fc45800a062cd34f9aa3f5eec90bf
 2021-02-01 18:28:23 +00:00
TreeHugger Robot
fbdfc8fcb0 Merge "[Provider Model] Fix InternetPreferenceControllerTest failed issue." into sc-dev am: b40e5dc89d am: 953dc45f77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13451766

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d691374d9ff85d56e9032bab1ece092ca1c56a0
 2021-02-01 18:27:33 +00:00
TreeHugger Robot
953dc45f77 Merge "[Provider Model] Fix InternetPreferenceControllerTest failed issue." into sc-dev am: b40e5dc89d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13451766

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64e4d969380bb87315347a1ee5812039474da0c1
 2021-02-01 18:01:24 +00:00
Tom Hsu
62f6b96b51 Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1d85c7136b824e69077ea06c68d142a706c2b11
 2021-02-01 18:00:38 +00:00
Tom Hsu
6ec886a0e3 Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev 2021-02-01 17:26:47 +00:00
TreeHugger Robot
b40e5dc89d Merge "[Provider Model] Fix InternetPreferenceControllerTest failed issue." into sc-dev 2021-02-01 17:00:04 +00:00
Tsung-Mao Fang
0942bf2582 Merge "Tweak the ui based on the Android S design" into sc-dev am: 77382001fa am: fdd8331363 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448953

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd7dfb3f5e3bf0f26f1b6c525ffa80256b9227a4
 2021-02-01 15:19:40 +00:00
Zoey Chen
9657379d70 Merge "[Provider Model] Add Learn more in the WFC footer" into sc-dev am: 68c2d0bdf6 am: 81941b9aa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448951

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf3c92e01b5445a8829d84daecf0929599d09281
 2021-02-01 15:19:15 +00:00
Tsung-Mao Fang
fdd8331363 Merge "Tweak the ui based on the Android S design" into sc-dev am: 77382001fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448953

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic608677db8d11500f70940839b677c98ece6b230
 2021-02-01 14:51:44 +00:00
Zoey Chen
81941b9aa3 Merge "[Provider Model] Add Learn more in the WFC footer" into sc-dev am: 68c2d0bdf6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448951

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0462678ce051c984784359b56da4f51269891898
 2021-02-01 14:51:28 +00:00
Tsung-Mao Fang
77382001fa Merge "Tweak the ui based on the Android S design" into sc-dev 2021-02-01 14:39:04 +00:00
Weng Su
5cf4cf2660 [Provider Model] Fix InternetPreferenceControllerTest failed issue. 
- Bypass system resource

Bug: 179016907
Test: manual test
- atest InternetPreferenceControllerTest
Change-Id: I860eb3173f112a7d3f820701afb1a96a06d4a296
 2021-02-01 14:37:38 +00:00
Zoey Chen
68c2d0bdf6 Merge "[Provider Model] Add Learn more in the WFC footer" into sc-dev 2021-02-01 14:10:29 +00:00
Zoey Chen
29dd5f9ec3 Merge "[Provider Model] Update the preferred status to the latest" into sc-dev am: 28f3a570f7 am: 39dbfb91bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448950

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1999858a985b1ae59732e7320fd3739833a1a37a
 2021-02-01 14:05:26 +00:00
Zoey Chen
39dbfb91bd Merge "[Provider Model] Update the preferred status to the latest" into sc-dev am: 28f3a570f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448950

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7d832333fefd71e4f6c07727e5efddc57134dc5
 2021-02-01 13:49:10 +00:00
Zoey Chen
28f3a570f7 Merge "[Provider Model] Update the preferred status to the latest" into sc-dev 2021-02-01 13:18:59 +00:00
Tsung-Mao Fang
23e77a557a Tweak the ui based on the Android S design 
- Use TopIntro preference to show introduction text

Change-Id: Ic2304dab188848dfa6ef8a0429fd5b7ad40cf0af
Test: See the screenshot- https://screenshot.googleplex.com/AMS64EGe5Fcdfn8
Fix: 177997785
 2021-02-01 20:46:43 +08:00
Aaron Huang
3bb961affd Replace @hide API with public API 
ProxyInfo is inculded in framework-connectivity module
which should not have external dependencies on its hidden API.
Thus, migrate getExclusionListAsString to getExclusionList.

Bug: 178777253
Test: build
Change-Id: I64b9d5be062bec43c7be3ea68d1f63054319df2d

Change-Id: I400df793fc669d0e574fb4cf022d021d99859d53
 2021-02-01 19:16:23 +08:00
Jeremy Goldman
ea8e384dcd Merge "SubscriptionUtil checks that SubscriptionInfo is null before accessing." into sc-dev am: ba8f1ad06f am: f9682d67f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448948

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2d5fabe09e95eadacd05f2a2fd932e4a8d5e05f
 2021-02-01 09:17:40 +00:00
TreeHugger Robot
2ae912cf00 Merge "Update Mobile Settings Dialog theme to adopt Dark theme" into sc-dev am: b1b0f450e7 am: e0a5aadbc9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422721

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I491d044a74381d73450aa8214f05003f5f9ee9ab
 2021-02-01 09:17:34 +00:00
TreeHugger Robot
25250d48e3 Merge "The wifi list is not null at no signal room" into sc-dev am: 3cdb93cbf9 am: 696d722216 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432400

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7fa6236ba4608d5ea5a4e9c3ddf2c9c1caa9028
 2021-02-01 09:17:10 +00:00
Zoey Chen
4f05555f4f [Provider Model] Add Learn more in the WFC footer 
UX deck: https://screenshot.googleplex.com/4DxGCxgEsujhEpy.png
Implementation: https://screenshot.googleplex.com/5yZhQMQwwRZQkge.png

Bug: 178898044
Test: make
Change-Id: Icfde927e6781303b6016b0ec13201fd7052191d3
 2021-02-01 16:57:57 +08:00
Jeremy Goldman
f9682d67f5 Merge "SubscriptionUtil checks that SubscriptionInfo is null before accessing." into sc-dev am: ba8f1ad06f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448948

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e4c45765397b2d033117f02e40a72e41f2ae08b
 2021-02-01 08:17:34 +00:00
TreeHugger Robot
e0a5aadbc9 Merge "Update Mobile Settings Dialog theme to adopt Dark theme" into sc-dev am: b1b0f450e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422721

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id502b5d654c27851158529bf87a146e5b027be44
 2021-02-01 08:17:26 +00:00
TreeHugger Robot
696d722216 Merge "The wifi list is not null at no signal room" into sc-dev am: 3cdb93cbf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432400

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I977938da8047b9baaad118cbe74c7ea1761346d6
 2021-02-01 08:17:12 +00:00
Jeremy Goldman
ba8f1ad06f Merge "SubscriptionUtil checks that SubscriptionInfo is null before accessing." into sc-dev 2021-02-01 08:16:42 +00:00
TreeHugger Robot
b1b0f450e7 Merge "Update Mobile Settings Dialog theme to adopt Dark theme" into sc-dev 2021-02-01 08:00:17 +00:00
Zoey Chen
9b2c37db9c [Provider Model] Update the preferred status to the latest 
Bug: 178916743
Test: make
Change-Id: I223c3a2e8481fd1b887ef9e2d200906d12c7eec5
 2021-02-01 15:53:21 +08:00
TreeHugger Robot
3cdb93cbf9 Merge "The wifi list is not null at no signal room" into sc-dev 2021-02-01 07:53:18 +00:00
Weng Su
65bab8d5f8 Merge "[Provider Model] Fix Internet preference crash" into sc-dev am: 548569e3eb am: 52394b4245 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13425304

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1ebca917ca4657bf72a0e3698723d8bae1d9610
 2021-02-01 07:29:50 +00:00
Weng Su
52394b4245 Merge "[Provider Model] Fix Internet preference crash" into sc-dev am: 548569e3eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13425304

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7966fa1c153b72fa9b680ee017a243f987126e5
 2021-02-01 06:39:02 +00:00
Weng Su
548569e3eb Merge "[Provider Model] Fix Internet preference crash" into sc-dev 2021-02-01 06:12:11 +00:00
SongFerngWang
705f1df886 The wifi list is not null at no signal room 
- check the wifi list's size for error message.
- fix the carrier's summary display "connect" at no signal room

Bug: 177390298
Test: atest ProviderModelSliceHelperTest
atest ProviderModelSliceTest

Change-Id: I692aadd01a290cce2438b0d3c084bef8d8d3fa24
 2021-02-01 13:58:49 +08:00
Bonian Chen
f2b3767626 Merge "[Settings] Backup calling string change" into sc-dev am: ca502c24b6 am: fe31561801 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13437249

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I058c83afabebf8a54407b0bbdcb945e5fd3d8d0d
 2021-02-01 05:04:22 +00:00
Jeremy Goldman
b3fc7e5b10 Merge "SubscriptionUtil checks that SubscriptionInfo is null before accessing." 2021-02-01 05:03:30 +00:00
Jeremy Goldman
3dd2878437 SubscriptionUtil checks that SubscriptionInfo is null before accessing. 
Test: atest -c SubscriptionUtilTest
Bug: 178707680
Change-Id: I03938405929c3307460107671bbe695ee5e0f6e9
 2021-02-01 05:01:49 +00:00