PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,273 Commits 1 Branch 0 Tags
1c97e70641b8ffbc641f2594d1f29dba542e569c
Commit Graph

56273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
9db5fcb2ff Import translations. DO NOT MERGE 
Change-Id: Ie3137ceba6f623d0a7aa1176166930b522dee60e
Auto-generated-cl: translation import
 2019-11-02 17:25:40 -07:00
android-build-team Robot
b6e20d0ddf Snap for 5983947 from 1876b8c6dd to qt-qpr2-release 
Change-Id: I786ee6ac06d94ccb638e8000af02f8fee4ba3dbd
 2019-11-02 23:11:01 +00:00
Kevin Chyn
ca51533d56 Merge "Revert "Remove attention controller"" into qt-qpr1-dev 
am: 1876b8c6dd

Change-Id: I5282deec73015da2920c0b429e1e23c5f97d4fbe
 2019-11-01 10:06:20 -07:00
Kevin Chyn
3ba07e6fa5 Revert "Update attention string" 
am: 44efb41d98

Change-Id: I915a682b72a47256fa1b0e9ea8611fdbca8be89b
 2019-11-01 10:06:15 -07:00
Kevin Chyn
1876b8c6dd Merge "Revert "Remove attention controller"" into qt-qpr1-dev 2019-11-01 17:01:32 +00:00
Kevin Chyn
eac6fcff2d Revert "Remove attention controller" 
Bug: 142979808

This reverts commit 8e1d1ca3ab.

Change-Id: I78b7572bcb384de2984f4d81946aceb03aec6758
 2019-10-31 20:50:35 +00:00
Kevin Chyn
44efb41d98 Revert "Update attention string" 
Bug: 142979808

This reverts commit 821fbc83a1.

Change-Id: Ibe426d3175b8b44fadaf78316201031f229d736e
 2019-10-31 20:49:43 +00:00
Xin Li
ccfed7891d DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master 
am: c73fd84126

Change-Id: I63830094ee961fda25aaed356a428d041de6d672
 2019-10-31 13:21:17 -07:00
Bill Yi
a928396136 [automerger skipped] Import translations. DO NOT MERGE 
am: f54c040bde -s ours
am skip reason: subject contains skip directive

Change-Id: I0847a6249e54b4e78f50937e2ea65f99c4305720
 2019-10-31 11:07:43 -07:00
Bill Yi
f54c040bde Import translations. DO NOT MERGE 
Change-Id: I7256e981ee4f567d1b09dce74e476375f4f58bb3
Auto-generated-cl: translation import
 2019-10-30 18:50:23 -07: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
9a07055546 Merge "Settings: Fix QrCamera crash on devices without flash" am: 68ddb3afdb 
am: 748ee1657f

Change-Id: Ic64d2c3a36939751891440639b5114a9df3fd184
 2019-10-29 23:56:00 -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
54ef0fcbc0 Merge "Settings: Respect preference's visibility in VideoPreferenceController" am: 0e40f46fe2 am: 447674e100 
am: 4cbb60c344

Change-Id: I2c4a9774c2ae463ed80810dc95a298e1302f4b5f
 2019-10-29 10:24:05 -07:00
Raff Tsai
4cbb60c344 Merge "Settings: Respect preference's visibility in VideoPreferenceController" am: 0e40f46fe2 
am: 447674e100

Change-Id: I9680dc02dc96fc324b019c027d08271fb27b4506
 2019-10-29 10:19:05 -07: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
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