Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,033 Commits 1 Branch 0 Tags
4ae899122238e84944a8d51ca0729b7ef8ea2dfe
Commit Graph

58033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean Chen
4ae8991222 Merge "Support caption second UI structure (3/n)" 2020-01-13 02:24:01 +00:00
Kevin Chang
ca149c7d04 Merge "Modify the code logic of OnLayoutChangeListener in Caption preferences" 2020-01-13 02:00:14 +00:00
TreeHugger Robot
82872cb253 Merge "Fix work tab app doesn't launch correct user intent" 2020-01-13 01:55:56 +00:00
TreeHugger Robot
b642f3cb10 Merge "Visual updates for DND screens" 2020-01-11 20:09:26 +00:00
Automerger Merge Worker
29a464db2c [automerger skipped] Import translations. DO NOT MERGE am: 5680c7b0e4 -s ours am: 0e5c9124f0 -s ours 
am skip reason: subject contains skip directive

Change-Id: I286029eaa7c5427a73c5074d80e87a4f416cfb24
 2020-01-11 19:48:54 +00:00
Automerger Merge Worker
0e5c9124f0 [automerger skipped] Import translations. DO NOT MERGE am: 5680c7b0e4 -s ours 
am skip reason: subject contains skip directive

Change-Id: I0990e22af9fca905e34d8afa5dc978f3d5f11af1
 2020-01-11 19:34:44 +00:00
Julia Reynolds
b5ea53a981 Visual updates for DND screens 
(part 1), emphasizing People

Test: atest, manual
Bug: 137397357
Change-Id: I5672462feb480ea2fced70470ed7c2c8116fadfd
 2020-01-11 17:03:22 +00:00
Bill Yi
5680c7b0e4 Import translations. DO NOT MERGE 
Change-Id: I2ef156b791ffe0cd24dcdb6501cf18dc07625d50
Auto-generated-cl: translation import
 2020-01-11 06:40:09 -08:00
Tom Hsu
452bc35d9c Merge "Remove reference of PhoneConstant." 2020-01-11 09:39:50 +00:00
Curtis Belmonte
03390a5682 Merge "Update L2U string for face unlock in settings" 2020-01-11 01:53:17 +00:00
Raff Tsai
4536fae5b7 Fix work tab app doesn't launch correct user intent 
- Pass user.getIndentifier() to intent

Fixes: 147357696
Test: 1. go to Settings -> Storage -> Music&Audio
      2. switch to work tab
      3. tab "Audio files"
      4. should display work profile files

Change-Id: I0d2883c45eb7b883adbaf034c0a49c5e52ba82f6
 2020-01-11 09:16:24 +08:00
Sarah Chin
4520826af6 [automerger skipped] Merge "5G meteredness for telephony framework" am: 5ce99e22ff am: dd1c7d0a8a -s ours 
am: 875ac6925a -s ours
am skip reason: change_id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA1 9ea18281ee is in history

Change-Id: I88005f5f4d077db75f95d495be3c0b781cfa066f
 2020-01-10 11:26:36 -08:00
Sarah Chin
e043681c41 [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev-plus-aosp 
am: c21d0ca119 -s ours
am skip reason: change_id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA1 9ea18281ee is in history

Change-Id: I51e4aff47437458ad69127cb0b1d382a7d6a684f
 2020-01-10 11:26:08 -08:00
Sarah Chin
a8e8b776ad [automerger skipped] 5G meteredness for telephony framework 
am: 9ea18281ee -s ours
am skip reason: change_id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA1 0c518d5aab is in history

Change-Id: Iec2190074e247f441a2bbc4f3baabca54d927764
 2020-01-10 11:17:39 -08:00
David Su
8aeb6ce749 Merge "SettingsRoboTests: Remove @hide Wifi API usages" 2020-01-10 19:11:45 +00:00
TreeHugger Robot
01a55e950d Merge "mainline: remove CarrierConfigManager.init" 2020-01-10 18:48:20 +00:00
tom hsu
25f1de88dd Remove reference of PhoneConstant. 
Copy constants to ApnEditor from PhoneConstant

Test: make
Test: m RunSettingsRoboTests
Change-Id: I22b85799ad547aca1ce4e63af3f39bc7f29618c6
 2020-01-10 17:30:18 +00:00
Automerger Merge Worker
875ac6925a [automerger skipped] Merge "5G meteredness for telephony framework" am: 5ce99e22ff am: dd1c7d0a8a -s ours 
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee is in history

Change-Id: I9b54d37c262a0b25a044daa3372432793595c15a
 2020-01-10 17:18:30 +00:00
Sarah Chin
dd1c7d0a8a Merge "5G meteredness for telephony framework" 
am: 5ce99e22ff

Change-Id: I5f516f7ba5b4e0ec24283c4b555d4a5ff9ae2ea6
 2020-01-10 09:03:56 -08:00
Sarah Chin
5ce99e22ff Merge "5G meteredness for telephony framework" 2020-01-10 16:36:48 +00:00
Sarah Chin
c21d0ca119 Merge "5G meteredness for telephony framework" into qt-qpr1-dev-plus-aosp 2020-01-10 16:32:40 +00:00
SongFerngWang
762e193266 mainline: remove CarrierConfigManager.init 
Bug: 147469789
Test:  make RunSettingsRoboTests ROBOTEST_FILTER=\
ApnPreferenceControllerTest (PASS)
make RunSettingsRoboTests ROBOTEST_FILTER=\
CarrierPreferenceControllerTest (PASS)
Change-Id: I2a72d409574fc281e5de57d58a27551dd040d551
 2020-01-10 23:12:30 +08:00
Lee Chou
e9a38a37ba Merge "Replaced reference to setPreferredNetworkType" 2020-01-10 14:50:47 +00:00
TreeHugger Robot
424a2595a7 Merge "Removed reference to PhoneConstant PHONE_TYPE_*" 2020-01-10 13:52:32 +00:00
TreeHugger Robot
581c663275 Merge "Update Dark theme slice for new behavior" 2020-01-10 13:44:19 +00:00
Sunny Shao
31c5f39d57 Update Dark theme slice for new behavior 
- Add an broadcast receiver to monitor the Home key.
- Add the sClickedInSlice flag to verify Dark theme is changed by slice or not.

Bug: 142476879
Fixes: 146149658
Fixes: 146652692
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage
Change-Id: I174d0c861ea3b3f793201e3b2e0ff65a1e690f4e
 2020-01-10 20:12:38 +08:00
TreeHugger Robot
ca47535288 Merge "Removed reference to TelephonyManager#from" 2020-01-10 11:53:28 +00:00
TreeHugger Robot
ecebf0ef61 Merge "[Wi-Fi] Fix Wi-Fi wrong password notification can't launch editor" 2020-01-10 11:39:49 +00:00
Lee Chou
c3a453174e Removed reference to PhoneConstant PHONE_TYPE_* 
replaced with TelephonyManager.PHONE_TYPE_*

Bug: 147469330
Test: m RunSettingsRoboTests
Change-Id: I286c4879d55e28707081d4cacba1a2c444f92646
 2020-01-10 18:48:00 +08:00
Shafik Nassar
8b1b697711 Merge "Add activities to handle external storage intents" 2020-01-10 10:26:09 +00:00
Raff Tsai
d4089984a1 Merge "Merge work profile storage data together" 2020-01-10 10:01:56 +00:00
Arc Wang
c4b1d0f416 [Wi-Fi] Fix Wi-Fi wrong password notification can't launch editor 
WifiPickerTracker gather WifiEntries at onStart but
WifiPickerTracker.getWifiEntries() may still have no WifiEntry
at onResume.

Check if there is a specified wrong password Wi-Fi network at
onWifiEntriesChanged.

Bug: 143328194
Test: manual
      Edit a Wi-Fi network with wrong password, click the wrong
      password notification, should see a Wi-Fi editor for the
      wrong password Wi-Fi network

Change-Id: I7de6e0e3eabb2cb00160709eca4951b655dc04d7
 2020-01-10 17:21:00 +08:00
Lee Chou
5415922f32 Removed reference to TelephonyManager#from 
Bug: 147469171
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MmsMessagePreferenceControllerTest
Change-Id: Icfbcd948cd5072bd2e44942bff79562f540ab2b4
 2020-01-10 17:15:25 +08:00
Lee Chou
3555e1707a Replaced reference to setPreferredNetworkType 
replaced with @SystemApi setPreferredNetworkTypeBitmask

Bug: 147405973
Test: make RunSettingsRoboTests ROBOTEST_FILTER=EnabledNetworkModePreferenceControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=PreferredNetworkModePreferenceControllerTest

Change-Id: I8ae86595b104dcd16daacbf52cc8eaa5e7a3d08b
 2020-01-10 16:57:53 +08:00
TreeHugger Robot
c824ef4940 Merge "softap: Use set/getPassphrase to replace set/getWpa2Passphrase" 2020-01-10 08:47:44 +00:00
TreeHugger Robot
7a3ed0ecea Merge "[Wi-Fi] Remove redundant code in WifiSettings2" 2020-01-10 08:34:10 +00:00
TreeHugger Robot
e9f52bce9d Merge "[Wi-Fi] Revert "support SAE password identifier in wifi dialog"" 2020-01-10 08:31:39 +00:00
Lee Chou
76a41a84dd Merge "Disable Broken Settings Tests" 2020-01-10 08:20:47 +00:00
Lee Chou
30c453755e Disable Broken Settings Tests 
Some Settings Tests are currently broken, disabling for now

Bug: 147464840
Test: make RunRoboSettingsTests
Change-Id: I7c00faa00ce91030e76b7d4d028f6a30e471738f
 2020-01-10 16:16:17 +08:00
Automerger Merge Worker
7e44d6de13 [automerger skipped] Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState" am: c5e7864948 am: ed119d3b0e am: d41ee5451c -s ours 
am skip reason: Change-Id I5a4a1a2b0dc5140257963651b69c0f427ef5ae93 with SHA-1 04673056d7 is in history

Change-Id: I33264e1444da951bbc4d524e31d033a75edfe937
 2020-01-10 07:51:38 +00:00
Automerger Merge Worker
d41ee5451c Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState" am: c5e7864948 am: ed119d3b0e 
Change-Id: I694cb96db9ebb8258bb2c423e6c04133b747f1c8
 2020-01-10 07:40:16 +00:00
SongFerngWang
ed119d3b0e Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState" 
am: c5e7864948

Change-Id: Ic443ccf38cf3630c6991118ff2cd3f02f6e18864
 2020-01-09 23:26:03 -08:00
Treehugger Robot
c5e7864948 Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState" 2020-01-10 07:24:57 +00:00
TreeHugger Robot
02a90deb8f Merge "Add a RTT setting in A11y screen" 2020-01-10 07:13:14 +00:00
Sarah Chin
9ea18281ee 5G meteredness for telephony framework 
Bug: 139070884
Test: atest FrameworksTelephonyTests
Change-Id: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
Merged-In: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
(cherry picked from commit 0c518d5aab)
 2020-01-10 05:53:22 +00:00
SongFerngWang
9cd3d0daeb mainline:Replace serviceState.getDataRegState with getDataRegistrationState 
Bug: 146637978
Test: - make RunSettingsRoboTests ROBOTEST_FILTER\
=PreferredNetworkModePreferenceControllerTest (PASS)
- make RunSettingsRoboTests ROBOTEST_FILTER\
=EnabledNetworkModePreferenceControllerTest (PASS)
Change-Id: I5a4a1a2b0dc5140257963651b69c0f427ef5ae93
Merged-In: I5a4a1a2b0dc5140257963651b69c0f427ef5ae93
 2020-01-10 13:05:36 +08:00
Arc Wang
a6ec144392 [Wi-Fi] Revert "support SAE password identifier in wifi dialog" 
Revert it because SPEC is not clear now.

Bug: 143379656
Test: manual
      Click "Add network" in wi-Fi picker and edit a WAP3-personal Wi-Fi network

Change-Id: Ifa859d53c29d0fa83f22cc2d0e50294d0a5c7fc9
 2020-01-10 11:53:12 +08:00
Automerger Merge Worker
87e70a6a5f Dark theme settings text am: 176d4ea28e am: 7e1e2b7d7d 
Change-Id: Iace5c492dca128c9d3677b659786af6c55088948
 2020-01-09 23:37:38 +00:00
Automerger Merge Worker
7e1e2b7d7d Dark theme settings text am: 176d4ea28e 
Change-Id: I57dc5d3dcb8cc96e4ad61259372360edebe14d9e
 2020-01-09 23:21:23 +00:00
Curtis Belmonte
5e25500beb Merge "Fix issues with SUW on fingerprint devices" 2020-01-09 22:45:12 +00:00