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

75889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
c470068d57 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc -s ours am: 83bf17ce56 -s ours am: 68e8b007c7 -s ours am: 883b66e181 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14cf291ed554bb18fa0126163fbab110d6bab9c7
 2020-08-14 08:04:37 +00:00
TreeHugger Robot
a85bf20ee6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 18e427260d -s ours am: 64462c12e6 -s ours am: e979ec36e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7cdc59adbc872cf5509a658dabf79aae892468d4
 2020-08-14 08:04:11 +00:00
Bill Yi
883b66e181 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc -s ours am: 83bf17ce56 -s ours am: 68e8b007c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0355ab50b8b17ebb5785ea2aa67b607401eaa2b0
 2020-08-14 07:47:49 +00:00
TreeHugger Robot
e979ec36e0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 18e427260d -s ours am: 64462c12e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3b7720a433ad3f080abf3fd52ce7267d486f57b
 2020-08-14 07:47:35 +00:00
Bill Yi
68e8b007c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc -s ours am: 83bf17ce56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8139461fd967bfbea45342178e4db58a2a3f147
 2020-08-14 07:29:10 +00:00
TreeHugger Robot
64462c12e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 18e427260d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I460a8c803884d60adec281729d09372aab9122c0
 2020-08-14 07:29:03 +00:00
Bill Yi
83bf17ce56 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74ad57626a98bd94ea5d988b4f882a724040d3ab
 2020-08-14 07:20:25 +00:00
TreeHugger Robot
18e427260d Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-14 07:18:13 +00:00
Bill Yi
6415c5b511 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If17aadb947be94b348718f1cfb72d743468df69c
 2020-08-14 05:02:26 +00:00
Bill Yi
5512b2f2dc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6385dcbd99493b0ccc9e8dff10e42bc738dd3c13
 2020-08-14 04:27:09 +00:00
Jeffrey Carlyle
b7e57fb769 [automerger skipped] Merge "Add BatteryStatusFeatureProvider" into rvc-qpr-dev am: d553d434cd am: 7a7a55c1a4 -s ours am: c44f5915c0 -s ours 
am skip reason: Change-Id I05bedbee641f087de5ee1b25a00724ce2de51f87 with SHA-1 4e2071ae78 is in history

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

Change-Id: I8b840cf31258108a41c81af2072915e007bc2cb8
 2020-08-14 03:25:19 +00:00
Jeffrey Carlyle
c44f5915c0 [automerger skipped] Merge "Add BatteryStatusFeatureProvider" into rvc-qpr-dev am: d553d434cd am: 7a7a55c1a4 -s ours 
am skip reason: Change-Id I05bedbee641f087de5ee1b25a00724ce2de51f87 with SHA-1 4e2071ae78 is in history

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

Change-Id: Ib05416cec028b118e4e93c15252b874d25dbd831
 2020-08-14 03:18:59 +00:00
Jeffrey Carlyle
7a7a55c1a4 Merge "Add BatteryStatusFeatureProvider" into rvc-qpr-dev am: d553d434cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12153212

Change-Id: I36bc3699d0af28ad40e52fd11946ae3222eb90a4
 2020-08-14 03:03:20 +00:00
Jeffrey Carlyle
d553d434cd Merge "Add BatteryStatusFeatureProvider" into rvc-qpr-dev 2020-08-14 02:32:05 +00:00
Zhen Zhang
2e73dae9bd Merge "Update subtext of Ethernet Tethering preference" into rvc-qpr-dev am: b49bd3592e am: c1b516b2c1 am: d13adae5c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12363010

Change-Id: I971cfdfe87378f5efba6bb69e1304ed789009f5b
 2020-08-14 00:23:07 +00:00
Zhen Zhang
d13adae5c3 Merge "Update subtext of Ethernet Tethering preference" into rvc-qpr-dev am: b49bd3592e am: c1b516b2c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12363010

Change-Id: Iac317fd3d625393da103d4c97de79d2249f75711
 2020-08-14 00:05:33 +00:00
Zhen Zhang
c1b516b2c1 Merge "Update subtext of Ethernet Tethering preference" into rvc-qpr-dev am: b49bd3592e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12363010

Change-Id: I9d867fcfa8e3af30dfbfdb2a7990950b4443b2e6
 2020-08-13 23:45:39 +00:00
Zhen Zhang
b49bd3592e Merge "Update subtext of Ethernet Tethering preference" into rvc-qpr-dev 2020-08-13 23:31:01 +00:00
Beth Thibodeau
f4aaa35016 Merge "Allow user to block individual apps from resuming" am: c414527e07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12333789

Change-Id: I85617c2b66bd2e9cad38237e7a9c022585f6c49b
 2020-08-13 17:15:01 +00:00
Beth Thibodeau
c414527e07 Merge "Allow user to block individual apps from resuming" 2020-08-13 17:00:55 +00:00
Julia Reynolds
5bb686ddeb Fix pending intent links am: 97894bcfb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12284872

Change-Id: I6f3333367daae87463890f7ad06de70d27b74ca7
 2020-08-13 14:40:03 +00:00
Beth Thibodeau
f01cce88fc Allow user to block individual apps from resuming 
This adds a new section to the media controls settings screen with a
list of apps that could potentially be used for resumption. If an app is
toggled off it will be added to a list of apps which will not persist in
QS, even when resumption is on.

Also updated the strings on this setting page to match UX
recommendation, so the default toggle state is now on.

Bug: 161813143
Bug: 159852516
Test: manual
Test: atest SettingsProviderTests
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="ResumableMedia"
Change-Id: Id3de52419ffba233469396dd47439428201e5e00
 2020-08-13 09:46:27 -04:00
Betty Chang
966da40ddd Merge "[Testing] Use AndroidJUnit4 instead in GlobalSettingsChangeListenerTest" am: 18c9d1db3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326253

Change-Id: Ia0fcebbd19b447b2b69374a2b95fc198067b4fe6
 2020-08-13 13:36:15 +00:00
Julia Reynolds
97894bcfb7 Fix pending intent links 
Test: manual
Fixes: 154795795
Change-Id: Ia870bd0bfd90be852121b542100806cac5bac881
 2020-08-13 13:21:01 +00:00
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
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
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