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

56982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arc Wang
f30d10abf3 Merge "[Wi-Fi] Support passport R1 expiration handling" 2019-10-29 05:50:34 +00:00
hughchen
e45897b462 Fix BTHS is still in pairing list after BTHS is connected 
This CL uses onProfileConnectionStateChanged() to handle
the case that bonded device is connected in pairing list.

1. Finish BluetoothPairingDetail page if the bonded device is connected
and selected.
2. Remove the devices in BluetoothPairingDetail page if the device is
connected.

Bug: 142519901
Test: make -j42 RunSettingsRoboTests
Change-Id: I51a9f2ebc0b491edb8ea026ff62ec20ae91eee1d
 2019-10-29 02:35:04 +00:00
TreeHugger Robot
29e21c096a Merge "Fix UI janky in privacy settings" 2019-10-28 12:55:26 +00:00
Josh Hou
2f151c61c7 [automerger skipped] Merge changes Ibec13fbe,If89c67c0 am: 27bf33e053 am: e8a6c02fd2 am: 03c9ec1223 
am: 0fe6fc26ad -s ours
am skip reason: change_id Ibec13fbeb5acf1d62342286687b2ba969beb4e14 with SHA1 c101faeb2b is in history

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

Change-Id: If5d622d30295caae274aaae0ccf407930849afeb
 2019-10-28 05:50:05 -07: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
Tsung-Mao Fang
ab914adc00 Remove permission bar chart in Privacy setting 
- Because permission hub is already postponed,
we don't need to show this UI in privacy settings.

Test: Rebuild, visual, robotest
Change-Id: I51aca52bc605a3c6b0cafc084e8e491c280d770f
Fix: 143447873
 2019-10-28 19:00:44 +08:00
Tsung-Mao Fang
327dba2488 Fix UI janky in privacy settings 
Set a summary holder for initial preference at the biginning.
If there is no any permission granted, then set a string for it.

Test: Rebuild, visual
Fixes: 140783222
Change-Id: Ic5f2730123110bad5fbc08fcd22b1df564b8637d
 2019-10-28 18:39:11 +08: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
Arc Wang
cdc098553f Merge "[Wi-Fi] Fix Wi-Fi QR code camera bug" 2019-10-28 08:47:11 +00:00
Arc Wang
cdfd1ff192 [Wi-Fi] Fix Wi-Fi QR code camera bug 
Should not setPreviewSize from the value of getBestPictureSize.

Bug: 142630420
Test: QrCameraTest
      manual:
      visually make sure QR code scanner image not distorted.

Change-Id: I280beddac95ed65118af802c396d15da306e029b
 2019-10-28 12:03:38 +08:00
Bill Yi
ac9fd3d474 [automerger skipped] Import translations. DO NOT MERGE am: ff9bcdbcd3 -s ours 
am: 07145c6239 -s ours
am skip reason: subject contains skip directive

Change-Id: I4383f0dc65b26c48d7fc181caf574587abc5264d
 2019-10-27 13:28:03 -07: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
a2a4929529 Merge "Change Wi-Fi Calling text for SFR France" am: 49358c53b2 am: 7ddc969d3a am: eebac038d7 
am: 90f075b074

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

Change-Id: I001aa859ea13e908a525df4b5a4b244ba564ad11
 2019-10-27 00:02:10 -07: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
bfcfc969f4 [automerger skipped] Merge Coral/Flame into AOSP master am: 52bb254eea -s ours am: fef5e325f5 -s ours am: 5f29ade8a8 -s ours 
am: 70aff23c40 -s ours
am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history

Change-Id: I7f8d5e2ba644d96e81db7dd22fe1714a22b0d9f7
 2019-10-26 23:38:17 -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
f5c9422d18 [automerger skipped] Merge "move CellBroadcastMessage from telephony-common to app" am: 12a7368ad2 am: 04bcf7ec6c am: 67f5eb6746 
am: b5443d9d45 -s ours
am skip reason: change_id Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa with SHA1 86a8e9b627 is in history

Change-Id: I1a424edad11cbbeb87f6f4da9d50cefea4960bce
 2019-10-25 11:34:47 -07: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
James Mattis
9adf65c943 Merge "Support for hotspot client visibility." 2019-10-25 15:42:39 +00:00
TreeHugger Robot
5f1a837af5 Merge "Add work/personal profile tab for storage page" 2019-10-25 11:02:01 +00:00
Alex Johnston
8ec3dbe1ea Merge "Added a warning dialog when installing a CA certificate" 2019-10-25 09:34:41 +00:00
Raff Tsai
539ab8ace4 Add work/personal profile tab for storage page 
- Add ProfileSelectStorageFragment
- Check featureFlag in SecondaryUserController to decide show/hide
workprofile item StorageDashboardFragment

Bug: 141601408
Test: manual
Change-Id: I97762d3b1a4985e2b186b34fc37c7976c2f69224
 2019-10-25 16:57:24 +08:00
Aaron Huang
9fd9700a8a Merge "Replace getNetworkPrefixLength() with public API" am: f67076dad5 am: 7b82097220 am: 5b182f20cb 
am: 9c39357454

Change-Id: Id0f3c816bb95d891cfb9f0109c0afedb7494f222
 2019-10-24 22:55:54 -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
TreeHugger Robot
cb62e99093 Merge "Modify Running Services layout" 2019-10-25 05:43:44 +00: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
Josh Hou
ad4895f9db Merge "Fix ViLTE is not available when WiFi Calling is disabled" 2019-10-25 05:40:08 +00:00