PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,918 Commits 1 Branch 0 Tags
febabbdf12f37d5c09a5347ff33a08d0725631a6
Commit Graph

60918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter_Liang
8b411bfa55 Revise strings for tutorial improvement. 
Bug: 148989018
Test: manual test
Change-Id: I249c5ae896123b546b028c959cd1a5404008aec3
 2020-03-18 17:24:16 +08:00
TreeHugger Robot
7673cfa430 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 8212c33768 
Change-Id: I06bb2b3b3698e91f35d7bc54d798c917185fbb42
 2020-03-18 06:01:02 +00:00
TreeHugger Robot
8212c33768 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 
Change-Id: Ic8f5ed6ee3132904f00e74f53259aeb274c82fed
 2020-03-18 05:49:02 +00:00
TreeHugger Robot
17962d8186 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda 
Change-Id: I260656236087cc7a0bff2f278a90dc7f3d52b688
 2020-03-18 05:37:14 +00:00
TreeHugger Robot
a2a1056dda Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev 2020-03-18 05:22:27 +00:00
Menghan Li
6be3263f5c Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef am: 29d33f3922 
Change-Id: I0717caf7787cc4ee1cfc5acac204e7753a4d2680
 2020-03-18 01:29:57 +00:00
Menghan Li
29d33f3922 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef 
Change-Id: Ia350ab892c9356a4f4aa02be26a1c28d625238cd
 2020-03-18 01:18:26 +00:00
Menghan Li
1b14eb0eef Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 
Change-Id: I43d9c46d008f794cb4763356de0c8e15b11df236
 2020-03-18 01:05:24 +00:00
Menghan Li
a56e57eaa4 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev 2020-03-18 00:50:43 +00:00
Eric Sandness
31f1136d1d Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea am: ea2c433f17 
Change-Id: I496a3bd8d3537355b746cdd275de7924c63bf064
 2020-03-17 21:02:48 +00:00
Eric Sandness
ea2c433f17 Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea 
Change-Id: Ibe1ecf76d11cfcb70935c88fb5c0df69eeab567a
 2020-03-17 20:46:06 +00:00
atrost
06da8b6ebc Show only listUIChanges instead of all 
Use the new method that filters out changes that shouldn't be in the
developer UI.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 151299145
Change-Id: I7c725a1eca32e2d253b9671c789777b5422ed469
 2020-03-17 20:37:49 +00:00
Eric Sandness
29a37648ea Use ChooseLockGeneric When Started By Admin App am: 7430932305 
Change-Id: I1a2cacc0c556b9ebdedf579ffe8516b7851f02dd
 2020-03-17 20:34:49 +00:00
Sarah Chin
20974b6814 5G meteredness for telephony framework 
Add listener for SubscriptionPlans changed

Bug: 151630253
Test: atest FrameworksTelephonyTests
Change-Id: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
Merged-In: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
 2020-03-17 18:47:07 +00:00
Eric Sandness
7430932305 Use ChooseLockGeneric When Started By Admin App 
The device management app may run before the end of device provisioning,
and it may start SetNewPasswordActivity.  If this happens, use
ChooseLockGeneric instead of SetupChooseLockGeneric.  Only use
SetupChoseLockGeneric if SetNewPasswordActivity was started by Setup
Wizard itself.

Fixes: 151552453
Test: atest com.android.settings.password.SetNewPasswordActivityTest
Test: atest com.android.settings.password.ChooseLockGenericTest
Test: Manually run consumer and enterprise device setup
Change-Id: I3b479ed18211d6625654f266fe692f07d0047e4f
 2020-03-17 17:16:08 +00:00
Automerger Merge Worker
b7d23d13b8 [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours am: 0245d4c0f6 -s ours 
am skip reason: subject contains skip directive

Change-Id: Iebba4194d915bfd2b104a16a8eae123999663a21
 2020-03-17 15:55:21 +00:00
Automerger Merge Worker
0eb0fce1be Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793 am: e4ff0ee00b 
Change-Id: I5fa9faddac76db810c6c4350ded943dc802405d2
 2020-03-17 15:55:01 +00:00
Automerger Merge Worker
0245d4c0f6 [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours 
am skip reason: subject contains skip directive

Change-Id: I55acec4120aa0844e55e4591c6073a1902b00bbe
 2020-03-17 15:43:36 +00:00
Automerger Merge Worker
e4ff0ee00b Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793 
Change-Id: If5483f1abf573bfef6b5c33931b4514952eff52f
 2020-03-17 15:42:40 +00:00
Automerger Merge Worker
d9dcf5bed2 [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours 
am skip reason: subject contains skip directive

Change-Id: I322de6c13adf1a7d3ca194d6b4b9a8d3f6a270d6
 2020-03-17 15:27:08 +00:00
Automerger Merge Worker
2779662793 Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 
Change-Id: I5c40a566a91465c230c98be2201d158c945c7103
 2020-03-17 15:26:05 +00:00
Automerger Merge Worker
f9b7313545 [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours 
am skip reason: subject contains skip directive

Change-Id: Id75d1c9d9ba97160bfa72e8bcdde3a0407856157
 2020-03-17 15:11:40 +00:00
Alex Johnston
e61aaaab51 Merge "Fix strings for certificate installation in Settings" into rvc-dev 2020-03-17 15:07:18 +00:00
Automerger Merge Worker
5ebbcfcffc Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a am: e735954a98 
Change-Id: I4cc601929f2ed4931ee70620361af01c03fd5da1
 2020-03-17 14:14:30 +00:00
Automerger Merge Worker
e735954a98 Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a 
Change-Id: Ib20cbc26491d8b64b8971da3751da666e3878bbd
 2020-03-17 13:48:15 +00:00
Automerger Merge Worker
9ca7eb9e70 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 am: 3be6478734 
Change-Id: I59b98492af621e8a1e548d334eaa2515a5690dd3
 2020-03-17 13:35:29 +00:00
Automerger Merge Worker
a4ad8f636a Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 
Change-Id: If102804bbb1335393bcd208f32cf66ab9a58e41d
 2020-03-17 13:28:11 +00:00
Automerger Merge Worker
3be6478734 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 
Change-Id: I0d4b0f84938382a99d8898902ed290bbb2884b75
 2020-03-17 13:15:17 +00:00
menghanli
d1adcc61a2 Update R accessibility assets and strings (5/n) 
- Magnification rich content
- Color inversion rich content

Bug: 148837311
Test: Manual test
Change-Id: I4dc52aa00f22cba9cea0c91be3af0b9cb7093182
 2020-03-17 21:12:15 +08:00
Yanting Yang
9204d76c45 Merge "Remove the index of the homepage category tiles" into rvc-dev 2020-03-17 13:11:40 +00:00
Automerger Merge Worker
85b0f5fcd2 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 
Change-Id: I786ed0fefff2d5a81b31b475c154933a5ba5aac5
 2020-03-17 13:03:00 +00:00
TreeHugger Robot
76f4a29510 Merge "Add NR Global to the logic to check if it is Global" into rvc-dev 2020-03-17 12:51:04 +00:00
Automerger Merge Worker
5d722ee5b4 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e am: 4059a7debf 
Change-Id: Ie117611ebcf9af3b8eee319ad1ed3297e2339c09
 2020-03-17 12:21:40 +00:00
Automerger Merge Worker
4059a7debf Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e 
Change-Id: I0e6ea23f432c71562274c69e1c203e15cef9ce45
 2020-03-17 12:04:32 +00:00
Automerger Merge Worker
05985cb26e Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 
Change-Id: I055e1aa8b1be85d6ba1218642447885fa9b454d9
 2020-03-17 11:49:55 +00:00
TreeHugger Robot
217740d640 Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev 2020-03-17 11:32:34 +00:00
Bill Yi
8f23d00553 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I88eb61ab20394d1cf91380f2823a536faaa8619c
 2020-03-17 04:18:33 -07:00
calvinpan
ff11f200c8 Add NR Global to the logic to check if it is Global 
Bug: 151285260
Test: Build pass
Change-Id: I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e
 2020-03-17 18:27:34 +08:00
Alex Johnston
79e66ffafe Fix strings for certificate installation in Settings 
Certificates privacy page
* Changed 'Your privacy is at risk' to
  'Your data won't be private'.
* Change 'information' to 'data'.
* Changed 'Install anyways' to
  'Install anyways'.

Can't install certificate dialog
* Changed 'Can't install certificates'
  to 'Can't use this file'.

Bug: 151303108
Test: Manual testing
Change-Id: Ia66ff7210ae77204fa2e59f3264f5c799cc47436
 2020-03-17 10:05:28 +00:00
govenliu
26b70a9bc7 [Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest 
Remove the @Ignore tag in ConfigureWifiEntryFragmentTest, and add a fake NetworkDetailsTracker to pass test.

Bug: 151696220
Test: Run make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiEntryFragmentTest
Change-Id: Icf06d27030fa2c68d3c2bee03beb583592beb599
 2020-03-17 18:05:00 +08:00
Yanting Yang
298a7fe2e5 Remove the index of the homepage category tiles 
Do not index the tiles of homepage category since we would like to index
their target activity for search.

Fixes: 151418948
Test: visual
Change-Id: I693534de006b4dbcaf192858e6f7d031bad78fef
 2020-03-17 17:55:49 +08:00
SongFerngWang
3d54554521 Fix sim pin lock preference disappear in dual sim. 
If one sim hide the preference and another one show the preference,
the preference always hide. The root cause is config value is wrong.
It should get config with subid.

Bug: 149800931
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
Change-Id: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
 2020-03-17 14:35:31 +08:00
Automerger Merge Worker
b152652975 Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887 am: b8b7c24bcc 
Change-Id: I1ea9e08fbf6eb1f55f46fb031e53eb0de36c77ec
 2020-03-17 06:32:43 +00:00
Automerger Merge Worker
b8b7c24bcc Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887 
Change-Id: I34e02d8f1edbe3db7e9128feda8fafa27bcd6695
 2020-03-17 06:11:44 +00:00
Automerger Merge Worker
da9185b887 Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 
Change-Id: I6807e9d6a88c7a82b5835c773f1216bbe5cd3f24
 2020-03-17 05:58:49 +00:00
TreeHugger Robot
1a84719041 Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev 2020-03-17 05:43:45 +00:00
Automerger Merge Worker
d01dc26567 Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: e1c3cdf682 am: 20de5d75b3 
Change-Id: I0ba276fa20965ed08efba2b83bfbc40687aa5bc3
 2020-03-17 04:17:55 +00:00
Automerger Merge Worker
20de5d75b3 Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: e1c3cdf682 
Change-Id: I76fa0d2087a9f540d2f9fcfe3c4f2b3e2ec7f45f
 2020-03-17 03:55:47 +00:00
Automerger Merge Worker
e1c3cdf682 Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 
Change-Id: I7e826cef3b212bcc53cbdc863e6e241fe656429a
 2020-03-17 03:45:49 +00:00
tim peng
95cd4c9414 Merge "Output switcher header is not updated with the latest media content" into rvc-dev 2020-03-17 03:26:50 +00:00