PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,526 Commits 1 Branch 0 Tags
bf7ca5166e1be5b64d66a9f739d1cb437c1fb271
Commit Graph

74526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Chien
92eb12c0e2 Merge changes from topics "pass-res", "remove-isProvisioningNeeded" 
* changes:
  Remove unused resource from TetherServiceTest
  Get entitlement configuration from intent extra
  Remove isProvisioningNeededButUnavailable usage
 2020-06-20 04:02:15 +00:00
Automerger Merge Worker
984abad818 Merge "Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: d6f41c192f am: 3e89101ab2" into rvc-qpr-dev-plus-aosp am: 0776463298 am: 75d056d361 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: Ib8d1302e064da5c34d3ff0f5e1a0246d066e1c58
 2020-06-20 03:52:44 +00:00
Akshay Thakker
358e4af44e Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: efbdb099fd am: b6c41df0f2 am: 19236d41c4 am: c98a5242e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: I9561cfdba730583137ac93713714914babfbf7f1
 2020-06-20 03:52:38 +00:00
Akshay Thakker
3a748bc34d Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: efbdb099fd am: 491faedab3 am: 7c08d1eeb5 am: a14e7f365e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: I8e2d93b62ed094bd773bcb2944ac9b1742bb082e
 2020-06-20 03:52:32 +00:00
Mark Chien
b7b32ad983 [automerger skipped] Merge "Replace ConnectivityManager as TetheringManager" am: 4064368496 am: ba4af7020c -s ours am: f6c4022554 -s ours 
am skip reason: Change-Id Id969f29d7210f2ee32719c76439049bbc86cd4f6 with SHA-1 17feecffae is in history

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

Change-Id: I68d06a70f2fe19be55e8dc4f02174d65987334a2
 2020-06-20 03:52:11 +00:00
Jason Chiu
864ae4ca71 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 am: cfe50a6f60 am: e40dec05e2 am: 7e8de263dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I87eef92953ec98bf1a52cc1757efdff7519ab54f
 2020-06-20 03:52:11 +00:00
Automerger Merge Worker
75d056d361 Merge "Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: d6f41c192f am: 3e89101ab2" into rvc-qpr-dev-plus-aosp am: 0776463298 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: I77c4f3402bd1b04f5ed067c51e013542d3a732b2
 2020-06-20 03:52:09 +00:00
Jason Chiu
f53f622e76 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 468e567368 am: 442de5c4dd am: bbbcb7ae68 am: addb0fa60b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I1c785e341a903adaa78cc1e6640a262797369614
 2020-06-20 03:51:56 +00:00
Mark Chien
4d929f894c [automerger skipped] Merge "Remove schedule recheck logic from TetherService" am: 9f1fe57bda am: 3548a5eb0e -s ours am: f19ef641c8 -s ours 
am skip reason: Change-Id Ie45859c19b96d0689c45dd610501fae0506742ff with SHA-1 257b9bcdfa is in history

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

Change-Id: I38dc3459053c92047a42b89a6e91f2ef9714102c
 2020-06-20 03:51:52 +00:00
Akshay Thakker
c98a5242e3 Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: efbdb099fd am: b6c41df0f2 am: 19236d41c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: Idf658fb679fdb487ff281314f89fac3a3a416b50
 2020-06-20 03:51:50 +00:00
Jason Chiu
d9087a06ad Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 am: 4a48011fba am: 6f8d8e3d05 am: 7c28e2c1cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: Id62836f408bbf60045abb05d7f2cad3270043cd0
 2020-06-20 03:51:35 +00:00
Akshay Thakker
a14e7f365e Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: efbdb099fd am: 491faedab3 am: 7c08d1eeb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: I6761fb2d312c5cbe5ae968b33fe692dde6e6cf5a
 2020-06-20 03:51:29 +00:00
Tim Peng
aeabfc3050 Add a separate line at the bottom of list area in output switcher 
-Bottom divider is not showed when there are more than 7 devices exist in output switcher
-Check panel type in isDividerAllowedBelow()
-Hide the Slice bottom divider of Output switcher panel
-Show divider in panel layout only for output switcher panel

Bug: 159177275
Test: make -j42 RunSettingsRoboTests

Change-Id: I49396a0ee0543b494a2b3d714ec248ebab08e7ba
 2020-06-20 03:44:43 +00:00
Automerger Merge Worker
0776463298 Merge "Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: d6f41c192f am: 3e89101ab2" into rvc-qpr-dev-plus-aosp 2020-06-20 03:35:42 +00:00
Akshay Thakker
ebeb999612 Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: d6f41c192f am: 3e89101ab2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: Icd62da7e02b3d7db07932b82c95451287a54fc9c
 2020-06-20 03:35:38 +00:00
Akshay Thakker
19236d41c4 Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: efbdb099fd am: b6c41df0f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: Ia3bb738ba8614dfc300c78fde007f9d81cef865d
 2020-06-20 03:35:37 +00:00
Akshay Thakker
7c08d1eeb5 Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: efbdb099fd am: 491faedab3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: Iefc3d2724d16e3a2847c312a73404546922a63bf
 2020-06-20 03:35:28 +00:00
Mark Chien
f6c4022554 [automerger skipped] Merge "Replace ConnectivityManager as TetheringManager" am: 4064368496 am: ba4af7020c -s ours 
am skip reason: Change-Id Id969f29d7210f2ee32719c76439049bbc86cd4f6 with SHA-1 17feecffae is in history

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

Change-Id: I1444a5e1d7854252bb9a1a392edc0e9c18d769e2
 2020-06-20 03:29:30 +00:00
Mark Chien
f19ef641c8 [automerger skipped] Merge "Remove schedule recheck logic from TetherService" am: 9f1fe57bda am: 3548a5eb0e -s ours 
am skip reason: Change-Id Ie45859c19b96d0689c45dd610501fae0506742ff with SHA-1 257b9bcdfa is in history

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

Change-Id: I869f09382784056c9a791fe7ff7296a3b9f9c941
 2020-06-20 03:29:20 +00:00
Jason Chiu
7e8de263dc Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 am: cfe50a6f60 am: e40dec05e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: Ie0fb605e4fc90f5b9fbed836caf29cfb5a672996
 2020-06-20 03:29:14 +00:00
Jason Chiu
addb0fa60b Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 468e567368 am: 442de5c4dd am: bbbcb7ae68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I02f5c155f5e383d2d4cf7d12bc31966565954a5a
 2020-06-20 03:29:06 +00:00
Jason Chiu
7c28e2c1cf Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 am: 4a48011fba am: 6f8d8e3d05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I05297cf55d085fc8da614fda650e0e7ab08e11cf
 2020-06-20 03:28:58 +00:00
Akshay Thakker
3e89101ab2 Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: d6f41c192f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: Icf581e34aca42cb3d1df75066b5493c687e9c8d8
 2020-06-20 03:22:39 +00:00
Akshay Thakker
b6c41df0f2 Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: efbdb099fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: I9e0194640b23d84e3745212bd11b05341cb229c7
 2020-06-20 03:22:36 +00:00
Akshay Thakker
491faedab3 Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f am: efbdb099fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: I5b6f97cdbb0fadd3cc75a27040f2471377e01ef6
 2020-06-20 03:22:22 +00:00
SongFerngWang
36796a1616 NetworkModePreference's list needs to allow values set from overlay. 
Root cause: ag/10614943 removed the resources, so each of item
values is hard coded. This broke the overlay. This CL adds the
resource back so the overlay can work.

Bug: 159301925
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (PASS)

Change-Id: Id5ad2fdd0a87586136e4a26d2e44cf5278df5d9d
 2020-06-20 11:21:18 +08:00
Mark Chien
ba4af7020c Merge "Replace ConnectivityManager as TetheringManager" am: 4064368496 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344637

Change-Id: I9dcb7ee1f1e2c0dfbaf14cf9636b0b153e636cb7
 2020-06-20 03:17:33 +00:00
Mark Chien
3548a5eb0e Merge "Remove schedule recheck logic from TetherService" am: 9f1fe57bda 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298536

Change-Id: If30d8e11f18380b3ab5f2ef840951d550532077a
 2020-06-20 03:17:20 +00:00
Jason Chiu
e40dec05e2 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 am: cfe50a6f60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: Ifb537b8612bfeab7dea1bdaaf662d4eb67c89ebb
 2020-06-20 03:17:10 +00:00
Jason Chiu
bbbcb7ae68 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 468e567368 am: 442de5c4dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I935d38b45d14252a0a76e048df9e2d7cf339bc35
 2020-06-20 03:16:57 +00:00
Jason Chiu
6f8d8e3d05 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 am: 4a48011fba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I4236bdb397c583d278e5b9c7f3f2def1827ae5a3
 2020-06-20 03:16:51 +00:00
Akshay Thakker
d6f41c192f Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: I8e84d908df0edd77d13579ab95e7aedf3d370d04
 2020-06-20 03:10:39 +00:00
Akshay Thakker
efbdb099fd Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588

Change-Id: I00d9c3ce6b3213de8dd04de38da7e60737c5d5fd
 2020-06-20 03:10:27 +00:00
Mark Chien
4064368496 Merge "Replace ConnectivityManager as TetheringManager" 2020-06-20 03:08:37 +00:00
Mark Chien
9f1fe57bda Merge "Remove schedule recheck logic from TetherService" 2020-06-20 03:08:14 +00:00
Jason Chiu
442de5c4dd Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 468e567368 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I2c9b54011db4a9269f2cb01539ab5a793783c482
 2020-06-20 03:04:39 +00:00
Jason Chiu
4a48011fba Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: Iad6aac126e058bc6293d0587debb345506e7b643
 2020-06-20 03:04:27 +00:00
Jason Chiu
cfe50a6f60 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 am: 5381571891 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: If672ca9668dd95afba4b8d859a7fad2389a45c13
 2020-06-20 03:04:24 +00:00
Akshay Thakker
826459695f Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev 2020-06-20 02:56:49 +00:00
Akshay Thakker
52ac47d9c8 Revert "Fix SecurityException while accessing Slice Uris" 
This reverts commit 2e790e1859.

Reason for revert: I accidentally +2'd this CL and it got merged. Sorry about that.

Change-Id: Ia1b2e0a264e16b368601bbb7a32148ec6c183e84
Bug: 159195420
Exempt-From-Owner-Approval: Just a revert
 2020-06-20 02:56:09 +00:00
Jason Chiu
468e567368 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I0023e814f8bf3b86ddbcc879427efd5d4038f700
 2020-06-20 02:52:16 +00:00
Jason Chiu
5381571891 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738

Change-Id: I8f016042af7f617ba0cebda0aab717912a7e9225
 2020-06-20 02:51:56 +00:00
Tim Peng
c34c5d994b In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions. 
-Add "disableRecyclerViewItemAnimator" style to disable animation

Bug: 152605598
Test: manual test
Change-Id: Ibb43231d8734a4f20d13fc014eaa6c9142064e20
 2020-06-20 10:44:51 +08:00
Jason Chiu
4b6e900e64 Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev 2020-06-20 02:39:21 +00:00
Kevin Chyn
8204cb8c96 Merge "Remove setActiveUser together with frameworks/base (see 12/n)" am: 95e05d8d07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11885448

Change-Id: Ib5e9bc25d0210442b0b5fc048283fb77516a835f
 2020-06-20 01:04:19 +00:00
Kevin Chyn
95e05d8d07 Merge "Remove setActiveUser together with frameworks/base (see 12/n)" 2020-06-20 01:02:24 +00:00
Beth Thibodeau
59cbd11c04 Add toggle for media resumption 
Adds a toggle under Settings > Sound > Media to toggle media resumption

Bug: 154039093
Test: manual
Test: atest SettingsProviderTest
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="MediaControls"

Change-Id: I803c57031bc3252cab35c06ea124d1c22a3c3aeb
 2020-06-20 00:12:23 +00:00
Automerger Merge Worker
ad87dc2470 Merge changes from topic "am-3bddd89fd6b84d1b8c5e5210dcfc3870" into rvc-qpr-dev-plus-aosp am: f2ebba9025 am: 851b51308f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I6f2dd328de8ff8de041d8b2b435c56a1c1e98053
 2020-06-19 23:41:36 +00:00
Beth Thibodeau
d42c216746 [automerger skipped] Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d am: e9691bdc94 am: bd62fc7dae -s ours am: 67126bdb74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I6d53710e117fe0b7144695ebd54dd50e768bdc5e
 2020-06-19 23:41:34 +00:00
Automerger Merge Worker
ca4840b6d9 Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp am: 0701bcefbc am: ca5ce305af am: a28c2c57dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I9714a61ca301d856a0ee96fa90407d1003b96c3c
 2020-06-19 23:41:11 +00:00