PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,968 Commits 1 Branch 0 Tags
b8a4a10bcc8e66608dc20c42bed68c0e2e8e6ec9
Commit Graph

75968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Betty Chang
18c9d1db3f Merge "[Testing] Use AndroidJUnit4 instead in GlobalSettingsChangeListenerTest" 2020-08-13 13:19:59 +00:00
TreeHugger Robot
8b7cee48ea Merge "Add AirplaneModePreferenceControllerTest at Androidx.Test" am: be6d42ebbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12167388

Change-Id: Ied6f8a818e15a720cef944362fb3c2979cae312d
 2020-08-13 12:21:07 +00:00
TreeHugger Robot
be6d42ebbd Merge "Add AirplaneModePreferenceControllerTest at Androidx.Test" 2020-08-13 12:17:11 +00:00
Jason Hsu
e32466dc0a Merge "Update the formal image for magnification" am: 0d4c74a605 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12369325

Change-Id: Ic8bcb6d1b739d26a9684008567852f94572e1f08
 2020-08-13 12:10:48 +00:00
Jason Hsu
0d4c74a605 Merge "Update the formal image for magnification" 2020-08-13 11:50:24 +00:00
Jackal Guo
b89fec52f2 [automerger skipped] Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438 am: e8b8d9917a -s ours am: 37448ae2ae am: 9928eff933 am: c6d3501a70 am: 427d621a76 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396

Change-Id: I0c6660db065840623222c9c47e4d12de12aaaff1
 2020-08-13 10:50:16 +00:00
Bonian Chen
1c97e70641 [Settings] Grant permissions to submit junit test 
Grant permissions for adding new Junit test case.

Change-Id: Iabde2307669815fd50cdba241492c82b9e2cf64d
 2020-08-13 18:49:31 +08:00
Jackal Guo
427d621a76 [automerger skipped] Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438 am: e8b8d9917a -s ours am: 37448ae2ae am: 9928eff933 am: c6d3501a70 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396

Change-Id: Ic7cf0caeaa39dc6a4427c26f28c3735d5175ddb2
 2020-08-13 10:28:45 +00:00
changbetty
7f94b4dbb9 [Testing] Use AndroidJUnit4 instead in GlobalSettingsChangeListenerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Add new TestListener for spy GlobalSettingsChangeListener

Bug: 163299183
Test: atest -c GlobalSettingsChangeListenerTest
Change-Id: I0290470d3d3b235e0069ecbb9c1ce87a705d71d1
 2020-08-13 18:24:49 +08:00
Jackal Guo
c6d3501a70 [automerger skipped] Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438 am: e8b8d9917a -s ours am: 37448ae2ae am: 9928eff933 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396

Change-Id: I6d5b6251c52b9d53902691ccafcfcc5ecacac364
 2020-08-13 10:09:45 +00:00
Bonian Chen
3f1394e6c8 [automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e am: 4fc5e348bf -s ours am: 8eb932b5b1 -s ours am: 00e8b63d0f -s ours am: 5d9d199615 -s ours am: 06e5c0dad1 -s ours 
am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f84 is in history

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

Change-Id: Ib7739a7c954ff2ad6b4eaeb4f04cd02cb816d9e5
 2020-08-13 10:09:45 +00:00
Jason Chiu
b824187524 [DO NOT MERGE] Update contextual cards display mechanism 
1. Make Wi-Fi card default to collapse.
2. Support showing a default card when there's no displayable card.
3. Solve the problem of icon not showing for cached slices in card
renderer

Bug: 163288869
Fixes: 159092915
Test: manual, robotest
Change-Id: Ie8b61ad58410337334e29b7a794353b0c6a6ba8c
 2020-08-13 17:58:55 +08:00
jasonwshsu
c2dd8ff32a Update the formal image for magnification 
* full_screen and window_screen image

Fix: 146019459
Test: manual test
Change-Id: I53dc9200f3c1460f9a1691fd72e55f1b6fac8c96
 2020-08-13 17:55:46 +08:00
Jackal Guo
9928eff933 [automerger skipped] Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438 am: e8b8d9917a -s ours am: 37448ae2ae 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396

Change-Id: I7f420c6ae54685d42039a19223ce1c27060a16be
 2020-08-13 09:52:33 +00:00
Bonian Chen
06e5c0dad1 [automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e am: 4fc5e348bf -s ours am: 8eb932b5b1 -s ours am: 00e8b63d0f -s ours am: 5d9d199615 -s ours 
am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f84 is in history

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

Change-Id: I5578b499fb7c5b81bf6830174914b5afcf998992
 2020-08-13 09:51:10 +00:00
Arc Wang
b9f1fa1bb2 [automerger skipped] Merge "[Wi-Fi] Fix crash after editing invalid hotspot password" into rvc-qpr-dev am: b6a9493804 am: 8df77fd7a3 -s ours am: aa935f2711 -s ours 
am skip reason: Change-Id Ief3c6c1f08f8fcdf128768cde3ab8eef91f19fbe with SHA-1 ae79c41cd7 is in history

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

Change-Id: I1e015060184109b5fe0f06dbcc94784ecd931dc6
 2020-08-13 09:41:37 +00:00
Bonian Chen
5d9d199615 [automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e am: 4fc5e348bf -s ours am: 8eb932b5b1 -s ours am: 00e8b63d0f -s ours 
am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f84 is in history

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

Change-Id: Ifea57b05ebc568110ff421ec9d0f3264aa5cf5ca
 2020-08-13 09:41:26 +00:00
Jackal Guo
37448ae2ae [automerger skipped] Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438 am: e8b8d9917a -s ours 
am skip reason: skipped by user jackalguo

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

Change-Id: Ia3b8566a3fa72c7cf45501d1610c183bcc6ee7be
 2020-08-13 09:32:19 +00:00
SongFerngWang
4ba7007aba Add AirplaneModePreferenceControllerTest at Androidx.Test 
Bug: 161875909
Test: atest AirplaneModePreferenceControllerTest (PASS)
Change-Id: Id1c50824fa420d958fcc45f80aba30a360c40b94
 2020-08-13 17:32:13 +08:00
Bonian Chen
00e8b63d0f [automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e am: 4fc5e348bf -s ours am: 8eb932b5b1 -s ours 
am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f84 is in history

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

Change-Id: I9aa4c9e5995037bfa5ad5ace90889d430993dd27
 2020-08-13 09:25:07 +00:00
Arc Wang
aa935f2711 [automerger skipped] Merge "[Wi-Fi] Fix crash after editing invalid hotspot password" into rvc-qpr-dev am: b6a9493804 am: 8df77fd7a3 -s ours 
am skip reason: Change-Id Ief3c6c1f08f8fcdf128768cde3ab8eef91f19fbe with SHA-1 ae79c41cd7 is in history

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

Change-Id: Ie1c68c9cbfecfe21528ab70b8156aa90f7c54926
 2020-08-13 09:23:50 +00:00
Bonian Chen
8eb932b5b1 [automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e am: 4fc5e348bf -s ours 
am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f84 is in history

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

Change-Id: I22f62a4e0a0474cf9ead4d1ed38090b28bf0b243
 2020-08-13 09:14:05 +00:00
Arc Wang
8df77fd7a3 Merge "[Wi-Fi] Fix crash after editing invalid hotspot password" into rvc-qpr-dev am: b6a9493804 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12355969

Change-Id: Ibe5882d260907654e8c8891a4e65fb73e9e39730
 2020-08-13 09:06:17 +00:00
Jackal Guo
e8b8d9917a Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396

Change-Id: I7fc418fd2abb11be330b2b7f2139d5d44307b3d1
 2020-08-13 08:56:03 +00:00
Bonian Chen
4fc5e348bf Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398391

Change-Id: Icf8d0db6ffb41041652ae27f0573da2f118465c3
 2020-08-13 08:55:56 +00:00
Jackal Guo
d7f05b5438 Merge "Revert "[Settings] Refactor PhoneStateListener"" 2020-08-13 08:52:47 +00:00
Arc Wang
b6a9493804 Merge "[Wi-Fi] Fix crash after editing invalid hotspot password" into rvc-qpr-dev 2020-08-13 08:52:27 +00:00
Jackal Guo
765fb8293d Revert "[Settings] Refactor PhoneStateListener" 
This reverts commit e01df59027.

Reason for revert: b/163995409 | Build failure.

Change-Id: Ia413a4bae93055ceca5b6aa85602c84a8fbe5424
 2020-08-13 08:48:31 +00:00
Bonian Chen
7903cf872e Merge "[Settings] Refactor PhoneStateListener" 2020-08-13 08:13:25 +00:00
Bonian Chen
01001ba803 [automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b am: 5c21396034 -s ours am: ce259b61f6 -s ours am: bdd022172e -s ours am: 5278ed8be1 -s ours am: 32a908cc69 -s ours 
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72 is in history

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

Change-Id: Icc312336a2577d3c33566f19dc5ba5dd69c58730
 2020-08-13 05:56:52 +00:00
Bonian Chen
32a908cc69 [automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b am: 5c21396034 -s ours am: ce259b61f6 -s ours am: bdd022172e -s ours am: 5278ed8be1 -s ours 
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72 is in history

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

Change-Id: I2170d3f7b7086c9bf6ef7692b43146f5cff31135
 2020-08-13 05:38:42 +00:00
Bonian Chen
5278ed8be1 [automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b am: 5c21396034 -s ours am: ce259b61f6 -s ours am: bdd022172e -s ours 
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72 is in history

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

Change-Id: I0d8fcdf66e7c9d664c75525cce723e4f83d15bc5
 2020-08-13 05:28:58 +00:00
Bonian Chen
bdd022172e [automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b am: 5c21396034 -s ours am: ce259b61f6 -s ours 
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72 is in history

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

Change-Id: Ibb972bf5b76ae57ff451fe2ee65d312fcf388956
 2020-08-13 05:14:59 +00:00
Bonian Chen
e01df59027 [Settings] Refactor PhoneStateListener 
Remove Looper and update of mSubId

Bug: 144542981
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingPreferenceControllerTest

Merged-In: Ie6ae5b5914322644f2655e585b03a6b685bbc84a
Change-Id: I5306b3a80220c02d2de1b25f20e8ef7f845e9a09
 2020-08-13 13:02:04 +08:00
Bonian Chen
ce259b61f6 [automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b am: 5c21396034 -s ours 
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72 is in history

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

Change-Id: I219267b4f2b50f71acf7065aa58478d382472ddf
 2020-08-13 04:57:28 +00:00
Bonian Chen
5c21396034 Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398389

Change-Id: Ib8e712b0416e24857b1e2d1203cf22bd12ba4786
 2020-08-13 04:43:30 +00:00
Bonian Chen
3b8794d16b Merge "[Settings] Replace getSimCount() API" 2020-08-13 04:27:36 +00:00
Arc Wang
b494fbd01a Merge "[Wi-Fi] Fix crash after editing invalid hotspot password" am: e86a292990 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12355968

Change-Id: I078c5ad6a49e6f44a7dbfba7903998e7733e263b
 2020-08-13 03:18:17 +00:00
Arc Wang
e86a292990 Merge "[Wi-Fi] Fix crash after editing invalid hotspot password" 2020-08-13 03:03:07 +00:00
Bonian Chen
5560882548 [Settings] Replace getSimCount() API 
Change design of monitor change in Settings.Global.MOBILE_DATA and
Settings.Global.DATA_ROAMING in order to avoid from accessing
getSimCount().

Bug: 144251589
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RoamingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest

Merged-In: I965a0c07c7c9ef5897b33809bae6a7921977db18
Change-Id: I8010f74c41826b081aa9f599d33a9519a1888215
 2020-08-13 10:56:55 +08:00
Zhen Zhang
75028dd946 Update subtext of Ethernet Tethering preference 
Update the subtext summary according to UX

Bug: 153761463
Test: built successfully; manually test
Change-Id: I96d1a1f5111f85ee4b10f61ab4408822b99032e1
 2020-08-12 16:13:48 -07:00
Lucas Dupin
c61ee0f8c7 Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1 am: 01cb6c4a20 am: 7925b0c044 am: 59d8ab1094 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522

Change-Id: I129e75363f4457ac61f5e5936db6a3abd078f6b0
 2020-08-12 22:42:03 +00:00
Lucas Dupin
a68e932d25 Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1 am: 5f44b7cf54 am: 6430a4b88f am: 1d663e72ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522

Change-Id: I51bf4f87f5f08bd0ff52325f1cb00f8fcbe6fb2b
 2020-08-12 22:41:55 +00:00
Lucas Dupin
59d8ab1094 Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1 am: 01cb6c4a20 am: 7925b0c044 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522

Change-Id: I72ae494b522a44797d505e7c382bc6079af668cf
 2020-08-12 22:25:06 +00:00
Lucas Dupin
1d663e72ce Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1 am: 5f44b7cf54 am: 6430a4b88f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522

Change-Id: Iac01c66216d6ab98654b97f33505d9f60714c78e
 2020-08-12 22:24:45 +00:00
Lucas Dupin
7925b0c044 Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1 am: 01cb6c4a20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522

Change-Id: I570f25117a12b55046dac45c086693e859e2cc6c
 2020-08-12 22:08:40 +00:00
Lucas Dupin
6430a4b88f Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1 am: 5f44b7cf54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522

Change-Id: I7f2ae48cbdcad2fa44d96382b7d2c175b7605f59
 2020-08-12 22:07:32 +00:00
Lucas Dupin
01cb6c4a20 Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522

Change-Id: I4dae464e9f3c581d80a10d515934302c345ef336
 2020-08-12 21:51:47 +00:00
Lucas Dupin
5f44b7cf54 Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522

Change-Id: I607edce1f3981b4b8882bea1530362980a280de9
 2020-08-12 21:50:32 +00:00
Lucas Dupin
e899f749a1 Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev 2020-08-12 21:27:45 +00:00