PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,904 Commits 1 Branch 0 Tags
354e25c12530703a4871d96e95b10c20005c7dde
Commit Graph

73904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lyn Han
354e25c125 Merge "Hide conversation bubble switch if app bubbles are off" 2020-08-14 20:18:57 +00:00
Lyn Han
9af95dae7d Hide conversation bubble switch if app bubbles are off 
Fixes: 159340745

Test: BubblePreferenceControllerTest

Test: priority conversation bubble
=> app bubbles OFF => toggle hidden
=> selected bubbles ON => toggle checked
=> app bubbles ON => toggle checked

Test: default/silent conversation bubble
=> app bubbles OFF => toggle hidden
=> selected bubbles ON => toggle NOT checked
=> app bubbles ON => toggle NOT checked

Change-Id: Ia5759c2a06c1da4d84b3dafed95e52c3aa30ad56
 2020-08-14 20:18:26 +00:00
TreeHugger Robot
f8324f7c9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb -s ours am: 4c5836ae3c -s ours am: ca7d97c2ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00f8ece4367e948498a767ac446ebee19befe283
 2020-08-14 17:05:13 +00:00
TreeHugger Robot
4014e3ec26 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb -s ours am: b7af3be0a2 -s ours am: 7d6ba6a253 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf940c9d60a8ca15ad714d2ecad28e1bbb2b8264
 2020-08-14 17:04:33 +00:00
TreeHugger Robot
ca7d97c2ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb -s ours am: 4c5836ae3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I917a5e11c05def15c019110b1d9689ec562eb629
 2020-08-14 16:41:39 +00:00
TreeHugger Robot
7d6ba6a253 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb -s ours am: b7af3be0a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4db9540e9efd78af00b5b68729c59b70803c043
 2020-08-14 16:40:28 +00:00
TreeHugger Robot
4c5836ae3c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iefc7c31c26740eddc63cb8a16604ea7102e7ad14
 2020-08-14 16:23:58 +00:00
TreeHugger Robot
b7af3be0a2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: c9e69937bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3710c913387095a46dde8b67437b2f1e2d823e0
 2020-08-14 16:22:21 +00:00
TreeHugger Robot
c9e69937bb Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-14 16:04:34 +00:00
Bill Yi
ff5cca6a6b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I241aeb3750d6a38ad8ed37f53ef5a75041501efe
 2020-08-14 06:08:19 -07:00
TreeHugger Robot
3637a0c058 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-08-14 10:55:59 +00:00
Bonian Chen
6f5e9d1ee2 Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820 am: af57413abc am: 45cc4bbe61 am: 454bcb012e am: a716d48ffc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398

Change-Id: I41e6a4e0604d9fe051fdb8168287c53a8da763c8
 2020-08-14 09:13:01 +00:00
Bonian Chen
a716d48ffc Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820 am: af57413abc am: 45cc4bbe61 am: 454bcb012e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398

Change-Id: I2cdf575a7aeb63c28508578588ad36c8154428df
 2020-08-14 08:56:55 +00:00
Bonian Chen
454bcb012e Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820 am: af57413abc am: 45cc4bbe61 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398

Change-Id: I65d1b2561a86542bd1cccd95f0e69b6b4ee594fe
 2020-08-14 08:41:51 +00:00
Bonian Chen
45cc4bbe61 Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820 am: af57413abc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398

Change-Id: I1e5921c9a4cc5b223d0ee61eae2cac7afaa19e2a
 2020-08-14 08:20:48 +00:00
Bonian Chen
af57413abc Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398

Change-Id: I5617a1d70e38aa39ec37ace07bce0d5fda699729
 2020-08-14 08:05:12 +00:00
Bill Yi
8e27cecb22 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc -s ours am: c0e5d4d545 -s ours am: d59705b1ea -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: I4b3079a3f2473ae79058d4d7d05ef9de750acd86
 2020-08-14 07:48:03 +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
Bonian Chen
33e4971820 Merge "[Settings] Grant permissions to submit junit test" 2020-08-14 07:45:50 +00:00
Bill Yi
d59705b1ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5512b2f2dc -s ours am: c0e5d4d545 -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: Ia4ee8a0a2e7a5aefb1d3c17f945baeb93c4e5568
 2020-08-14 07:37:00 +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
Bill Yi
c0e5d4d545 [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: I191732742fe617ce8584ae1dffd345c4e7985843
 2020-08-14 07:19:04 +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
dcada837fd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic1db2e5dfc7ba4582fab1d75041627996a4213d3
 2020-08-14 06:10:25 +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
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
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
c414527e07 Merge "Allow user to block individual apps from resuming" 2020-08-13 17:00:55 +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
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
be6d42ebbd Merge "Add AirplaneModePreferenceControllerTest at Androidx.Test" 2020-08-13 12:17:11 +00:00
Jason Hsu
0d4c74a605 Merge "Update the formal image for magnification" 2020-08-13 11:50:24 +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
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
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