Commit Graph

60393 Commits

Author SHA1 Message Date
TreeHugger Robot
d5f0f2d8c8 Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb
Change-Id: Id86e0b84a70cfbeb2e96590b2d90d6059b94f37b
2020-03-20 04:02:14 +00:00
TreeHugger Robot
b33c16cacb Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev 2020-03-20 03:40:00 +00:00
Yi-Ling Chuang
d44ceb95cc Update the icon of security IA.
Fixes: 140556928
Test: rebuild and check the icon on the homepage
Change-Id: I211ea9f57910943a75d8a98c6d88ce99018debfe
2020-03-20 11:36:18 +08:00
TreeHugger Robot
f28bf18e57 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d -s ours am: dc1f295a59 -s ours
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: Ifc09356da641d2d801bbccf8370801821a0b6d12
2020-03-20 03:31:06 +00:00
TreeHugger Robot
dc1f295a59 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d -s ours
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: I279a6e1584a26219a1b3b26a0054ebb9728b498e
2020-03-20 03:19:10 +00:00
TreeHugger Robot
3c137d807d Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev 2020-03-20 02:51:54 +00:00
TreeHugger Robot
8fd066d5d3 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4
Change-Id: Ice2f1aae12ae46f1448bf11b25c78008c5ab4e34
2020-03-20 02:16:04 +00:00
Sooraj Sasindran
3e26fc0f21 Revert "access system resources with android.R package"
Revert "access system resources with android.R package"

Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Reverted Changes:
I1e698d404:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Idc1095563:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Change-Id: Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4
2020-03-20 01:37:47 +00:00
Sooraj Sasindran
253ba4f3ef Revert "access system resources with android.R package"
Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Reverted Changes:
Idc1095563:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I1e698d404:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Change-Id: I1e370f0eadce02508b0a16e01e51c4ac5b002ac9
2020-03-20 01:37:30 +00:00
TreeHugger Robot
b436d149e4 Merge "Update string for Adaptive sleep slice title." into rvc-dev 2020-03-20 01:16:53 +00:00
TreeHugger Robot
33650f397b Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0
Change-Id: I70f069eed562fedf4cdcc89361a115942c6ed1b3
2020-03-20 00:51:17 +00:00
TreeHugger Robot
db468353e0 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev 2020-03-20 00:41:34 +00:00
govenliu
907e402cfa [Wi-Fi] Add API to handle help button click event
Add API to launch help page when Openroaming help button is tapped.

Bug: 146669261
Test: Add openSubscriptionHelpPage_shouldCallStartActivityForResult unit test to check StartActivityForResult had been launched correctly.
Change-Id: If18248e7d985215e65dfdc5742cd9007efbbff1a
2020-03-19 23:22:36 +00:00
TreeHugger Robot
7215a8a982 Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f
Change-Id: I40ad2a07f2e9231fa16d98006e6ad79c49a9de4c
2020-03-19 22:48:43 +00:00
TreeHugger Robot
32d71ab700 Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84
Change-Id: I0d1b386cb8fb5ad18bfe832fe9cee8bdacfbf603
2020-03-19 22:47:21 +00:00
Yi Jiang
80d0fa1c5e Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest
Bug: 139319542
Test: atest ContextualAdaptiveSleepSliceTest
Change-Id: Ie10e8c06382594fe417d9d495b8b071afb717723
2020-03-19 15:39:34 -07:00
TreeHugger Robot
c4fd9b8d6f Merge "Add strings for the install app banner in cross profile settings" into rvc-dev 2020-03-19 22:39:31 +00:00
TreeHugger Robot
7be978cd84 Merge "Settings strings for bubbles" into rvc-dev 2020-03-19 22:37:11 +00:00
Brad Ebinger
de2ffe1f16 Change to Contact Discovery Dialog Language based on Privacy Feedback
Bug: 141950843
Test: verify text
Change-Id: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
2020-03-19 15:26:25 -07:00
TreeHugger Robot
13b129632a Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e
Change-Id: Iee14e77394977a8b2aafc6249a010fa9b820ca96
2020-03-19 22:11:31 +00:00
TreeHugger Robot
691aa7a05e Merge "Change cross profile settings page title" into rvc-dev 2020-03-19 22:03:22 +00:00
Michael Groover
4605509b09 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe
Change-Id: Iddcb73d6300a4563d6ce146c27446d88638f212b
2020-03-19 21:37:41 +00:00
Varun Anand
38fc2238bd Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3
Change-Id: Ia42e358a40f86101ab8f104697861b325fbc3293
2020-03-19 21:36:13 +00:00
Michael Groover
0a189b3abe Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev 2020-03-19 21:31:01 +00:00
Varun Anand
4ebfaec3a3 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev 2020-03-19 21:21:22 +00:00
Hall Liu
f0f5796b95 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061
Change-Id: I9224f80e87ab21b00ce78427c093b5b686c9ddea
2020-03-19 21:09:09 +00:00
Hall Liu
64e48c2061 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev 2020-03-19 21:06:54 +00:00
Mady Mellor
1f54e84c3c Settings strings for bubbles
To be used in a follow up..

Test: treehugger
Bug: 151965589
Change-Id: I1a285d0eb827eed33d9dcca2ec6e2be2ef098185
2020-03-19 13:16:36 -07:00
Peter Wang
e85186f38e Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6
Change-Id: I904e10cf91836c1d25d6b318dff364185f5a796f
2020-03-19 20:16:15 +00:00
Peter Wang
6c95bb5cf6 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev 2020-03-19 20:07:39 +00:00
kholoud mohamed
48db1a2b0d Add strings for the install app banner in cross profile settings
Bug: 151920866
Test: N/A
Change-Id: Ib0cf7e437952211ce929c1eba763dc8ed54793e6
2020-03-19 20:04:31 +00:00
Sarah Chin
1a37fd26fa [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours am: 13ee012dce -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee is in history

Change-Id: I7f1af1f1a2c55c7014bf0ef0400feae78bf1d399
2020-03-19 19:27:28 +00:00
Sarah Chin
13ee012dce [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee is in history

Change-Id: Id17d3ac372de1dd6385a674a8e72cf935a531696
2020-03-19 19:24:55 +00:00
Sarah Chin
bd8bbca27c Merge "5G meteredness for telephony framework" into qt-qpr1-dev 2020-03-19 19:11:00 +00:00
TreeHugger Robot
88f17b2ce9 Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78
Change-Id: I455f43c98d738412ba87a67193189827f851dff7
2020-03-19 19:08:47 +00:00
TreeHugger Robot
635c0e7f78 Merge "Add Ethernet Tethering settings" into rvc-dev 2020-03-19 18:54:12 +00:00
Anna Trostanetski
73fdbebfcc [automerger skipped] Merge "Show only listUIChanges instead of all" am: c305df9450 am: 983158e9ab -s ours
am skip reason: Change-Id I5b461b33484a38d0c6a5b7bf7e928231dd662668 with SHA-1 74117346a6 is in history

Change-Id: I07e913d115710757c59c5fd7ab2a7ee7f59790e9
2020-03-19 18:00:03 +00:00
Anna Trostanetski
983158e9ab Merge "Show only listUIChanges instead of all" am: c305df9450
Change-Id: Ic3c11a30e28d91aebd5b15d6b601f12294a13a8b
2020-03-19 17:51:32 +00:00
Anna Trostanetski
c305df9450 Merge "Show only listUIChanges instead of all" 2020-03-19 17:34:45 +00:00
Bonian Chen
4fb049537d Merge "[Settings] Refactor of ApnSettings" am: afbbde35b6 am: 43d3caa835
Change-Id: I5f31cd12c3819768452c417e062219937a269e8e
2020-03-19 17:24:10 +00:00
Xin Li
0cad441364 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master
Bug: 151763422
Change-Id: I2f38724f862817185ae93dd79736791540251a60
2020-03-19 10:10:41 -07:00
kholoud mohamed
c611fe6020 Change cross profile settings page title
Also removed the do not translate flag as they
are now finalized.

Bug: 149476396
Test: N/A
Change-Id: I24362a868bf2760f0ca91c26dba465adbfa631a7
2020-03-19 17:08:01 +00:00
Bonian Chen
43d3caa835 Merge "[Settings] Refactor of ApnSettings" am: afbbde35b6
Change-Id: I17c240896ef2d462e938fea88e981e73a4a05db4
2020-03-19 17:06:58 +00:00
Bonian Chen
afbbde35b6 Merge "[Settings] Refactor of ApnSettings" 2020-03-19 16:54:42 +00:00
Yuuki Habu
557e457278 Add Ethernet Tethering settings
Add Ethernet Tethering settings
 - Show prefernce if config_ethernet_iface_regex is set
 - Activate if tethered ethernet interface is exist

Bug: 148824036
Test: manual test
 - update prefernce plug-in, plug-out
Change-Id: Ia4f365ddc1a53a926d716046db3e6ac463c978b9
2020-03-20 01:16:43 +09:00
atrost
77e4f7b3bb Show only listUIChanges instead of all
Use the new method that filters out changes that shouldn't be in the
developer UI.

Exempt-From-Owner-Approval: Roll forward of unchanged reverted change previously approved.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 151299145
Change-Id: I5b461b33484a38d0c6a5b7bf7e928231dd662668
Merged-In: I5b461b33484a38d0c6a5b7bf7e928231dd662668
2020-03-19 16:06:28 +00:00
Anna Trostanetski
ad2cfe0576 Merge "Show only listUIChanges instead of all" into rvc-dev am: 550a0459f2
Change-Id: I7aee0a9989d928d787288603abe5bcc043c648ad
2020-03-19 14:53:50 +00:00
Anna Trostanetski
550a0459f2 Merge "Show only listUIChanges instead of all" into rvc-dev 2020-03-19 14:52:19 +00:00
Sunny Shao
0030d78b62 Disable the sync now menu while no any synced item
- Check the number of the switch on for all SyncStateSwitchPreferences to
  enable/disable the sync now menu item.

Fixes: 147030748
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
Change-Id: I88e4b042e6d236b98866b9e8bff9ec2c64b41b87
2020-03-19 20:58:29 +08:00
Fiona Campbell
bf6624b603 Fix displayed brightness value in settings.
Change BrightnessLevelPreferenceController to use float values for
brightness instead of the int system.

Change tests to use correct values and floats.

Bug: b/150099686

Test: m -j99 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.display.BrightnessLevelPreferenceControllerTest",  manual

Change-Id: I1a6e06b4f5532b641d766f770be351b8ca827664
2020-03-19 11:28:44 +00:00