Commit Graph

58280 Commits

Author SHA1 Message Date
TreeHugger Robot
4d0fa39b2d Merge "[Wi-Fi] Edit a never connected WifiEntryPreference in WifiSettings2" 2020-01-09 11:42:53 +00:00
lesl
24a505c4eb softap: Use set/getPassphrase to replace set/getWpa2Passphrase
Bug: 142752869
Test: Manual, on/off/setting change for hotspot function
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest
Change-Id: I22c89f15a6ef1c5366394431cc5aa7031a573d45
2020-01-09 19:23:41 +08:00
Arc Wang
5efa92f95f [Wi-Fi] Remove redundant code in WifiSettings2
WifiPickerTracker get WifiEntries at onStart, it's no meaning
to getWifiEntry at WifiSettings2#onActivityCreated.

Bug: 143328194
Test: manual
      Edit a Wi-Fi network by clicking context menu 'Modify',
      rotate the WiFiDialog and see if any thing wrong

Change-Id: I9746879720b72723259e1b59e8b5e8bae183b8cc
2020-01-09 18:51:58 +08:00
Bonian Chen
9ce7bad930 Merge "[Settings] Code refactor" 2020-01-09 10:37:12 +00:00
Arc Wang
50afc70f8f [Wi-Fi] Edit a never connected WifiEntryPreference in WifiSettings2
If the Wi-Fi network is never connected after it's saved,
edit it instead of connecting when users click the WifiEntryPreference.

Bug: 143328194
Test: manual
      Click a saved wrong password Wi-Fi network

Change-Id: If974ce9225fe6b6ed5f8a3c6c0ff619532acc1c2
2020-01-09 18:36:33 +08:00
Bonian Chen
f399bd1a8c [Settings] Code refactor
Bug: 147338143
Test: build pass
Change-Id: Ib4a92f659ceda3584310591f706958a06ba5ab21
2020-01-09 17:07:25 +08:00
Betty Chang
976dca2149 Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice" 2020-01-09 08:49:48 +00:00
Betty Chang
595b8f3bc7 Merge "[Mainline] Use public method in SubscriptionManager for mainline" 2020-01-09 08:49:23 +00:00
Tsung-Mao Fang
7f5986b78a Add a RTT setting in A11y screen
- Add RTT setting in Accessibility screen.
- Create a controller for RTT setting preference.
- Create an array strings.

Test: Rebuild, and visual
Change-Id: I248654c822284473b8a8265de4a3938af89cdf7a
Fix: 146540478
2020-01-09 16:43:34 +08:00
Raff Tsai
5d1bcb0408 Merge "Fix search auto-sync work data doesn't focus on work tab" 2020-01-09 07:06:13 +00:00
Betty Chang
b8104d5e70 Merge "[Mainline] To use @SystemApi to replace non-formal APIs for mainline" 2020-01-09 06:50:13 +00:00
ChenJean
2c37f45a35 Support caption second UI structure (3/n)
Removed unenable behovior when turn off Show captions.

Bug: 143502915
Test: Manual
Change-Id: Idb59172967872f4c8ba76e6cdcb83ba0a7faeadd
2020-01-09 14:45:54 +08:00
Automerger Merge Worker
dc047e5746 Merge "[Settings] Avoid from accessing createManageSubscriptionIntent(int)" am: d792d20001 am: 77cc57d9c2 am: c0b3551310
Change-Id: I340af8aee92498660f7bc65cdf5540d37a2fa148
2020-01-09 06:35:41 +00:00
Automerger Merge Worker
c0b3551310 Merge "[Settings] Avoid from accessing createManageSubscriptionIntent(int)" am: d792d20001 am: 77cc57d9c2
Change-Id: Id34a3b5da71400c651e3a05198210acae155067c
2020-01-09 06:15:54 +00:00
Bonian Chen
77cc57d9c2 Merge "[Settings] Avoid from accessing createManageSubscriptionIntent(int)"
am: d792d20001

Change-Id: I40195cc5643262d310a45c89d1751aa8f6c89f1e
2020-01-08 22:03:25 -08:00
Bonian Chen
d792d20001 Merge "[Settings] Avoid from accessing createManageSubscriptionIntent(int)" 2020-01-09 06:00:05 +00:00
Automerger Merge Worker
824095f728 [automerger skipped] Merge "Handle 5G meteredness in telephony framework" am: f7d2691e1e am: 9e040a1198 -s ours am: 58e5e9966a -s ours
am skip reason: Change-Id Ided2e445d3758ebc6c4f4df63145f61f9a56f64e with SHA-1 f123f98510 is in history

Change-Id: Ib8511b2056c8f00ff98a5b8b1336d6cc50e0a955
2020-01-09 05:52:42 +00:00
Paul Chang
5d8b2cf314 Merge "Show Settings bugreport handler only when developer option is enabled" 2020-01-09 05:35:51 +00:00
Automerger Merge Worker
58e5e9966a [automerger skipped] Merge "Handle 5G meteredness in telephony framework" am: f7d2691e1e am: 9e040a1198 -s ours
am skip reason: Change-Id Ided2e445d3758ebc6c4f4df63145f61f9a56f64e with SHA-1 f123f98510 is in history

Change-Id: I2033fbcb16219688c47bd4ff0838953c1f4b1b7a
2020-01-09 05:30:14 +00:00
Sarah Chin
9e040a1198 Merge "Handle 5G meteredness in telephony framework"
am: f7d2691e1e

Change-Id: I605c523ba16df57df339f2c68c330299caa4b3b5
2020-01-08 21:06:16 -08:00
Sarah Chin
f7d2691e1e Merge "Handle 5G meteredness in telephony framework" 2020-01-09 05:03:24 +00:00
Automerger Merge Worker
0bb6ffd417 [automerger skipped] Merge "MAP: Add developer option to control map version" am: a24f03d58e am: d8e0b57e3a am: d0401b1883 -s ours
am skip reason: Change-Id If32db03072e02b7b2477c7da943b6b0e6a9be260 with SHA-1 da1ca35dc4 is in history

Change-Id: Ia648ae1e6bfd2c78504d0a0934e975037cf49c3d
2020-01-09 04:00:31 +00:00
Automerger Merge Worker
3a07b8007b Merge "(Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList" am: 664ac2ebd7 am: f9dd9dfd52 am: d3a80330ba
Change-Id: Iece4ab122985a837795635c20a93de06b2b8adfe
2020-01-09 03:59:44 +00:00
Automerger Merge Worker
d0401b1883 Merge "MAP: Add developer option to control map version" am: a24f03d58e am: d8e0b57e3a
Change-Id: I91537221abd287ca66fbc5b1d945b8a464b3e3de
2020-01-09 03:46:22 +00:00
Automerger Merge Worker
d3a80330ba Merge "(Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList" am: 664ac2ebd7 am: f9dd9dfd52
Change-Id: Idd566f53353a083093ad4ebd15c8289244acce36
2020-01-09 03:45:18 +00:00
Bonian Chen
4873d0e894 Merge "[Settings] Code refactor" 2020-01-09 03:34:04 +00:00
Daniel Huang
1f0d504064 Merge "Modify the year of software Lic." 2020-01-09 03:25:53 +00:00
danielwbhuang
e8edc9a616 Modify the year of software Lic.
It should be 2020 not 2018.
Original code is merged in ag/10000397.

Bug: 143995814
Test: Build pass.
Change-Id: I9a1a3872825f325b785ed55653e64f388ea6bcee
2020-01-09 03:24:27 +00:00
Chienyuan
d8e0b57e3a Merge "MAP: Add developer option to control map version"
am: a24f03d58e

Change-Id: Idc6aeabc4d88adee6dc1c64eeb3648bb42e5f2fc
2020-01-08 19:11:04 -08:00
Philip P. Moltmann
f9dd9dfd52 Merge "(Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList"
am: 664ac2ebd7

Change-Id: I646975373dc24244074f761638919239276dbe61
2020-01-08 19:06:21 -08:00
Treehugger Robot
a24f03d58e Merge "MAP: Add developer option to control map version" 2020-01-09 03:00:28 +00:00
Treehugger Robot
664ac2ebd7 Merge "(Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList" 2020-01-09 02:48:14 +00:00
Automerger Merge Worker
a74cbac7af Merge "Removed reference to RadioAccessFamily" am: b13a4ef322 am: d934d5eda2 am: 46f5e64f94
Change-Id: Id01aa204e70d2eb7f9151eccfd2184d06a7aa61b
2020-01-09 02:44:05 +00:00
Automerger Merge Worker
12afd1b101 [automerger skipped] Merge "Handle 5G meteredness in telephony framework" into qt-qpr1-dev-plus-aosp am: 0904e65eb8 -s ours
am skip reason: Change-Id Ided2e445d3758ebc6c4f4df63145f61f9a56f64e with SHA-1 f123f98510 is in history

Change-Id: Ibc41af0d95bd15a2b1a7130374920197898941a6
2020-01-09 02:43:36 +00:00
Automerger Merge Worker
e0620e14b5 [automerger skipped] Handle 5G meteredness in telephony framework am: f123f98510 -s ours
am skip reason: Change-Id Ided2e445d3758ebc6c4f4df63145f61f9a56f64e with SHA-1 2136bc92fe is in history

Change-Id: I216eb67b026024b0131c9d2c4ee87f02fe549984
2020-01-09 02:42:15 +00:00
Automerger Merge Worker
46f5e64f94 Merge "Removed reference to RadioAccessFamily" am: b13a4ef322 am: d934d5eda2
Change-Id: I1b13f79040ba776e8a0c763280d4fc3f89e3f373
2020-01-09 02:26:28 +00:00
Sarah Chin
0904e65eb8 Merge "Handle 5G meteredness in telephony framework" into qt-qpr1-dev-plus-aosp 2020-01-09 02:23:13 +00:00
Lee Chou
d934d5eda2 Merge "Removed reference to RadioAccessFamily"
am: b13a4ef322

Change-Id: I982ca4865d7aed198a1e1f78c80f0340218d27a2
2020-01-08 18:11:26 -08:00
Treehugger Robot
b13a4ef322 Merge "Removed reference to RadioAccessFamily" 2020-01-09 02:09:10 +00:00
Raff Tsai
9641db557e Fix search auto-sync work data doesn't focus on work tab
Fixes: 147219474
Test: 1. tab search bar
      2. search auto-sync
      3. click auto-sync work data
      4. It should open Settings account page and focus on work tab

Change-Id: Iffad97b468db1698b8e25139f6f24956eaeec7df
2020-01-09 10:06:55 +08:00
Paul Chang
fa53c7447a Show Settings bugreport handler only when developer option is enabled
Bug: 147264243
Test: Flash device and check that the bugreport handler is not shown by sending intent when developer option is disabled
Change-Id: I11ed82394e164032c2201d19460ea94f3e4441c2
2020-01-09 10:02:27 +08:00
shafik
a54d7a8f4a Add activities to handle external storage intents
Adds 2 activities with the appropriate intent-filters to handle intents
used to control OP_MANAGE_EXTERNAL_STORAGE:
* Generic activity to handle ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION
  which control all apps (that request MANAGE_EXTERNAL_STORAGE).
* App specific activity to handle
  ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION. The intent filter
  expects the name of the package as data in the intent.

Test: manual
Bug: 146425146
Change-Id: Iebc7d153eac6ffe0b9bd75196bc8ecf9cb687939
2020-01-09 00:20:51 +00:00
Automerger Merge Worker
a09d1a73bd Merge "Fix policy for platform compat UI" am: 3208f994c1 am: e184ff6028 am: b85d1971bf
Change-Id: I1b8f54ab614ec7ad3649d24e6fff661038817557
2020-01-08 18:55:10 +00:00
Automerger Merge Worker
b85d1971bf Merge "Fix policy for platform compat UI" am: 3208f994c1 am: e184ff6028
Change-Id: If560c3b115101910ab4e7e2976463ebd30d79d1b
2020-01-08 18:54:09 +00:00
Andrei-Valentin Onea
e184ff6028 Merge "Fix policy for platform compat UI"
am: 3208f994c1

Change-Id: I88c0caf2c0904db1a1acfae7072699031d66fcdf
2020-01-08 10:47:45 -08:00
Andrei-Valentin Onea
3208f994c1 Merge "Fix policy for platform compat UI" 2020-01-08 18:42:44 +00:00
Automerger Merge Worker
fb5bf79192 [automerger skipped] Merge "[Settings] Remove IMS factoryReset()" am: bf3aaf0f37 am: dc4e189dbc am: db65d2b0b2 -s ours
am skip reason: Change-Id Id5c868726189397fc2a85717326e56e055b640af with SHA-1 45d9f23fee is in history

Change-Id: Ia4f2777f541553bd0377c658b6bab392c0d86746
2020-01-08 18:36:56 +00:00
Automerger Merge Worker
db65d2b0b2 Merge "[Settings] Remove IMS factoryReset()" am: bf3aaf0f37 am: dc4e189dbc
Change-Id: I019d3a5df41512a142a4745b4d56a53b73a05c60
2020-01-08 18:25:01 +00:00
Bonian Chen
dc4e189dbc Merge "[Settings] Remove IMS factoryReset()"
am: bf3aaf0f37

Change-Id: I56c8a7b23e97bf13e44faedd9a3aac898f3c11e9
2020-01-08 10:09:32 -08:00
Bonian Chen
bf3aaf0f37 Merge "[Settings] Remove IMS factoryReset()" 2020-01-08 17:29:10 +00:00