PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,051 Commits 1 Branch 0 Tags
aa307b03a95b7da6d97e4933ae605bc2fc60b00b
Commit Graph

72051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Lin
aa307b03a9 Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1675475

Change-Id: I18cd6578c4cec746aa1cfaba60822d857fab9b8d
 2021-05-12 17:23:45 +00:00
Lucas Lin
2e7309ffd3 Merge "Use [set|get]PrivateDnsMode directly" 2021-05-12 17:09:50 +00:00
Treehugger Robot
8c84477a04 Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137

Change-Id: I38f2d600c3bd14f3b59de36152a19a4f3a994e9d
 2021-05-08 22:01:03 +00:00
Xin Li
c41debcf7f DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137

Change-Id: I7325883698b037f16083f2dfa39db84feb21f698
 2021-05-08 22:00:38 +00:00
Treehugger Robot
7e8f5aca00 Merge "DO NOT MERGE - Merge RQ2A.210505.003." 2021-05-08 21:38:02 +00:00
Xin Li
bb6f5b264f DO NOT MERGE - Merge RQ2A.210505.003. 
Bug: 187544653
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Change-Id: I9a8ebe5b65b682015225c8c1ba9de1984bac7a8d
 2021-05-07 23:32:36 -07:00
Xin Li
1b68f3bfd3 [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours 
am skip reason: Merged-In Ic91dd36f6de39ef79f1ced90083e1c5c7836c651 with SHA-1 6f3630c393 is already in history

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

Change-Id: Ifc6c1d5d1192a56c9f33ded1a984e1d4b73157c9
 2021-05-08 01:48:55 +00:00
Xin Li
6811428c9c Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." 2021-05-08 01:28:18 +00:00
Xin Li
7df22b02ca DO NOT MERGE - Mark RQ2A.210105.001 as merged. 
Bug: 180401296
Merged-In: Ic91dd36f6de39ef79f1ced90083e1c5c7836c651
Change-Id: I82a9266b107ebaf80b897deb8066e6976642644b
 2021-05-07 14:32:28 -07:00
Edgar Wang
7106d10dd0 Merge "Add personal dictionary summary text" am: 0cbc974638 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: Ie7686e0df4f0e44bdb1dcb2d55a21e0c957d65b2
 2021-05-07 04:18:17 +00:00
Edgar Wang
0cbc974638 Merge "Add personal dictionary summary text" 2021-05-07 04:02:00 +00:00
Treehugger Robot
27a27acb2c Merge "Move myself to the emeritus section" am: 9119105da9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923

Change-Id: I5dc08c10017d0109271f68e86729bdabaa26262f
 2021-05-07 02:53:45 +00:00
Treehugger Robot
9119105da9 Merge "Move myself to the emeritus section" 2021-05-06 22:24:55 +00:00
Eran Messeri
6f3630c393 Move myself to the emeritus section 
As I no longer expect to be working on security-related settings, move
myself to the emeritus section.

Bug: 187395769
Test: N/A
Change-Id: Ic91dd36f6de39ef79f1ced90083e1c5c7836c651
 2021-05-06 15:16:40 +01:00
Les Lee
f38761e027 Merge "wifi: Use new API for wifi data usage function" am: 7469890c87 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1628759

Change-Id: Id4c98842b11cb4102059fdbbe76d5c4b527302fe
 2021-05-06 07:14:01 +00:00
Les Lee
7469890c87 Merge "wifi: Use new API for wifi data usage function" 2021-05-06 06:57:03 +00:00
lesl
fd41cce94b wifi: Use new API for wifi data usage function 
For wifi, a old API: buildTemplateWifiWildcard will includes the merged
wifi which is included to mobile usage. It should not double count
again. Call new API: buildTemplateWifi with
NetworkId: NetworkTemplate.WIFI_NETWORKID_ALL
and null subscriberId to get non-merged wifi usage.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppDataUsageTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppDataUsagePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageInfoControllerTest
Test: Manual Test, wifi data usage count correctly.
Bug: 176396812
Merged-In: Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb
Change-Id: Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb
 2021-05-06 09:37:09 +08:00
lucaslin
1fbe34fbc7 Use [set|get]PrivateDnsMode directly 
The value of PRIVATE_DNS_MODE_* has changed from String to int and
ConnectivityManager provides 2 new APIs to set and get private
DNS mode, the caller can use them directly and doesn't need to update
Settings by itself.

Bug: 185311744
Test: 1. make RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest
      2. make RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Change-Id: I47706efe9c53a00438fdec97fda244638cecb3dc
Merged-In: I47706efe9c53a00438fdec97fda244638cecb3dc
    (Cherry-picked from ag/14230401)
 2021-05-05 03:26:58 +00:00
Treehugger Robot
220ba05109 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: acc37353d7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieec4e25b4a582e782b410df438d401d1a328aac7
 2021-04-22 20:55:37 +00:00
Treehugger Robot
dda5464180 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5d68dc45b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74ccbff817c7d8e695e38a56e6a48c00df1a7d9b
 2021-04-22 20:50:28 +00:00
Treehugger Robot
ab17423f8f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 631013489d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a0298e75ff4adce5487c6e86153d5364e95f7c0
 2021-04-22 20:26:17 +00:00
Treehugger Robot
acc37353d7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 20:01:33 +00:00
Treehugger Robot
5d68dc45b3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:24:09 +00:00
Treehugger Robot
631013489d Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:20:30 +00:00
Bill Yi
86cf8dc82f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I74a0174984401e63ae86978bb3d472cb6422c1ce
 2021-04-22 10:33:24 -07:00
Bill Yi
183d5436b6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I670023c95e90df9d083ad0359c70b19195ccfb02
 2021-04-22 10:31:33 -07:00
Bill Yi
fbcfe8af01 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I814358b71ad2829789f1d9ac0711e369dddd11e4
 2021-04-22 10:28:15 -07:00
Daniel Hunt
8d50393223 Add personal dictionary summary text 
The resource id 'user_dict_settings_summary' was used to display
summary text of personal dictionary in Froyo. But from GingerBread it
is not used and an empty string is set.
Display above resource as summary text of personal dictionary entry.

Bug: 152970252
Test: Manual
Change-Id: Ib2d6abe1c128d2c7519be2017880cd2d53c026f3
 2021-04-22 18:26:31 +02:00
Jeremy Goldman
e67b576ab9 Merge "Check if the SubscriptionsChangeListener has been started before stop" am: 162029c5b6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1679185

Change-Id: Ia0580d6c17e936fe631c0cd1e0d946fa6881a92c
 2021-04-20 05:44:54 +00:00
Jeremy Goldman
162029c5b6 Merge "Check if the SubscriptionsChangeListener has been started before stop" 2021-04-20 05:24:37 +00:00
Jeremy Goldman
660e7164c7 Check if the SubscriptionsChangeListener has been started before stop 
calling mContext.unregisterReceiver on an unregistered broadcast
receiver will result in an exception. To make the
SubscriptionsChangeListener safe from this kind of error, add a check to
see whether start has been called before implementing stop's
functionality.

Bug: 184662284
Bug: 184521296
Test: atest -c SettingsUnitTests
Change-Id: Ic13911ee7573666f5d42ab4612c025968984ba47
 2021-04-20 11:33:17 +08:00
Treehugger Robot
ba40979005 Merge "Update OWNER file for TTS subfolder" am: a1cf8135e6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1674685

Change-Id: I0a31341d2018503a3e8d8bd0c4cd9f0d7637b5d3
 2021-04-20 02:53:35 +00:00
Treehugger Robot
a1cf8135e6 Merge "Update OWNER file for TTS subfolder" 2021-04-20 02:19:53 +00:00
Jack He
ee25171aa1 Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159

Change-Id: Ib4b7dbbc490cbb74954531fbf17b440074cb4447
 2021-04-14 05:23:30 +00:00
Jack He
6de2953232 Merge "BT: Use DeviceConfig for Bluetooth GD toggle" 2021-04-14 04:44:02 +00:00
Tsung-Mao Fang
b6b63bec6c Update OWNER file for TTS subfolder 
Change-Id: If0efd5051bc8ddcaa406746d4eb4e4a03d9023b7
Test: N/A
Fix: 185232773
 2021-04-14 01:29:15 +00:00
Jack He
8cc23bd2fe BT: Use DeviceConfig for Bluetooth GD toggle 
Bug: 184235563
Test: make and toggle GD settings, unit test
Change-Id: I643339f80a82950b1b1ffcf60830f93a955e6666
 2021-04-13 20:31:38 +00:00
Peter Wang
108ee559ea Merge "Fix intent String for starting profile management page in Manifest" am: ae74222567 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1671969

Change-Id: I26d0d0be6943bfc691c9b2476dd32f98a5561d50
 2021-04-09 23:26:07 +00:00
Peter Wang
ae74222567 Merge "Fix intent String for starting profile management page in Manifest" 2021-04-09 22:24:58 +00:00
Peter Wang
f40897d27e Fix intent String for starting profile management page in Manifest 
Bug: 170507492
Test: Local
Change-Id: I6c3f36f1dd99eb4b380dce7218f85757d350bc42
Merged-In: I6c3f36f1dd99eb4b380dce7218f85757d350bc42
 2021-04-09 13:33:15 -07:00
Almaz Mingaleev
90d5572fa5 Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." am: e3d4e39144 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1658001

Change-Id: Ia7c9b9c683429dcb51b79c57d745c7763a888721
 2021-04-07 16:55:48 +00:00
Almaz Mingaleev
e3d4e39144 Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." 2021-04-07 16:19:33 +00:00
Treehugger Robot
e7ff215244 Merge "Modify the value of intent-filter" am: 15ecc3610d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579989

Change-Id: Ic58bf302f23ae363d22a3ca7b636c9586dc04364
 2021-04-07 10:42:47 +00:00
Treehugger Robot
15ecc3610d Merge "Modify the value of intent-filter" 2021-04-07 10:11:06 +00:00
Almaz Mingaleev
3be24f4ab2 Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils. 
That timestamp is used in two places for the same purpose.

Bug: 155738410
Test: presubmit
Change-Id: Ia6836fd34c63aef6e335ef97922d34a60dbf3703
 2021-04-06 14:10:05 +01:00
Bonian Chen
a472f53325 Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980

Change-Id: I0330a149d0b686e8acee05a5028f67e1cb7ad3a6
 2021-03-31 15:03:38 +00:00
Bonian Chen
194af56330 Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" 
* changes:
  Revert "[Settings] Support getSystemService(Class<T>)"
  Revert "[Settings] Convert to getSystemService(Class<T>)"
 2021-03-31 14:30:40 +00:00
Bonian Chen
2b195b4335 Revert "[Settings] Support getSystemService(Class<T>)" 
Revert submission 1645152-getSystemService(Class<T>)

Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)

Change-Id: I5ca453c30c39d52e772033820f36ad448aeabe9e
 2021-03-31 09:37:03 +00:00
Bonian Chen
d6f54ed90b Revert "[Settings] Convert to getSystemService(Class<T>)" 
Revert submission 1645152-getSystemService(Class<T>)

Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)

Change-Id: I864a40f82ba9cb4170900ac0c1d77f781b17341f
 2021-03-31 09:37:03 +00:00
Almaz Mingaleev
87273aab56 Merge "Allow alternative time zone ID to be set device's zone." am: 2cd0b0aadf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652336

Change-Id: If30061d2e580c2cbb0a9ca2dc00f66604264a02d
 2021-03-30 08:57:53 +00:00