PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,088 Commits 1 Branch 0 Tags
82c75c6eae4c2b5eb8b4872b43ba645e9de3af3c
Commit Graph

55088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
82c75c6eae Merge "Mainline use cellSignalStrength instead" am: 953ab80e0b am: 5693d157bd 
Change-Id: I4445d70a94da15cadfff8c795397494c36f51c30
 2019-12-12 10:19:01 +00:00
SongFerng Wang
5693d157bd Merge "Mainline use cellSignalStrength instead" 
am: 953ab80e0b

Change-Id: I7c5b2aca8cdde8654320aefa468ed86820f2280d
 2019-12-12 02:03:25 -08:00
Automerger Merge Worker
be513533f3 Fix Settings crash when clicks Notifications am: 2790889921 
Change-Id: I3449fd3cc7fe1473d3fbbd0adc7b5e31b9ec2bae
 2019-12-12 10:03:05 +00:00
SongFerng Wang
953ab80e0b Merge "Mainline use cellSignalStrength instead" 2019-12-12 10:01:20 +00:00
SongFerngWang
54b00d859b Mainline use cellSignalStrength instead 
Bug: 146046311
Test: 1. open SIM status and check signal strength. (PASS)
2.atest make RunSettingsRoboTests /
ROBOTEST_FILTER=SimStatusDialogControllerTest(PASS)

Change-Id: I93e9dc09a01aa76b7d26660a32944df79cda93f3
Merged-In: I93e9dc09a01aa76b7d26660a32944df79cda93f3
 2019-12-12 16:15:21 +08:00
Raff Tsai
2790889921 Fix Settings crash when clicks Notifications 
- FaceSettingsLockscreenBypassPreferenceController's preference key
is different from that in xml. Use DashboardFragment generic way to
create PreferenceController which bind the preference key defined in
xml.
- Also refine the way of fixing b/140878309

Fixes: 145893081
Test: manual check FaceSettings and Notification Settings
Change-Id: Ia80e755e3f86b44e771b0cf80c9bf53a8ef8f430
 2019-12-12 07:41:36 +00:00
Automerger Merge Worker
41516ef023 [automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 3c6a3011fa -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 ad2502a91a is in history am: f35dfbcdc0 -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 ad2502a91a is in history am: 473b52cd6e -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 ad2502a91a is in history am: 4a87e89929 -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 ad2502a91a is in history am: e3d171cc1d -s ours 
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 ad2502a91a is in history

Change-Id: I41228590ca31162c119de1e9be465cd35fc81ad5
 2019-12-12 02:16:15 +00:00
Automerger Merge Worker
6f799325b9 [automerger skipped] Prevent accounts page directly opening in screen pinning mode am: ad2502a91a -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 a545a85f9d is in history am: 8806cfe4fc -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 a545a85f9d is in history am: b6c6ab51f9 -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 a545a85f9d is in history am: 27f224e5eb -s ours 
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 a545a85f9d is in history

Change-Id: Ia5fb1e2e442e8312d29951b184bab64cf479604d
 2019-12-12 02:15:46 +00:00
Automerger Merge Worker
e3d171cc1d [automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 3c6a3011fa -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 ad2502a91a is in history am: f35dfbcdc0 -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 ad2502a91a is in history am: 473b52cd6e -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 ad2502a91a is in history am: 4a87e89929 -s ours 
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 ad2502a91a is in history

Change-Id: I6d95ab64f114ac818161c903e86cc7da70b424ad
 2019-12-12 01:54:14 +00:00
Automerger Merge Worker
27f224e5eb [automerger skipped] Prevent accounts page directly opening in screen pinning mode am: ad2502a91a -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 a545a85f9d is in history am: 8806cfe4fc -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 a545a85f9d is in history am: b6c6ab51f9 -s ours 
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 a545a85f9d is in history

Change-Id: I1c9606ee574e02be25134e547e5f7943bcea744b
 2019-12-12 01:54:01 +00:00
Automerger Merge Worker
4a87e89929 [automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 3c6a3011fa -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 ad2502a91a is in history am: f35dfbcdc0 -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 ad2502a91a is in history am: 473b52cd6e -s ours 
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 ad2502a91a is in history

Change-Id: I60d91e324136beb7edec8d0fe9faf8937c8f9e3f
 2019-12-12 01:37:07 +00:00
Automerger Merge Worker
b6c6ab51f9 [automerger skipped] Prevent accounts page directly opening in screen pinning mode am: ad2502a91a -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 a545a85f9d is in history am: 8806cfe4fc -s ours 
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 a545a85f9d is in history

Change-Id: I4d68617158d79e44406f2b4a1de554fb0b1c610a
 2019-12-12 01:36:39 +00:00
Automerger Merge Worker
473b52cd6e [automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 3c6a3011fa -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 ad2502a91a is in history am: f35dfbcdc0 -s ours 
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 ad2502a91a is in history

Change-Id: I80eb8a460114a01a025a7512112c022e2568b64e
 2019-12-12 01:19:43 +00:00
Automerger Merge Worker
8806cfe4fc [automerger skipped] Prevent accounts page directly opening in screen pinning mode am: ad2502a91a -s ours 
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 a545a85f9d is in history

Change-Id: I20f8b8521a7ada8e0f05edcee4df1e3ab87650b0
 2019-12-12 01:19:22 +00:00
Automerger Merge Worker
f35dfbcdc0 [automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 3c6a3011fa -s ours 
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1 ad2502a91a is in history

Change-Id: I4203109df4dcbd952e0ee09bc70ccd5d38ccc159
 2019-12-12 01:18:55 +00:00
Automerger Merge Worker
23e9011739 Prevent accounts page directly opening in screen pinning mode am: a545a85f9d am: fd45c98d53 am: 4fd41fe196 
Change-Id: Ib20737cbe8390a42ecce204f540d21de7026bf3f
 2019-12-11 07:09:55 +00:00
Automerger Merge Worker
4fd41fe196 Prevent accounts page directly opening in screen pinning mode am: a545a85f9d am: fd45c98d53 
Change-Id: Id48f14bb8258d615dc2fe9e552640ab06aa528ab
 2019-12-11 06:51:34 +00:00
Automerger Merge Worker
fd45c98d53 Prevent accounts page directly opening in screen pinning mode am: a545a85f9d 
Change-Id: If2d4c0acb794a9a506b7611fa2f622c90054b393
 2019-12-11 06:32:39 +00:00
Automerger Merge Worker
b15374611f Dark theme drop down does not show selected option am: 268d6b092a 
Change-Id: I96c2d1253366543685ca9aaf56f55b93488bd27e
 2019-12-10 23:39:11 +00:00
Mill Chen
3c6a3011fa Prevent accounts page directly opening in screen pinning mode 
In Settings there is no auth mechanism to prevent accounts page being
opened in screen pinning mode. This CL makes it so that when users are
trying to navigate to any pages in Settings from other apps in screen
pinning mode, Settings app will directly close its page.

Bug: 137015265
Bug: 135604684
Test: manual
Change-Id: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
Merged-In: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
(cherry picked from commit f3242dab35)
 2019-12-09 03:19:31 +00:00
Mill Chen
ad2502a91a Prevent accounts page directly opening in screen pinning mode 
In Settings there is no auth mechanism to prevent accounts page being
opened in screen pinning mode. This CL makes it so that when users are
trying to navigate to any pages in Settings from other apps in screen
pinning mode, Settings app will directly close its page.

Bug: 137015265
Bug: 135604684
Test: manual
Change-Id: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
Merged-In: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
(cherry picked from commit f3242dab35)
 2019-12-09 03:19:12 +00:00
Mill Chen
a545a85f9d Prevent accounts page directly opening in screen pinning mode 
In Settings there is no auth mechanism to prevent accounts page being
opened in screen pinning mode. This CL makes it so that when users are
trying to navigate to any pages in Settings from other apps in screen
pinning mode, Settings app will directly close its page.

Bug: 137015265
Bug: 135604684
Test: manual
Change-Id: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
Merged-In: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
(cherry picked from commit f3242dab35)
 2019-12-09 03:18:24 +00:00
Jay Aliomer
268d6b092a Dark theme drop down does not show selected option 
a place holder for the summary was updated in commit https://googleplex-android-review.git.corp.google.com/changes/platform%2Fpackages%2Fapps%2FSettings~9818614/revisions/3/files/res%2Fxml%2Fdark_mode_settings.xml/download?parent=1
This change is reverted in this CL

Test: manual
Fixes: 145672617
Change-Id: I41443e7334487e3afac0343333a9ed289d2fe390
 2019-12-07 22:19:41 +00:00
jiabin
a32c7abcac Merge "Remove DEVICE_OUT_ALL_SCO." am: ada1f6b10b 
am: 15d7195311

Change-Id: I18beff8ccdd6345cf9a790e4f14f58f56254c438
 2019-12-06 09:39:58 -08:00
jiabin
15d7195311 Merge "Remove DEVICE_OUT_ALL_SCO." 
am: ada1f6b10b

Change-Id: I01878a3b42900ff55b88e9c01705cd8b753388b5
 2019-12-06 09:33:50 -08:00
Treehugger Robot
ada1f6b10b Merge "Remove DEVICE_OUT_ALL_SCO." 2019-12-06 17:26:20 +00:00
Automerger Merge Worker
39f1a86a3a Merge "Fix "Skip lock screen" not working for secondary user" into qt-qpr1-dev am: 95820eb001 
Change-Id: I4937675c9088f53e1c6f82a55c6422f699f5ce36
 2019-12-06 02:10:43 +00:00
Ilya Matyukhin
95820eb001 Merge "Fix "Skip lock screen" not working for secondary user" into qt-qpr1-dev 2019-12-06 01:58:55 +00:00
Automerger Merge Worker
edb8dd6140 Merge changes from topic "update_battery_icon" into qt-qpr1-dev am: c08f70b7dd 
Change-Id: I73ebb69f6bfcff8c3c09b8768dd48c9124d67594
 2019-12-06 01:21:32 +00:00
Automerger Merge Worker
835fa1fd59 Battery icon is too large am: b6b29c1af0 
Change-Id: I799cccf2808289b8f080cfa339b3bb35bef2690a
 2019-12-06 01:21:24 +00:00
TreeHugger Robot
c08f70b7dd Merge changes from topic "update_battery_icon" into qt-qpr1-dev 
* changes:
  Sync dimen from SystemUI
  Battery icon is too large
 2019-12-06 01:05:30 +00:00
jiabin
70858ea40b Remove DEVICE_OUT_ALL_SCO. 
Due to the refactor of audio device type, DEVICE_OUT_ALL_SCO has been
removed. Use DEVICE_OUT_BLUETOOTH_SCO_HEADSET for the test instead.

Bug: 135621476
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest"
Change-Id: Ib32f4c313c5d318b6f99e1f0591c98c4c7c82ade
Merged-In: Ib32f4c313c5d318b6f99e1f0591c98c4c7c82ade
 2019-12-05 15:32:32 -08:00
Sarah Chin
00649c664e Merge "Add NGRAN" am: 4ff75ef786 
am: 48388d0949

Change-Id: I131d35236c4fab49ea1a407479b7d75718399c62
 2019-12-05 13:56:01 -08:00
Sarah Chin
48388d0949 Merge "Add NGRAN" 
am: 4ff75ef786

Change-Id: I18dcc1c05ade3e240beb8ca0c2577c7090064bcb
 2019-12-05 13:49:10 -08:00
Sarah Chin
4ff75ef786 Merge "Add NGRAN" 2019-12-05 21:37:37 +00:00
Automerger Merge Worker
615f2311d9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: a90da5ea94 -s ours 
am skip reason: subject contains skip directive

Change-Id: I0abef5f40c0fedbde20e38b7463b4ac88b6f12b2
 2019-12-05 18:51:26 +00:00
TreeHugger Robot
a90da5ea94 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-12-05 18:33:31 +00:00
Neil Fuller
5f1c405f30 Merge "Switch settings to use TimeDetector" am: 5da6521458 
am: 72ed7e8f64

Change-Id: Ia2f12a24835f83136c9400641992348b69f40270
 2019-12-05 09:15:16 -08:00
Neil Fuller
72ed7e8f64 Merge "Switch settings to use TimeDetector" 
am: 5da6521458

Change-Id: Ibcdf80e3616fd5f3093fbe2bbe7fd4b26576734e
 2019-12-05 09:13:16 -08:00
Neil Fuller
5da6521458 Merge "Switch settings to use TimeDetector" 2019-12-05 17:05:05 +00:00
Anna Trostanetski
ba1e18dff9 Merge "Add descriptions to compat changes." am: fdb5a1ce2a 
am: d76cef9f7c

Change-Id: I7eca4097e3c795dab6bd045877ebdc6308bb24d0
 2019-12-05 04:36:20 -08:00
Anna Trostanetski
d76cef9f7c Merge "Add descriptions to compat changes." 
am: fdb5a1ce2a

Change-Id: I97ba671e7520c8111e31d53764b45cbbefab3e53
 2019-12-05 04:31:10 -08:00
Anna Trostanetski
fdb5a1ce2a Merge "Add descriptions to compat changes." 2019-12-05 12:22:27 +00:00
Bill Yi
45ded2ad1e Import translations. DO NOT MERGE 
Change-Id: I5889a4f6f9637d34eb5df1f844770dd68cc04e39
Auto-generated-cl: translation import
 2019-12-05 03:22:50 -08:00
Raff Tsai
ed870944d0 Merge "Fix cannot see "see more" button in UI" am: 2dbc2db581 
am: 1fdadc1125

Change-Id: I86c112f43556ca1dc345c0c36610a367a327bc18
 2019-12-04 20:28:27 -08:00
Raff Tsai
1fdadc1125 Merge "Fix cannot see "see more" button in UI" 
am: 2dbc2db581

Change-Id: I1ad3c46aa2e79aec39725a76d3033be848f79506
 2019-12-04 20:26:34 -08:00
Treehugger Robot
2dbc2db581 Merge "Fix cannot see "see more" button in UI" 2019-12-05 04:17:42 +00:00
Ilya Matyukhin
1de3feb026 Fix "Skip lock screen" not working for secondary user 
Bug: 140878309
Test: the option is not grayed out for secondary user.
Change-Id: I2413aa3c634e89a90d104e9ad60df15e49c75ed2
(cherry picked from commit e17caeea3f)
 2019-12-05 04:11:49 +00:00
Raff Tsai
28a6bcc729 Fix cannot see "see more" button in UI 
Bug: 144546394
Test: Cts test
android.provider.cts.SettingsPanelTest#volumePanel_seeMoreButton_launchesIntoSettings

Change-Id: I786d62937e93abdaf96f89b03669302159d571a1
 2019-12-05 11:09:49 +08:00
Automerger Merge Worker
3ebabb50f3 Merge "Always use local timezone for parsing date" into qt-qpr1-dev am: 1284d9de67 
Change-Id: I949816a65e74fb6b9772906146684db8e4eb1dcd
 2019-12-05 03:04:44 +00:00