PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,842 Commits 1 Branch 0 Tags
2db8d1d88f20f19267df95e92d77b5c97c0f8d23
Commit Graph

58842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
2db8d1d88f Merge "Tweak summary for permission manager" 2020-02-10 12:13:32 +00:00
TreeHugger Robot
1ffd0fb163 Merge "Fix the overlap problem in the Schedule Rule page" 2020-02-10 11:34:26 +00:00
Tsung-Mao Fang
70238907dc Tweak summary for permission manager 
Summary appends "and more" while the items of permission are larger
than 3.

Change-Id: Ic3c16404237fb0cb81f0ed5d2cbdff32cf23c452
Fix: 136258315
Test: Robo test and visual
 2020-02-10 19:15:59 +08:00
Sunny Shao
10400a5654 Fix the overlap problem in the Schedule Rule page 
Fixes: 149071676
Test: manual test
Change-Id: I5a090ddf12ad5c4c2f248b487bd55af64dbc2ae4
 2020-02-10 18:24:34 +08:00
Narayan Kamath
50487c4595 Merge "Reland: Rework platform version to hide codenames." 2020-02-10 10:01:25 +00:00
TreeHugger Robot
d6f9b89061 Merge "tether setting: Remove dual mode check for band convert" 2020-02-10 09:06:57 +00:00
TreeHugger Robot
0b6f6b7eaf Merge "Revert "Revert "Use system-api lib to get badged, shadowed icons(2/n)""" 2020-02-10 08:07:50 +00:00
TreeHugger Robot
8c8e77a405 Merge "Revert "[Wi-Fi] Improve contrast of edit text hint"" 2020-02-10 07:48:21 +00:00
TreeHugger Robot
21acb2cd6f Merge changes I24a85a37,I8ad97414 
* changes:
  [Wi-Fi][Tethering] Update summary string of "Turn off hotspot automatically"
  [Wi-Fi] Update android R strings
 2020-02-10 07:07:34 +00:00
Tsung-Mao Fang
b4fc67ea24 Revert "Revert "Use system-api lib to get badged, shadowed icons(2/n)"" 
This reverts commit 94b8055f1c.

Reason for revert: Revert this cl and fix broken test cases.

Change-Id: I61a190b4beba8db2fe2faab45e5dd6921dc681ec
Fix: 149112222
Fix: 149090275
Test: Run all Setting robo tests
 2020-02-10 15:01:43 +08:00
TreeHugger Robot
b84501095e Merge "[Passpoint] Fix broken test: com.android.settings.wifi.WifiSettingsTest" 2020-02-10 06:37:15 +00:00
TreeHugger Robot
7233ed3406 Merge "Fix bluetooth settings force close" 2020-02-10 04:47:15 +00:00
Hai Shalom
ae7d2cf99c [Passpoint] Fix broken test: com.android.settings.wifi.WifiSettingsTest 
Fix broken test: com.android.settings.wifi.WifiSettingsTest.
PasspointConfiguration objects require both HomeSp and Credential
objects initialized, and since today it is enforced in the Wi-Fi API.
Updated the test mocks to initialize the Credential object which was
missing.

Bug: 149175146
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.WifiSettingsTest
Change-Id: I709a6bc104141ac88b2c88bdac4f3a9a3d296ec9
 2020-02-10 04:14:12 +00:00
Arc Wang
60cd31cd01 Revert "[Wi-Fi] Improve contrast of edit text hint" 
This reverts commit a74473d2f8.

Reason for revert: b/149002563

Change-Id: Iab87c51b86577e4cd270af0d13831b9902c8d3ca
 2020-02-10 03:01:47 +00:00
Arc Wang
6ca3211ea7 [Wi-Fi][Tethering] Update summary string of "Turn off hotspot automatically" 
For android R.

Bug: 148280712
Test: manual visual
Change-Id: I24a85a37f64fb6cb2dd87020b813fa21eb0cbbbd
 2020-02-10 10:55:17 +08:00
hughchen
1b3f570a67 Fix bluetooth settings force close 
This CL include following change:

- Add null check of cacedBluetoothDevice, cachedBluetooth could be null
  if the input BluetoothDevice can't found in
  CachedBluetoothDeviceManager.
- Move addPreference() and removePreference() to update() method,
  because update() will be called to update UI when recevice Bluetooth
  device change event.
- Add test case to test CachedBluetoothDevice null check.

Bug: 149068434
Test: make -j42 RunSettingsRoboTests
Change-Id: I90016bf1175925821b0d9b634c62cf796289a734
 2020-02-10 10:45:51 +08:00
hughchen
1ab6dd7a71 Show volume bar if MediaDevice is active device 
This CL before, the volume bar will shown on the top device.
In this CL, the volume bar will shown on the active device.

Bug: 148765806
Test: manually
Change-Id: Id261201a4227151667c67ab91864cc349941372e
 2020-02-10 02:40:06 +00:00
Arc Wang
5b42e7e5b2 [Wi-Fi] Update android R strings 
For these features:
1. No user certificate for WPA-Enterprise 192-bit
2. Apps to add saved networks
3. Disconnect network

Bug: 149070448
Bug: 149069854
Bug: 148281247
Test: manual visual
Change-Id: I8ad9741446c93bd75142c612c6ca67a57f2cf9e2
 2020-02-10 10:32:07 +08:00
TreeHugger Robot
978b19ec63 Merge "Implement remote media preference in Sound Setting" 2020-02-10 01:48:37 +00:00
Automerger Merge Worker
59235bd883 [automerger skipped] Import translations. DO NOT MERGE am: d41b716f6c -s ours am: 2759bebf32 -s ours 
am skip reason: subject contains skip directive

Change-Id: I81628d366cc12ced7cbdcf6dce4c70084a211c71
 2020-02-09 03:38:07 +00:00
Automerger Merge Worker
2759bebf32 [automerger skipped] Import translations. DO NOT MERGE am: d41b716f6c -s ours 
am skip reason: subject contains skip directive

Change-Id: I1c94527f6a741b5e036635c0b89c9e86148c0b1d
 2020-02-09 03:24:35 +00:00
Julia Reynolds
21fb342499 Merge "Separate conversations from channels" 2020-02-08 11:48:18 +00:00
Bill Yi
d41b716f6c Import translations. DO NOT MERGE 
Change-Id: I802d73dcc63414bed8b9b5bba8ff87ad38c22ebc
Auto-generated-cl: translation import
 2020-02-08 01:07:28 -08:00
TreeHugger Robot
6f844295f2 Merge "Update styles suggestion title to be generic" 2020-02-08 08:57:27 +00:00
PETER LIANG
dbd7eaa17d Merge "Update the rich content UI to meet the UX design version 2." 2020-02-08 08:17:28 +00:00
Peter_Liang
68d701db97 Update the rich content UI to meet the UX design version 2. 
1. Using the footerPreference component for the interface
android:desription.
2. Remove the redundant and unused codes.
3. Remove the ripple effect for AnimatedImagePreference.

Bug: 142532186
Test: manual test
Change-Id: I547ed7611b40d8b7bee4c4350b00bd4987768950
 2020-02-08 13:49:06 +08:00
Automerger Merge Worker
ff63b8303c [automerger skipped] Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" am: 5503c8ea9e am: 4a121f066c am: 36bc7f92b1 -s ours 
am skip reason: Change-Id I4bf1341f972639829cd9fc64370018127460a65f with SHA-1 698e2ed95e is in history

Change-Id: Ibef0c7346a78a7723c36db60259976189c0ba52a
 2020-02-08 05:28:40 +00:00
Automerger Merge Worker
36bc7f92b1 Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" am: 5503c8ea9e am: 4a121f066c 
Change-Id: Ie77bbc3fe379e11bb87b5af9ff8fdf424f503008
 2020-02-08 05:07:12 +00:00
Automerger Merge Worker
4a121f066c Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" am: 5503c8ea9e 
Change-Id: I90ba1b6e6f530b069d504a045d7832a8cf9e5833
 2020-02-08 04:46:59 +00:00
Zoey Chen
5503c8ea9e Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" 2020-02-08 04:25:32 +00:00
Automerger Merge Worker
64a941f8ad [automerger skipped] Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: af463b86c9 am: cd27b5b901 am: c8e044de48 -s ours 
am skip reason: subject contains skip directive

Change-Id: I1cbf9dd3dd4dcb554749edfe43549632d18575cd
 2020-02-08 02:23:21 +00:00
Automerger Merge Worker
4d7adc1152 [automerger skipped] DO NOT MERGE - Merge QQ1A.200205.002 into master am: 8c472e240f am: abf86230e4 am: b946cbd92c -s ours 
am skip reason: subject contains skip directive

Change-Id: I948c7169c1049688fb291d75854260e6d47781ab
 2020-02-08 02:22:10 +00:00
Automerger Merge Worker
c8e044de48 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: af463b86c9 am: cd27b5b901 
Change-Id: I07988bb74d92486adfddb88142c0b3f92d2110ba
 2020-02-08 01:57:10 +00:00
Automerger Merge Worker
b946cbd92c DO NOT MERGE - Merge QQ1A.200205.002 into master am: 8c472e240f am: abf86230e4 
Change-Id: Id79f92e9ea099ca850428be4748f24cd28ea30e0
 2020-02-08 01:55:27 +00:00
Automerger Merge Worker
cd27b5b901 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: af463b86c9 
Change-Id: I58a086074b45bedb194752973412dc4c1e6cd1ab
 2020-02-08 01:48:45 +00:00
Automerger Merge Worker
abf86230e4 DO NOT MERGE - Merge QQ1A.200205.002 into master am: 8c472e240f 
Change-Id: I6aca2687101666e27b3a20d0dc54bad50739cfb1
 2020-02-08 01:38:43 +00:00
Treehugger Robot
af463b86c9 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" 2020-02-08 01:29:23 +00:00
TreeHugger Robot
ba4ab078f2 Merge "Accessibility Service & Shortcut Redesign - Primary action - toggle button design" 2020-02-07 22:57:27 +00:00
Bill Peckham
f78295c11a Merge "Revert "Use system-api lib to get badged, shadowed icons(2/n)"" 2020-02-07 22:27:34 +00:00
Bill Peckham
94b8055f1c Revert "Use system-api lib to get badged, shadowed icons(2/n)" 
This reverts commit dbecbe6f61.

Reason for revert: b/149112222

Change-Id: I11981b2daacf8b07177fe906d88de05ca40810c1
 2020-02-07 21:52:25 +00:00
Beth Thibodeau
58c0a4c38f Update styles suggestion title to be generic 
Fixes: 148944501
Test: mp settingsg

Change-Id: Ifb55ac9ce1bfa45ab1c26a696558b2626e4353ee
 2020-02-07 14:08:30 -05:00
Fabian Kozynski
3c77bd3631 Merge "BOOLEAN_TILE to TOGGLEABLE_TILE in dev tiles" 2020-02-07 17:52:22 +00:00
Fabian Kozynski
e47b82b9a7 BOOLEAN_TILE to TOGGLEABLE_TILE in dev tiles 
Test: manual
Fixes: 147287512
Change-Id: I1bce1d8229ba2b7762387ea4df38bf4ba750c426
 2020-02-07 10:11:57 -05:00
Julia Reynolds
976a07baa6 Separate conversations from channels 
Test: atest
Bug: 137397357
Change-Id: I15c360e8ef89f9fcb8db92678dd02a2c6fe083c5
 2020-02-07 09:45:30 -05:00
Roshan Pius
c1313b41a5 Merge "Settings: Use new API for scan throttle toggle" 2020-02-07 13:39:55 +00:00
Automerger Merge Worker
2457f719e3 [automerger skipped] Bug:PreferredNetworkModePreferenceController.java not being refreshed am: b5dcd35969 am: b29e64ace1 -s ours 
am skip reason: Change-Id Ib5cc06cdbfd2fa70cd115d70337b21500e362da6 with SHA-1 7164275393 is in history

Change-Id: I71905b759fcd47d4cab1f24dc6cf989d97ceab8a
 2020-02-07 13:00:42 +00:00
Automerger Merge Worker
b29e64ace1 Bug:PreferredNetworkModePreferenceController.java not being refreshed am: b5dcd35969 
Change-Id: Ib2e8c6b3249a1137559fa9259348dcf26b7d8a0e
 2020-02-07 12:54:50 +00:00
menghanli
6eb3912f31 Accessibility Service & Shortcut Redesign - Primary action - toggle button design 
Implements DividerSwitchPreference to replace ToggleSwitch

Bug: 142528112
Test: Manual test

Change-Id: I0d80d16bfa941f7ee333a2c5680a25a26c42809d
 2020-02-07 20:49:13 +08:00
TreeHugger Robot
ee1bdcc010 Merge "Support autoclick secondary action (2/n)" 2020-02-07 12:25:10 +00:00
TreeHugger Robot
cdd797e2bd Merge "Use system-api lib to get badged, shadowed icons(2/n)" 2020-02-07 11:50:41 +00:00