Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,442 Commits 1 Branch 0 Tags
4909b81006594c25fbed8604e0faeee5c0db3fda
Commit Graph

72442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
4909b81006 Merge "Add a developer option to increase nfc stack log level" am: 9d7b0beb87 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1733952

Change-Id: Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c
 2021-07-06 08:24:55 +00:00
Treehugger Robot
9d7b0beb87 Merge "Add a developer option to increase nfc stack log level" 2021-07-06 08:05:47 +00:00
Treehugger Robot
3d1551cf4e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88d39847b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c3dd739c8052f2ecc5152900ba1cfb61de52aa9
 2021-07-04 16:59:18 +00:00
Treehugger Robot
ac888d4bba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 964006012c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84923d0689ef90a2999535776674f83d33a3ab91
 2021-07-04 16:58:24 +00:00
Treehugger Robot
88d39847b9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 16:00:20 +00:00
Treehugger Robot
964006012c Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:58:19 +00:00
TreeHugger Robot
260e662a6e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-04 05:47:31 +00:00
TreeHugger Robot
61d76c1bcb Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-04 05:40:32 +00:00
Bill Yi
2da15f5ff7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7f0092859ef116b815fb7b0b808d26382f09a8e4
 2021-07-04 02:58:11 +00:00
Bill Yi
b3bdbe0be2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I46da67c58691feb24e1ce202fe42e00cc234bd08
 2021-07-04 02:56:39 +00:00
Bill Yi
3bddbf2fa5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1cbcb60c8c6e694c72af468b580cc27f72f2a7fe
 2021-07-04 02:53:23 +00:00
Bill Yi
ac0886d754 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id854c59331a03cf9a05828b1062e3c750c8603ba
 2021-07-03 18:45:56 -07:00
Bill Yi
18708c4f00 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iac0b5598da3ee6dedf95d2cb9f6e32109d9f19af
 2021-07-03 18:42:49 -07:00
Rahul Sabnis
3b68dd138c Merge "Ensure settings maintains its Bluetooth device inquiry state" am: bec574dca7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1716270

Change-Id: I2822d89ea7008d3a17cfb84f06f6c07ccfade3f9
 2021-07-02 22:17:23 +00:00
Rahul Sabnis
bec574dca7 Merge "Ensure settings maintains its Bluetooth device inquiry state" 2021-07-02 22:01:50 +00:00
Tom Hsu
6ff7306d51 Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." am: 53f081be37 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1753980

Change-Id: I317a0e09d0d43cdaa96baead76416d09b018a20a
 2021-07-01 12:12:33 +00:00
Tom Hsu
53f081be37 Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." 2021-07-01 12:00:52 +00:00
tom hsu
58d100c3a0 [Settings] Prevent crash from abnormal behavior for ApnSettings page. 
- The problem is user remove SIM when stop in ApnSettings page, and do
 unexpected operation.

 - To figure out this problem, listen SIM absent event and make activity
 finish at this moment.

Bug: 189909956
Test: Manual test.
Merged-In: I179c708debcbc31ba9a93e4e434ae810051f5004
Change-Id: If59f68f595794695600811224cdedb4692b869c0
 2021-07-01 17:10:56 +08:00
Wesley Wang
8d7f25430b Merge "Remove unnecessary converting us to ms in BatteryInfo" am: f4ababa50b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1749740

Change-Id: I1c1f0d8fcc457c2249a6b691367bd5e008163cec
 2021-06-29 10:06:17 +00:00
Wesley Wang
f4ababa50b Merge "Remove unnecessary converting us to ms in BatteryInfo" 2021-06-29 09:52:07 +00:00
Wesley.CW Wang
30b60195e8 Remove unnecessary converting us to ms in BatteryInfo 
The class "Estimate" has the menber estimateMillis and
the unit of batteryUsageStats.getBatteryTimeRemainingMs() is millisecond,
so converting from us to ms is unnecessary.

Bug: 187379252
Test: make RunSettingsRoboTests
Change-Id: Iefbd8751608eb749367cf08a4a9b184b948a6d33
 2021-06-28 17:59:35 +08:00
Xin Li
4d789befc6 [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: a8cf9a798d -s ours 
am skip reason: Merged-In I73964718e9b3d66dbe189f48bfe6d1b16ec921f4 with SHA-1 e774cf9cd3 is already in history

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

Change-Id: I5c526745444d10d77df6fe6496f2e0a0af1fab69
 2021-06-21 06:10:20 +00:00
Xin Li
a8cf9a798d Merge "DO NOT MERGE - Merge RQ3A.210605.005" 2021-06-21 05:49:05 +00:00
Xin Li
88f92cb4db DO NOT MERGE - Merge RQ3A.210605.005 
Bug: 190855093
Merged-In: I73964718e9b3d66dbe189f48bfe6d1b16ec921f4
Change-Id: Id888e72e86cbc130fec23dd7645d1ceea1ce319d
 2021-06-18 12:24:37 -07:00
Xin Li
e774cf9cd3 DO NOT MERGE - Merge RQ3A.210605.005 
Bug: 190855093
Merged-In: I6e2845cc19dc012cba2933318a067bbb8db90a23
Change-Id: I73964718e9b3d66dbe189f48bfe6d1b16ec921f4
 2021-06-17 23:16:37 -07:00
Xin Li
eb885ad642 DO NOT MERGE - Mark RQ3A.210410.001 as merged 
Bug: 190855093
Merged-In: I2b6c7d579bfa1ce3d3fb4432d92906dc739dde1b
Change-Id: Ieddc2c352e9f0228d3e4c4525054fa6bad106328
 2021-06-17 22:43:30 -07:00
TreeHugger Robot
d9e78dc848 Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master 2021-06-18 00:31:00 +00:00
Xin Li
7d73dec24c DO NOT MERGE - Merge ab/7272582 
Bug: 190855093
Merged-In: I1cc3796f31e7db3d8f062436ebc618d93db19822
Change-Id: I2b6c7d579bfa1ce3d3fb4432d92906dc739dde1b
 2021-06-17 21:56:04 +00:00
Treehugger Robot
b34692c2b5 Merge "Settings: use framework text colors for SwitchBar" am: b09a17bc9e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708559

Change-Id: I84406695c1822ccda20b74b35ea18a2d51487119
 2021-06-16 15:18:06 +00:00
Treehugger Robot
b09a17bc9e Merge "Settings: use framework text colors for SwitchBar" 2021-06-16 14:59:18 +00:00
Jack Yu
9deb600326 Add a developer option to increase nfc stack log level 
Easier to increase nfc stack log level.

Bug: 187083201
Test: enable/disable from developer option and check nfc log
Change-Id: I0675cbd535a2faf3b77b2842b03b7fb3b1b782fa
 2021-06-11 00:37:14 +08:00
Sarah Chin
5a173dad6c Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" am: 8222d88548 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1681974

Change-Id: I467a109a5387e4d1bc0da4e83c6e12ceea24d6bf
 2021-06-08 21:10:17 +00:00
Sarah Chin
8222d88548 Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" 2021-06-08 20:47:10 +00:00
Treehugger Robot
2b98c25bcf Merge "Enable the clear credentials buttons when wifi keys are installed." am: 5f1034bce0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1725994

Change-Id: I7a48bd13efccbb49ebd57ee298b7b71dd5410060
 2021-06-03 10:10:25 +00:00
Treehugger Robot
5f1034bce0 Merge "Enable the clear credentials buttons when wifi keys are installed." 2021-06-03 09:56:49 +00:00
Les Lee
38f9e01f84 Merge "wifi: Use new API for data usage function" am: c0245bb982 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697487

Change-Id: I24ba0a9ea96c9d0ff63b691f10a07b900cbbd399
 2021-06-03 08:18:16 +00:00
Janis Danisevskis
552992ac12 Enable the clear credentials buttons when wifi keys are installed. 
This patch updates the ResetCredentialsPreferenceController to check the
WIFI keystore namespace if called by the primary user.

Test: Install a WIFI certificate or key and watch the
      "Clear credentials" button become enabled in the credential
      storage dialog of Settings.
Bug: 189601008
Merged-In: I69828b64a7e3c707c27b4582d64ff0ddb863a4ff
Change-Id: I69828b64a7e3c707c27b4582d64ff0ddb863a4ff
 2021-06-02 16:46:18 -07:00
Les Lee
c0245bb982 Merge "wifi: Use new API for data usage function" 2021-06-01 10:42:08 +00:00
Rahul Sabnis
43c3ba86cd Ensure settings maintains its Bluetooth device inquiry state 
Bug: 187165224
Test: Manual
Change-Id: I4dafb7bf5b410d99cba7e30ee17f966611458db7
 2021-05-24 18:29:05 -07:00
Treehugger Robot
a786f86808 Merge "Settings: remove Bluetooth related text from DNS-dialog" am: ca3051403f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708562

Change-Id: Id142445ac2a16be54f0bbc8afdc9ce03b1676ea7
 2021-05-17 03:51:53 +00:00
Treehugger Robot
ca3051403f Merge "Settings: remove Bluetooth related text from DNS-dialog" 2021-05-17 03:19:59 +00:00
Timi Rautamäki
a84987564b Settings: remove Bluetooth related text from DNS-dialog 
* String ´bluetooth_select_a2dp_codec_type_help_info´
   is set on the ´preference_widget_dialog_summary´-dialog
   by default.

Test: make Settings, visual observation
Signed-off-by: Timi Rautamäki <timi.rautamaki@gmail.com>
Change-Id: I6d403f231797bcf5b10bf726cca4e128f4c517ea
 2021-05-16 21:08:36 +02:00
Timi Rautamäki
c640453297 Settings: use framework text colors for SwitchBar 
* Use framework text colors for SwitchBar also on
   dark mode to properly display disabled colors.
 * Before the patch, a disabled SwitchBar on dark
   mode would look same as an enabled one.

Test: open ´Notifications´-menu of a system app,
      verify SwitchBar text is gray in dark mode.
Signed-off-by: Timi Rautamäki <timi.rautamaki@gmail.com>
Change-Id: Ia2fc5eb3f614d899cb5e519c235f1ea9b86a1527
 2021-05-15 11:02:36 +02:00
Treehugger Robot
a2dc65e71e Merge "Device picker: add title to fix offset in progressbar" am: a3da419c8d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1622889

Change-Id: I966b9ede97c0d3e997b96dc012ffdd6476688448
 2021-05-14 04:38:14 +00:00
Treehugger Robot
a3da419c8d Merge "Device picker: add title to fix offset in progressbar" 2021-05-14 04:12:44 +00:00
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
lesl
74822b6dc3 wifi: Use new API for data usage function 
For mobile, a old API: buildTemplateMobileAll doesn't includes the
merged wifi network, call the new API: buildTemplateCarrierMetered
to replace the old one.

PS: Not only usage functionality but also apply to network policy
control since the default policy is changing to use
new API: buildTemplateCarrier now.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageLibTest
Test: Manual Test, modify the mobile usage warming and limit bytes and
      check the data via adb shell dumpsys netpolicy
Change-Id: I6fbec14e7be4dc4b5c2fd3659a801521c81b233c
 2021-05-11 20:06:11 +08: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