PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,857 Commits 1 Branch 0 Tags
418ef9973e67f5a72d4ed010ccc6c8a030a860e3
Commit Graph

54857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hunter Knepshield
418ef9973e Merge "Synced the code from master branch" 
am: 64efbe1240

Change-Id: I042c2bb85876bf67acc98113f01186e831adeae5
 2019-11-15 10:45:58 -08:00
Hunter Knepshield
64efbe1240 Merge "Synced the code from master branch" 2019-11-15 18:19:06 +00:00
Sunny Shao
f3865e9264 Synced the code from master branch 
Fixes: 144364245
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.PhoneNumberPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.simstatus.SimStatusDialogControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony.RenameMobileNetworkDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSliceTest
Change-Id: Ibb26f5a63a969b28915a226a0197bc4033c91346
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
 2019-11-14 21:57:12 +08:00
James Mattis
24546e531f Merge "Support for hotspot client visibility." 
am: 2b7c8937de

Change-Id: Ib52bd8e9fa9a2affdd02771c1f64e86297c50458
 2019-11-13 08:53:37 -08:00
James Mattis
2b7c8937de Merge "Support for hotspot client visibility." 2019-11-13 16:37:27 +00:00
Kevin Chang
95d21e0d44 Merge "Add accessibility timeout video and illustration" 
am: 1595fc8fc8

Change-Id: Ib1c19cfd318de968cb426e9fb09eb4e4d674a70b
 2019-11-12 17:06:59 -08:00
Kevin Chang
1595fc8fc8 Merge "Add accessibility timeout video and illustration" 2019-11-13 00:53:49 +00:00
James Mattis
03d65cee36 Support for hotspot client visibility. 
Adding support for visibility into clients that connect to an active hotspot.

Bug: 137309578
Test: Tested manually on a Pixel 3.
Change-Id: Ife4bb5ca7bbcf075683cb0a233f2b5716ccd51d9
Merged-In: Ife4bb5ca7bbcf075683cb0a233f2b5716ccd51d9
 2019-11-11 22:30:45 -08:00
Kevin Chang
6915e6a551 Add accessibility timeout video and illustration 
Add the new assets of accessibility timeout.

Bug: 143861394
Test: Visual
Change-Id: I0e4ba60c934191afbcaddb81e6d07d37244dce64
Merged-In: I0e4ba60c934191afbcaddb81e6d07d37244dce64
 2019-11-08 19:47:02 +08:00
Rahul Sabnis
4f85f36e7d Merge "Refactor usages of getAliasName to use getAlias in Settings" 
am: eed0f8816b

Change-Id: Icb70620c2bc7e84fb19196c26d8c576220eefe13
 2019-11-05 10:42:41 -08:00
Treehugger Robot
eed0f8816b Merge "Refactor usages of getAliasName to use getAlias in Settings" 2019-11-05 18:20:50 +00:00
Felipe Leon
6ee2108bdb Merge "Settings: fix apn_editor carrier_enabled summaryOff string" 
am: 9d29833485

Change-Id: Ie05efff7a54b001dbe7c86b03f00091c86245ab0
 2019-11-05 09:47:14 -08:00
Treehugger Robot
9d29833485 Merge "Settings: fix apn_editor carrier_enabled summaryOff string" 2019-11-05 17:15:45 +00:00
Xin Li
c73fd84126 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master 
Bug: 142003500
Change-Id: Ibae6b218a616a93cfda05dd77a5ea6f3a2dc4cea
 2019-10-30 11:49:56 -07:00
LuK1337
748ee1657f Merge "Settings: Fix QrCamera crash on devices without flash" 
am: 68ddb3afdb

Change-Id: I55006fe0d94a6a80574437c7b4a55c261013a2bf
 2019-10-29 23:49:58 -07:00
Treehugger Robot
68ddb3afdb Merge "Settings: Fix QrCamera crash on devices without flash" 2019-10-30 06:29:47 +00:00
LuK1337
b056ea70f0 Settings: Fix QrCamera crash on devices without flash 
Change-Id: Ife34b5fb87a9a4f509b665a3433e0b2ba857c885
 2019-10-30 02:45:08 +00:00
Raff Tsai
447674e100 Merge "Settings: Respect preference's visibility in VideoPreferenceController" 
am: 0e40f46fe2

Change-Id: Iecf7610d41896a5fa0ae7d6aa0ca0de75463eb7e
 2019-10-29 10:12:05 -07:00
Raff Tsai
0e40f46fe2 Merge "Settings: Respect preference's visibility in VideoPreferenceController" 2019-10-29 16:39:13 +00:00
LuK1337
9c3ab97182 Settings: Respect preference's visibility in VideoPreferenceController 
* Since AbstractPreferenceController's displayPreference()
  sets the visibility based on isAvailable() we need to
  set mVideoPreference early and make getAvailabilityStatus()
  return UNSUPPORTED_ON_DEVICE if needed.

Test: manual, open battery manager
Change-Id: Ibf72971b49fa1162fb99f9fc61cbb54ba39a2dfa
 2019-10-29 15:39:27 +01:00
Josh Hou
e8a6c02fd2 Merge changes Ibec13fbe,If89c67c0 
am: 27bf33e053

Change-Id: I661976aa6161d80aa23f47424828336cc7ca6ae6
 2019-10-28 05:31:32 -07:00
Youming Ye
2f76a7cf7f [automerger skipped] Check the missing useHomeWfMode case 
am: 001a2e774d -s ours
am skip reason: change_id If89c67c0595808a1339517c6084f1d1e23f5974b with SHA1 b7923f5a3f is in history

Change-Id: Ife1a5829ae16ce63f6cd2df85bd94196af11600e
 2019-10-28 05:31:19 -07:00
Josh Hou
27bf33e053 Merge changes Ibec13fbe,If89c67c0 
* changes:
  Fix ViLTE is not available when WiFi Calling is disabled
  Check the missing useHomeWfMode case
 2019-10-28 12:18:53 +00:00
Josh Hou
e2cdd74174 Fix ViLTE is not available when WiFi Calling is disabled 
Bug: 141831293
Test: 1. Set carrier config carrier_wfc_ims_available_bool to false,
then verify Wi-Fi calling option is not shown.
      2. Set carrier config carrier_vt_available_bool to false, then
      verify video calling option is not shown.
      3. Set both carrier_wfc_ims_available_bool and
      carrier_vt_available_bool to false, then verify calling category
      is not shown.

Change-Id: Ibec13fbeb5acf1d62342286687b2ba969beb4e14
Merged-In: Ibec13fbeb5acf1d62342286687b2ba969beb4e14
 2019-10-28 11:12:49 +00:00
Youming Ye
001a2e774d Check the missing useHomeWfMode case 
Bug: 133812904
Test: Build
Change-Id: If89c67c0595808a1339517c6084f1d1e23f5974b
Merged-In: If89c67c0595808a1339517c6084f1d1e23f5974b
 2019-10-28 10:16:24 +00:00
Jack Yu
7ddc969d3a Merge "Change Wi-Fi Calling text for SFR France" 
am: 49358c53b2

Change-Id: Iaa58ec348cd836adfb20eedc38787934bc76d0df
 2019-10-27 00:37:24 -07:00
Jack Yu
49358c53b2 Merge "Change Wi-Fi Calling text for SFR France" 2019-10-27 07:20:47 +00:00
Xin Li
b8858e1d3f [automerger skipped] Merge "Merge Coral/Flame into AOSP master" 
am: e2c2504c94 -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history

Change-Id: Ifc67e1652cb46474a16c6383cec2d81ca6e424d3
 2019-10-26 23:18:01 -07:00
Xin Li
fef5e325f5 [automerger skipped] Merge Coral/Flame into AOSP master 
am: 52bb254eea -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history

Change-Id: Ida1ac569c9fce2eebfbec2797378ac297389f53c
 2019-10-26 22:34:20 -07:00
Xin Li
e2c2504c94 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:30 +00:00
Chen Xu
04bcf7ec6c Merge "move CellBroadcastMessage from telephony-common to app" 
am: 12a7368ad2

Change-Id: Idf2a9f4fd6c184a9aebef3e2e9298fcaeeecc9da
 2019-10-25 10:44:44 -07:00
Chen Xu
12a7368ad2 Merge "move CellBroadcastMessage from telephony-common to app" 2019-10-25 17:28:22 +00:00
Xin Li
52bb254eea Merge Coral/Flame into AOSP master 
Bug: 141248619
Change-Id: I3850f512dadd5e2c6d51af3c8abab1fa5dbc86ad
Merged-In: I46ad5cff3809191483b48fe292dba220a0d699c6
 2019-10-25 10:28:05 -07:00
Aaron Huang
7b82097220 Merge "Replace getNetworkPrefixLength() with public API" 
am: f67076dad5

Change-Id: Id37dd5521b1f95f7431d63e18dea3f8cc2b80eee
 2019-10-24 22:36:15 -07:00
Aaron Huang
f67076dad5 Merge "Replace getNetworkPrefixLength() with public API" 2019-10-25 05:15:16 +00:00
Raff Tsai
81e9c58691 Merge "Skip loading contextual cards if legacy cards are used" 
am: c53771e80a

Change-Id: Idae5d4948edc9767afae23f2fcbbd522410654b5
 2019-10-24 18:51:50 -07:00
Raff Tsai
c53771e80a Merge "Skip loading contextual cards if legacy cards are used" 2019-10-25 01:35:20 +00:00
Aaron Huang
9251280615 Replace getNetworkPrefixLength() with public API 
Use public API getPrefixLength() instead

Test: build pass

Change-Id: Ib85aa12dc22ac5b03c9bb7101beaf340014eb4fd
 2019-10-24 10:51:53 +00:00
Lucas Lin
5eda5a3e7f Merge "Improve the wifi description for the case of private DNS broken" 
am: 37b17ae752

Change-Id: I46ad5cff3809191483b48fe292dba220a0d699c6
 2019-10-23 02:52:01 -07:00
Lucas Lin
37b17ae752 Merge "Improve the wifi description for the case of private DNS broken" 2019-10-23 09:20:09 +00:00
Rahul Sabnis
c96469f2bd Refactor usages of getAliasName to use getAlias in Settings 
Bug: 142352567
Test: Manual
Change-Id: I40af1b1e0453900fd888317ae46b20ef359db473
 2019-10-22 15:34:40 -07:00
Niclas Rokicki
90f0230b54 Merge "translate="false" -> translatable="false"" 
am: b333e79df9

Change-Id: I3955c9f03c741efa86fcf03baafea81d7073d5ef
 2019-10-22 09:41:58 -07:00
Treehugger Robot
b333e79df9 Merge "translate="false" -> translatable="false"" 2019-10-22 16:29:50 +00:00
Niclas Rokicki
af548beaea translate="false" -> translatable="false" 
Fixed a typo related to String translation

Bug: 142888682
Test: Manual
Change-Id: I86fd2d9a4c5b085679ed627c7ecb7578da168ced
 2019-10-22 16:30:02 +08:00
Daniel Hunt
dfd5e4fed5 Skip loading contextual cards if legacy cards are used 
This stops a jarring animation that occurs when returning to the
settings top level when legacy contextual cards are enabled and
shown at the top of the top level list,

Bug: 142936956
Test: Manual
Change-Id: I43605adf6f1bf63cc40157ac97c8e3295dd3cd99
 2019-10-20 15:46:39 +00:00
Chen Xu
24a72eb92a move CellBroadcastMessage from telephony-common to app 
1. add slotIndex in SmsCbMesage(cellbroadcast can be received
when sim is absent)
2. move cellbroadcastMessage from telephony-common to app
next step, considering merging CellBroadcast to SmsCbMessage

Bug: 135956699
Bug: 141962867
Test: build & unit test
Change-Id: Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa
(cherry picked from commit 86a8e9b627)
Merged-in: Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa
 2019-10-20 04:05:06 +00:00
Anamika Singh
251411674b Merge "Move Emergency call button" 
am: 2501f6e268

Change-Id: Ie687f4b03f7ebf572057dca6678ac4d70666f76f
 2019-10-18 01:49:54 -07:00
Treehugger Robot
2501f6e268 Merge "Move Emergency call button" 2019-10-18 08:37:39 +00:00
Raff Tsai
2bb6e54317 Merge "Make sure close button has proper color" 
am: 0f9ad6d7f9

Change-Id: I3f785f159c9b0e46a293acb8656eb47c9b6e4550
 2019-10-15 03:32:29 -07:00
Raff Tsai
0f9ad6d7f9 Merge "Make sure close button has proper color" 2019-10-15 10:11:56 +00:00