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

56065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
f639851869 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Iae5c7783da1e785d2eb209fa870a564f505e6e9e
 2020-04-01 19:35:23 -07:00
Xinli Zhang
4497c4d3bf Usb preference title changed when rotating 
Rotate usb preference screen from horizontal to landscape
or vice versa. USB preference screen title changes.

Bug: 152895735
Test: manual
Change-Id: Ib8493662ab68146f0b5470936a8ba97a058c2a6d
 2020-04-01 10:05:48 +02:00
Sooraj Sasindran
309505a7d2 Revert "access system resources with android.R package" 
Revert "access system resources with android.R package"

Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Test: make
Reverted Changes:
I1e698d404:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Idc1095563:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Merged-In: Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4
Change-Id: Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4
 2020-03-31 18:18:22 -07:00
Sarah Chin
ba99375f1b Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 
Change-Id: I65d13bbddb91cec3b67580ae1d8f9f9889893de3
 2020-03-31 23:27:10 +00:00
Sarah Chin
c03048cd27 Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a 
Change-Id: Ibd354d26acab6e5f8195d4f93b302ec9c362d9be
 2020-03-31 23:15:07 +00:00
Sarah Chin
b6fd42a06a Merge "Rename calls to isGlobalModeEnabled" 2020-03-31 23:02:20 +00:00
Brad Ebinger
6e791da6cd Merge changes I06df2928,I70821964 am: 24ddbf5e8c am: 8bc35321d8 
Change-Id: I135326905313c1863e8e7945d8af19b4f4964e26
 2020-03-31 20:20:51 +00:00
Brad Ebinger
84fc8390be Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a am: da1335a9f4 
Change-Id: I847569cc59b21278575f0b43b2117f83cee569a1
 2020-03-31 20:20:49 +00:00
Brad Ebinger
8bc35321d8 Merge changes I06df2928,I70821964 am: 24ddbf5e8c 
Change-Id: I3aeb0e140fcb3a6c28e1880a6784e7800c368f47
 2020-03-31 20:10:07 +00:00
Brad Ebinger
da1335a9f4 Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a 
Change-Id: If7f5ed1343a5b13810455bcf7168b8b095db149c
 2020-03-31 20:10:05 +00:00
Brad Ebinger
24ddbf5e8c Merge changes I06df2928,I70821964 
* changes:
  Fixes ContactDiscoveryDialogFragmentTest
  Add new DialogFragment and Controller for capability discovery opt-in
 2020-03-31 19:39:59 +00:00
Remi NGUYEN VAN
0a661e7799 Merge "Adjust code for API council feedback" am: aab7aca759 am: 85f97bf02a 
Change-Id: I0af0e88b69ff3760469181b0134e9281f4069b03
 2020-03-30 03:15:13 +00:00
Remi NGUYEN VAN
85f97bf02a Merge "Adjust code for API council feedback" am: aab7aca759 
Change-Id: Idd49347f191f75bbe05b45fcfa47856d87c983bb
 2020-03-30 03:06:07 +00:00
Remi NGUYEN VAN
aab7aca759 Merge "Adjust code for API council feedback" 2020-03-30 02:58:45 +00:00
Tobias Thierer
7540cdf81f Merge "OWNERS: Remove tobiast." am: dffcd7a949 am: 21b01bc4f2 
Change-Id: I2d43fde1e8a07381a163589b04327f54b37e499f
 2020-03-27 11:51:27 +00:00
Tobias Thierer
21b01bc4f2 Merge "OWNERS: Remove tobiast." am: dffcd7a949 
Change-Id: Iad09bc83fa7f258f83ee505a4cd9edf9004f542d
 2020-03-27 11:30:14 +00:00
Tobias Thierer
dffcd7a949 Merge "OWNERS: Remove tobiast." 2020-03-27 11:04:12 +00:00
Yuuki Habu
8e177ae1c7 Add Ethernet Tethering settings 
Add Ethernet Tethering settings
 - Show prefernce if config_ethernet_iface_regex is set
 - Activate if tethered ethernet interface is exist

Bug: 148824036
Test: manual test
 - update prefernce plug-in, plug-out
Change-Id: Ia4f365ddc1a53a926d716046db3e6ac463c978b9
Merged-In: Ia4f365ddc1a53a926d716046db3e6ac463c978b9
 2020-03-27 17:45:27 +09:00
Chalard Jean
48adfc076e Adjust code for API council feedback 
Bug: 151322799
Test: SettingsUnitTests

Merged-In: I5ff389f3f707e5538979830c2252455bea5bbb88
Change-Id: I5ff389f3f707e5538979830c2252455bea5bbb88
 2020-03-27 04:28:28 +00:00
Stanley Wang
05a95032a5 Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 
Change-Id: I95009001d7d007d8a509e6a6f6f9f213b48623a9
 2020-03-27 03:20:48 +00:00
Stanley Wang
0b76ef19b5 Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev 2020-03-27 03:09:09 +00:00
Tobias Thierer
a854ddae3d OWNERS: Remove tobiast. 
Test: Manual CL review only.
Bug: 152399425
Change-Id: Ifca2d6e8ecd59a924c6e5d8ca60749be5d5c8728
 2020-03-26 12:17:00 +00:00
Treehugger Robot
4524c5ba3b Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e81385 am: 533c10f747 
Change-Id: Ic4502bfeafe849c5eed5b09c9a156bf47331c7d2
 2020-03-26 10:41:01 +00:00
Treehugger Robot
533c10f747 Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" am: 1ed4e81385 
Change-Id: I3ab6b4458babf1bfd43c89fb74ae451cf05f9022
 2020-03-26 10:25:32 +00:00
Treehugger Robot
1ed4e81385 Merge "Verify BluetoothDevice is not null before calling BluetoothHearingAid System APIs" 2020-03-26 10:07:30 +00:00
Rahul Sabnis
86cfb387ef Verify BluetoothDevice is not null before calling BluetoothHearingAid 
System APIs

Bug: 149238489
Test: Manual
Merged-In: Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b
Change-Id: Ic6de2ccd81dc66ce79afcd91f18e92e959c8b12b
 2020-03-25 13:57:29 -07:00
Brad Ebinger
cacc9dd04b Fixes ContactDiscoveryDialogFragmentTest 
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Fixes: 150908269
Fixes: 151172952
Merged-In: I06df2928116b33fec39aade733401d60e6cde1c1
Change-Id: I06df2928116b33fec39aade733401d60e6cde1c1
 2020-03-25 16:23:45 +00:00
Brad Ebinger
f469cac10a Add new DialogFragment and Controller for capability discovery opt-in 
Adds a new controller to monitor the capability discovery opt-in
setting as well as a new DialogFragment, which displays a dialog
providing the user with more information before they enable the
setting.

Bug: 111305845
Test: manual
Merged-In: I70821964bc618c3c389c9039cd7f5028e34c7ebb
Change-Id: I70821964bc618c3c389c9039cd7f5028e34c7ebb
 2020-03-25 16:19:54 +00:00
Jack Yu
9703dd3db0 Merge "Added slot index in area info broadcast" am: 07f1ec2cca am: d1cd033f6f 
Change-Id: I1cd4186f01f29a1c0800812dd90bbb3f34895fe9
 2020-03-25 05:00:26 +00:00
Jack Yu
d1cd033f6f Merge "Added slot index in area info broadcast" am: 07f1ec2cca 
Change-Id: Iaab7b201cd25d3854031d65ce828829108b427c4
 2020-03-25 04:42:15 +00:00
Jack Yu
07f1ec2cca Merge "Added slot index in area info broadcast" 2020-03-25 04:30:21 +00:00
Raff Tsai
9d59802141 Merge "Modify close app function." am: ce1f51128b am: 579878afcf 
Change-Id: I20818d1033455533f14e6c9b5c2ebfb1d8f4526a
 2020-03-23 11:09:29 +00:00
Raff Tsai
579878afcf Merge "Modify close app function." am: ce1f51128b 
Change-Id: I80e83ae16c2a2f931604e864fb79ee1d02db6a0e
 2020-03-23 10:53:44 +00:00
Raff Tsai
ce1f51128b Merge "Modify close app function." 2020-03-23 10:32:29 +00:00
youtengliang
aa4f582931 Modify close app function. 
Test: atest com.android.settings.tests.perf
Change-Id: Ia504dd1185de1d33a21fec344871d4b0fabae953
 2020-03-23 09:29:28 +00:00
Treehugger Robot
fc3f804761 Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 
Change-Id: I86055f0ac9597ec43111575f5fea6b62819b0674
 2020-03-23 06:19:00 +00:00
Treehugger Robot
cbe5bbdcd5 Merge "Fixed NullPointerException" am: 5fb16be925 
Change-Id: Ie99fc2139875e0f8dfbfbe0bd31f55f135607996
 2020-03-23 06:00:05 +00:00
Treehugger Robot
5fb16be925 Merge "Fixed NullPointerException" 2020-03-23 05:45:38 +00:00
Jack Yu
922e1d23d8 Added slot index in area info broadcast 
Added slot index information in the broadcast
so the receiver knows which slot to get information.

Test: Manual
Merged-In: Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7
Change-Id: Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7
Fix: 150126754
(cherry picked from commit 5a4dabcba2)
 2020-03-20 13:18:09 -07:00
TreeHugger Robot
d3a98734eb Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: c6e000ff18 
Change-Id: I23fd001ff90912c69eb455b412b315e4fba6801d
 2020-03-20 18:33:01 +00:00
Xin Li
3ac005ce4d DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 0cad441364 
Change-Id: I18ab89e549a024582bd2ac4b53c18f98a16e9d73
 2020-03-20 18:32:28 +00:00
TreeHugger Robot
c6e000ff18 Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master 2020-03-20 18:15:00 +00:00
Sanghee Kim
24565c1b83 Fixed NullPointerException 
1. only one sim insertion.
2. sim removal in sim card lock setting menu.

Additionally, removed unnecessary code.

Test: manual

Change-Id: I5710b9c313d6e0b7c011a12e0179a4d5a4f7e580
Signed-off-by: Sanghee Kim <haya93@samsung.com>
 2020-03-20 14:39:44 +09:00
TreeHugger Robot
e9098ad882 Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d 
Change-Id: I9d93999096561ae6f3241738262110325c5f64fb
 2020-03-20 03:19:38 +00:00
TreeHugger Robot
3c137d807d Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev 2020-03-20 02:51:54 +00:00
Sarah Chin
adcd1f18ef [automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev am: bd8bbca27c -s ours 
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee is in history

Change-Id: I77bf2fae9b80f05d58414ac9bc5cd0a9282ea9f8
 2020-03-19 19:24:55 +00:00
Sarah Chin
bd8bbca27c Merge "5G meteredness for telephony framework" into qt-qpr1-dev 2020-03-19 19:11:00 +00:00
Anna Trostanetski
cf2d2ef9f0 Merge "Show only listUIChanges instead of all" am: c305df9450 am: 983158e9ab 
Change-Id: I11a7375ff99db50f3b2be01e9cc40bc9697b78e0
 2020-03-19 17:51:55 +00:00
Anna Trostanetski
983158e9ab Merge "Show only listUIChanges instead of all" am: c305df9450 
Change-Id: Ic3c11a30e28d91aebd5b15d6b601f12294a13a8b
 2020-03-19 17:51:32 +00:00
Anna Trostanetski
c305df9450 Merge "Show only listUIChanges instead of all" 2020-03-19 17:34:45 +00:00