PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,804 Commits 1 Branch 0 Tags
6819a64e4537fb6b6d73cff6b51a2c33a5673cdf
Commit Graph

55804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
0fe6fc26ad Merge changes Ibec13fbe,If89c67c0 am: 27bf33e053 am: e8a6c02fd2 
am: 03c9ec1223

Change-Id: I8dc1754d631ac16a99e1c92776a2756ca5b8269e
 2019-10-28 05:43:11 -07:00
Youming Ye
38489bf97c [automerger skipped] Check the missing useHomeWfMode case am: 001a2e774d -s ours am: 2f76a7cf7f -s ours 
am: 1cbc4be25a -s ours
am skip reason: change_id If89c67c0595808a1339517c6084f1d1e23f5974b with SHA1 b7923f5a3f is in history

Change-Id: I28a0d69e47521305e3d60ed01f067cc1d9110bdb
 2019-10-28 05:43:03 -07:00
Josh Hou
03c9ec1223 Merge changes Ibec13fbe,If89c67c0 am: 27bf33e053 
am: e8a6c02fd2

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

Change-Id: I228b640c309f775cb0b136fccc204b95f8ee4140
 2019-10-28 05:37:39 -07: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
android-build-team Robot
20311ed171 Snap for 5969848 from ff9bcdbcd3 to qt-qpr2-release 
Change-Id: I36da9e8fdf6f258b13e7a43836f8e9053334a638
 2019-10-27 23:18:17 +00:00
Bill Yi
07145c6239 [automerger skipped] Import translations. DO NOT MERGE 
am: ff9bcdbcd3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie1857bf7a0dbdc7dc1ae391998b56ee6d145506a
 2019-10-27 13:21:32 -07:00
Bill Yi
ff9bcdbcd3 Import translations. DO NOT MERGE 
Change-Id: I519674aef33bc822977cf0e00edf02aff7b8245f
Auto-generated-cl: translation import
 2019-10-27 08:01:49 -07:00
Jack Yu
90f075b074 Merge "Change Wi-Fi Calling text for SFR France" am: 49358c53b2 am: 7ddc969d3a 
am: eebac038d7

Change-Id: I05af78b747dee65d62fb2fdfb67c4677aea0abf2
 2019-10-27 00:51:14 -07:00
Jack Yu
eebac038d7 Merge "Change Wi-Fi Calling text for SFR France" am: 49358c53b2 
am: 7ddc969d3a

Change-Id: I4e8175f75c8f03a065a3c85dad516c9f15e14e7e
 2019-10-27 00:44:24 -07: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
8f76ec4bde [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: e2c2504c94 -s ours am: b8858e1d3f -s ours 
am: 980b9a285d -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history

Change-Id: Ibc1e435c217a9425de09d873070e55bf95f2a2b5
 2019-10-26 23:43:38 -07:00
Xin Li
980b9a285d [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: e2c2504c94 -s ours 
am: b8858e1d3f -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history

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

Change-Id: Idf45bab3f828ff071f782741bb5773848d9194da
 2019-10-26 23:18:24 -07: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
5f29ade8a8 [automerger skipped] Merge Coral/Flame into AOSP master am: 52bb254eea -s ours 
am: fef5e325f5 -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history

Change-Id: I2ac9b7a9cca2ef288a0918e9f1361b0309faee72
 2019-10-26 22:53:14 -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
b5443d9d45 Merge "move CellBroadcastMessage from telephony-common to app" am: 12a7368ad2 am: 04bcf7ec6c 
am: 67f5eb6746

Change-Id: I0c18d41d6a3052585403e24090feb84c8f1a967f
 2019-10-25 11:22:08 -07:00
Chen Xu
67f5eb6746 Merge "move CellBroadcastMessage from telephony-common to app" am: 12a7368ad2 
am: 04bcf7ec6c

Change-Id: I4cb440a59d5f6de5815b8ee942b3f29d2a770d4b
 2019-10-25 11:09:18 -07: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
9c39357454 Merge "Replace getNetworkPrefixLength() with public API" am: f67076dad5 am: 7b82097220 
am: 5b182f20cb

Change-Id: Ib6f188586b486fa5af0a8df57a65db654f66e311
 2019-10-24 22:49:20 -07:00
Aaron Huang
5b182f20cb Merge "Replace getNetworkPrefixLength() with public API" am: f67076dad5 
am: 7b82097220

Change-Id: I0e948700ba76f81db98628f35313dd11ff45df98
 2019-10-24 22:42:42 -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
6f99052cbc Merge "Skip loading contextual cards if legacy cards are used" am: c53771e80a am: 81e9c58691 
am: 9dbbf88d14

Change-Id: I52f7724fc50af20888d31821dc56732186a07c84
 2019-10-24 19:08:08 -07:00
Raff Tsai
9dbbf88d14 Merge "Skip loading contextual cards if legacy cards are used" am: c53771e80a 
am: 81e9c58691

Change-Id: I09b7f37f094c24144b0448f2e7f820cffd5ddadd
 2019-10-24 18:58:01 -07: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
06b7986eff Merge "Improve the wifi description for the case of private DNS broken" am: 37b17ae752 am: 5eda5a3e7f 
am: 9b29332cd3

Change-Id: I3cd916c67afaebfd62863301eca5f6aeb8b0d1c5
 2019-10-23 03:20:15 -07:00
Lucas Lin
9b29332cd3 Merge "Improve the wifi description for the case of private DNS broken" am: 37b17ae752 
am: 5eda5a3e7f

Change-Id: Idd568b71dab954a6b018594e15d3f695ea2aeac2
 2019-10-23 03:07:20 -07: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
fb084bcee8 Merge "translate="false" -> translatable="false"" am: b333e79df9 am: 90f0230b54 
am: f72fb5a049

Change-Id: I75dcf19b087d98eb328a33138daecd7bd25b5d1a
 2019-10-22 09:56:02 -07:00
Niclas Rokicki
f72fb5a049 Merge "translate="false" -> translatable="false"" am: b333e79df9 
am: 90f0230b54

Change-Id: Iad740a41439b112ffaff528ac74fccee7eb64150
 2019-10-22 09:48:57 -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
android-build-team Robot
fa679092b9 Snap for 5956190 from 476d82715a to qt-qpr2-release 
Change-Id: If43a85fb23469efb75a9fedc22a6a4c2a6032e9e
 2019-10-21 22:42:46 +00: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