PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,530 Commits 1 Branch 0 Tags
d296fbbd11ba12dd9699423ec2c89eacf5c47f07
Commit Graph

79530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
d296fbbd11 Merge "Can't show 5GE at summary" into sc-dev am: 851a2f8557 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13622530

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99741e734cf735048b691c7fb8e38ff846086d4e
 2021-02-19 09:54:41 +00:00
SongFerng Wang
851a2f8557 Merge "Can't show 5GE at summary" into sc-dev 2021-02-19 09:24:12 +00:00
SongFerngWang
35b4725975 Can't show 5GE at summary 
The 5GE has HTML tag, so it should do transformation by Html.fromHtml.

Bug: 180053606
Test: atest ProviderModelSliceHelperTest.java
Change-Id: I32ac255d50c52ce853f686ac22572fa1cb44e9cd
 2021-02-19 15:57:19 +08:00
TreeHugger Robot
befd6ba551 Merge "[Provider Model] UI wording change" into sc-dev am: 1ebb7fa010 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13614888

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30cac4af8c0618068403abe6ac1859f769f25fe7
 2021-02-19 04:38:28 +00:00
TreeHugger Robot
1ebb7fa010 Merge "[Provider Model] UI wording change" into sc-dev 2021-02-19 04:12:32 +00:00
TreeHugger Robot
ba92a30f69 Merge "Begin transition from BatteryStatsHelper to BatteryUsageStats API." into sc-dev am: 188061ba81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13593405

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1907810c599d120ffac6a299455b73f94ab1db90
 2021-02-19 02:27:56 +00:00
TreeHugger Robot
a71afb5f91 Merge "Revert "Use location access for recent location apps."" into sc-dev am: bb9f578c9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13617856

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d11a503a7eb6508f0cb10989fd000918f24fc69
 2021-02-19 02:23:16 +00:00
TreeHugger Robot
188061ba81 Merge "Begin transition from BatteryStatsHelper to BatteryUsageStats API." into sc-dev 2021-02-19 01:31:18 +00:00
TreeHugger Robot
bb9f578c9b Merge "Revert "Use location access for recent location apps."" into sc-dev 2021-02-19 00:56:15 +00:00
Dmitri Plotnikov
97b3325ece Begin transition from BatteryStatsHelper to BatteryUsageStats API. 
For now, keep both BatteryStatsHelper and BatteryUsageStats in play.
The plan is to transition from the former to the latter, one usage
at a time.  When all is said and done, all references to
BatteryStatsHelper will be gone.

Bug: 173745486
Test: atest --host SettingsRoboTests

Change-Id: I37e1dfff0043b1845992f18d72067bb547bb69ff
 2021-02-18 11:56:00 -08:00
Alex Salo
5e48932b3a Merge "Check for available rotation resolver service and camera permission before showing setting for face based auto-rotation" into sc-dev am: a1615409c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13549709

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd0aa17cbd961a7331c57c905795a219b4ddae7e
 2021-02-18 18:22:04 +00:00
Alex Salo
a1615409c7 Merge "Check for available rotation resolver service and camera permission before showing setting for face based auto-rotation" into sc-dev 2021-02-18 18:11:33 +00:00
Treehugger Robot
a34b325ae5 [automerger skipped] Merge changes I62c58967,I1dd57fa2 am: 20e39131c9 am: 72b557ac6a am: d558605aeb -s ours am: 9561f091e1 -s ours 
am skip reason: Change-Id I62c589679052b276927d057d3d5d084bbfb57626 with SHA-1 cacf9aa485 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35a9459e2afb65db9d46dcac687c06a8fc587482
 2021-02-18 18:06:04 +00:00
Lorenzo Colitti
c7efd6e180 [automerger skipped] Stop using ConnectivityManager for VPNs. am: 1434c08600 am: cd7a7d20a1 am: 927ff0169f -s ours am: 2d6fc470ef -s ours 
am skip reason: Change-Id I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff with SHA-1 5c9a042370 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0fa690c1fbc9d738db416e7e3cc7c8d38e81df87
 2021-02-18 18:05:58 +00:00
Treehugger Robot
9561f091e1 [automerger skipped] Merge changes I62c58967,I1dd57fa2 am: 20e39131c9 am: 72b557ac6a am: d558605aeb -s ours 
am skip reason: Change-Id I62c589679052b276927d057d3d5d084bbfb57626 with SHA-1 cacf9aa485 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97017df7c6a222880da0c83da29c3876ebf8ac83
 2021-02-18 17:46:32 +00:00
Lorenzo Colitti
2d6fc470ef [automerger skipped] Stop using ConnectivityManager for VPNs. am: 1434c08600 am: cd7a7d20a1 am: 927ff0169f -s ours 
am skip reason: Change-Id I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff with SHA-1 5c9a042370 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27a49c8a958d4823efae43fe62e0171f500f4ba9
 2021-02-18 17:46:29 +00:00
Wei Wang
5da4f381a6 Revert "Use location access for recent location apps." 
This reverts commit f383cb44b4.

Reason for revert: crashes on work profiles (http://b/180516388)

Change-Id: Iff499e6a1439b6ecb524a61a9a88fe253799a131
 2021-02-18 17:18:20 +00:00
Treehugger Robot
d558605aeb Merge changes I62c58967,I1dd57fa2 am: 20e39131c9 am: 72b557ac6a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1593774

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I216766fc245cdefacda920dcdde56c0d50f6d6b6
 2021-02-18 17:09:56 +00:00
Lorenzo Colitti
927ff0169f Stop using ConnectivityManager for VPNs. am: 1434c08600 am: cd7a7d20a1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1592132

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie612e6ca5f73330b99f64054a718500647100f42
 2021-02-18 17:09:55 +00:00
Treehugger Robot
72b557ac6a Merge changes I62c58967,I1dd57fa2 am: 20e39131c9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1593774

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibae0be639bd6f0a4af5cc108d750c5f77321e6d7
 2021-02-18 16:53:39 +00:00
Lorenzo Colitti
cd7a7d20a1 Stop using ConnectivityManager for VPNs. am: 1434c08600 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1592132

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I963c04fcf90280bc96a5daa8170dad772a5db955
 2021-02-18 16:53:28 +00:00
TreeHugger Robot
27e70f84de Merge "Fix broken tests" into sc-dev am: cdcd94919c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13614887

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4b5bf69cc4cb4a85b040be3537534911acb061d
 2021-02-18 16:52:25 +00:00
TreeHugger Robot
cdcd94919c Merge "Fix broken tests" into sc-dev 2021-02-18 16:27:10 +00:00
Treehugger Robot
20e39131c9 Merge changes I62c58967,I1dd57fa2 
* changes:
  Remove ConnectivityManager from EnterprisePrivacyFeatureProvider.
  Stop using ConnectivityManager for VPNs.
 2021-02-18 15:47:13 +00:00
Lorenzo Colitti
65128bab08 Remove ConnectivityManager from EnterprisePrivacyFeatureProvider. 
It is only used in GlobalHttpPreferenceController. Move it there.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I62c589679052b276927d057d3d5d084bbfb57626
Merged-In: I62c589679052b276927d057d3d5d084bbfb57626
 2021-02-18 23:51:11 +09:00
Lorenzo Colitti
1434c08600 Stop using ConnectivityManager for VPNs. 
These methods have all moved to VpnManager.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
Merged-In: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
 2021-02-18 23:50:59 +09:00
TreeHugger Robot
62bb622122 Merge "Restructure app info page" into sc-dev am: fcdd955dff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13482645

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73cb294dcee289c743ef69da690a062915ffdc9d
 2021-02-18 11:19:42 +00:00
TreeHugger Robot
fcdd955dff Merge "Restructure app info page" into sc-dev 2021-02-18 11:03:38 +00:00
Lorenzo Colitti
1d7e396ba3 Merge "Remove ConnectivityManager from EnterprisePrivacyFeatureProvider." into sc-dev am: 693fcb5913 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13609302

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If01e11ba34a87601f17a88d0590a33876dd7ce33
 2021-02-18 11:01:35 +00:00
TreeHugger Robot
9de574279c Merge "Stop using ConnectivityManager for VPNs." into sc-dev am: c9197ec51b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13609293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I185166ce487e5f61dbe10dcfe063825e4e21af43
 2021-02-18 11:01:22 +00:00
Lorenzo Colitti
693fcb5913 Merge "Remove ConnectivityManager from EnterprisePrivacyFeatureProvider." into sc-dev 2021-02-18 10:45:22 +00:00
TreeHugger Robot
c9197ec51b Merge "Stop using ConnectivityManager for VPNs." into sc-dev 2021-02-18 10:28:19 +00:00
Tsung-Mao Fang
772477af1c Fix broken tests 
1) Remove AssistantFeedbackPreferenceController since it didn't use.
2) Refine the AssistantFeedbackPreferenceControllerTest, we need to use
vpn manager object now. (See ag/13519006)

Test: Run robo test
Fix: 180576544
Change-Id: I719711d83201d571427b9f46a6026e0831cddab6
 2021-02-18 10:23:25 +00:00
Weng Su
64cf59bad3 [Provider Model] UI wording change 
- Update the summary of Ethernet network
  "To switch networks, disconnect ethernet"

- Update the summary of data usage for non-carrier networks
  "Excludes data used by carrier networks"

- Update the title of Network preferences
  "Network preferences"

- Screenshot:
  https://screenshot.googleplex.com/62URXVwUJbSXKko
  https://screenshot.googleplex.com/AeZDG2HmkmUkeHd

Bug: 178473018
Bug: 178474159
Bug: 178886957
Test: manual test
Change-Id: Id9ed11ed5cc2db329556bf64a13f21999dcdb151
 2021-02-18 18:22:19 +08:00
Weng Su
630e80496d Merge "Fix WiFi show "Not connected" always issue" into sc-dev am: a4fa394b07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13519005

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6bef9fb2945d4915399ae6fdb2730a3ac93bccc2
 2021-02-18 10:05:02 +00:00
Weng Su
a4fa394b07 Merge "Fix WiFi show "Not connected" always issue" into sc-dev 2021-02-18 09:55:18 +00:00
TreeHugger Robot
1060aa5ffc Merge "Change SIM dialog activity theme" into sc-dev am: 178081cf83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13536591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7dc3062acc250e72b9d1e65457200ff59e83d991
 2021-02-18 09:41:53 +00:00
TreeHugger Robot
178081cf83 Merge "Change SIM dialog activity theme" into sc-dev 2021-02-18 09:18:37 +00:00
Jiashen Wang
f4aec51397 Merge "Fix the notification issue after pSIM is auto enabled" into sc-dev am: e74e93b31e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13564226

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic76c2a964a883ca3fb6129ad3f2580007a27e792
 2021-02-18 07:48:43 +00:00
Lorenzo Colitti
cacf9aa485 Remove ConnectivityManager from EnterprisePrivacyFeatureProvider. 
It is only used in GlobalHttpPreferenceController. Move it there.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I62c589679052b276927d057d3d5d084bbfb57626
 2021-02-18 16:44:53 +09:00
Jiashen Wang
e74e93b31e Merge "Fix the notification issue after pSIM is auto enabled" into sc-dev 2021-02-18 07:12:31 +00:00
Lorenzo Colitti
5c9a042370 Stop using ConnectivityManager for VPNs. 
These methods have all moved to VpnManager.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
 2021-02-18 16:02:08 +09:00
Tsung-Mao Fang
c500abe17e Update new owners for battery pages. am: 9a90dc1e8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13609225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I295a4ff6ba3a25e8e9089e86b2017e33a7faacb8
 2021-02-18 04:06:42 +00:00
Tsung-Mao Fang
9a90dc1e8e Update new owners for battery pages. 
Change-Id: I330d074c6e504493abf4cece51199ec5851b5d3b
 2021-02-18 01:27:27 +00:00
Abel Tesfaye
ed7673eadd Check for available rotation resolver service and camera permission before showing setting for face based auto-rotation 
Test: locally with crosshatch & make -j64 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.display.SmartAutoRotateControllerTest"

Bug: 172857585
Change-Id: I825b0c2471c71a3de59532b39a47c5442f234fb5
 2021-02-18 00:18:47 +00:00
Yomna Nasser
d0cb6a7eb3 Merge "Adds Enable2gPreferenceController and unit tests." into sc-dev am: 977513924c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13534046

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I340ea8cad01cbbb01f7d1fc09a5702f67b8fc35e
 2021-02-18 00:13:35 +00:00
Yomna Nasser
977513924c Merge "Adds Enable2gPreferenceController and unit tests." into sc-dev 2021-02-17 23:44:43 +00:00
Jiashen Wang
15e7a0bce4 Fix the notification issue after pSIM is auto enabled 
Bug: 179933905
Test: Manually tested
Change-Id: I52a751c515785618c9a1a5f3bc571687731b4552
 2021-02-17 20:42:52 +00:00
Yomna Nasser
6d65cb995b Adds Enable2gPreferenceController and unit tests. 
Adds (1) Enable2gPreferenceController, the controller for the
"Enable 2G" toggle, and (2) Enable2gPreferenceControllerTest,
the corresponding unit tests.

Test: manul & atest -c Enable2gPreferenceControllerTest
Bug: b/163168917
Change-Id: Ib827cfcfd96fdea77b586c92ae0ec5b2bd5818c3
 2021-02-17 20:08:41 +00:00
Julia Reynolds
86fc70d4cd Merge "Add filtering to notification channel settings" into sc-dev am: 6c70707655 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13563266

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93d30870dc9ae0e0664bb7a44d96902a304de2fe
 2021-02-17 14:37:00 +00:00