OSDN Git Service
timhypeng [Mon, 6 Aug 2018 06:37:57 +0000 (14:37 +0800)]
remove unnecessary mock in ConnectedBluetoothDeviceUpdaterTest
Bug:
111848213
Test: make -j50 RunSettingsRoboTests
Change-Id: I6a2a25ff80d7d3cd9bcf2b4223afb6a80de7eb7c
TreeHugger Robot [Mon, 6 Aug 2018 06:40:46 +0000 (06:40 +0000)]
Merge "Remove obsolete parameter from addDevice"
TreeHugger Robot [Mon, 6 Aug 2018 04:07:19 +0000 (04:07 +0000)]
Merge "Icon color of spinner updated"
Bill Yi [Sun, 5 Aug 2018 01:30:05 +0000 (18:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
000f97dcf9 -s ours am:
16191b3408 -s ours
am:
4dd2c1fa3d -s ours
Change-Id: Ia93756b2c4e84be0828826ee390d0365d804fbe4
Bill Yi [Sun, 5 Aug 2018 01:25:30 +0000 (18:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
000f97dcf9 -s ours
am:
16191b3408 -s ours
Change-Id: I25c2d0e11f48a0cfa54bd1790ab858bbec109bc3
Bill Yi [Sun, 5 Aug 2018 01:21:26 +0000 (18:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
000f97dcf9 -s ours
Change-Id: Ia6cce5c5529998a45fa52d353f63a8edc8e2c0ef
Bill Yi [Sat, 4 Aug 2018 14:43:29 +0000 (07:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I89c83219dfbf228054284db00548647b94fc398b
Auto-generated-cl: translation import
Fan Zhang [Fri, 3 Aug 2018 16:13:53 +0000 (09:13 -0700)]
Remove custom tintable check.
Make a bunch keys private in tile and DashboardCategory
Bug:
77600770
Test: robotests
Change-Id: I4693e6bb71bd50cc664f578c7f8e25e67da20b67
TreeHugger Robot [Fri, 3 Aug 2018 02:05:32 +0000 (02:05 +0000)]
Merge "Move profile selector dialog to Settings"
Fan Zhang [Thu, 2 Aug 2018 23:02:13 +0000 (16:02 -0700)]
Fix robo tests
We are pointing to intermediate built files for resource. We should
instead just remove the ResourcePath list and let Robolectric extract
res files from built apk (supported in a newer version or robolectric)
Change-Id: Iaed2160518b90a8a678c8526295dcfa74c8e3c42
Fixes:
112160027
Test: robotests
Fan Zhang [Thu, 2 Aug 2018 19:59:55 +0000 (12:59 -0700)]
Move profile selector dialog to Settings
Bug:
77600770
Test: robotest
Change-Id: I601dabfd925a1990b7bd9115ef579bff9039a7c0
Stanley Wang [Wed, 1 Aug 2018 09:30:13 +0000 (17:30 +0800)]
Icon color of spinner updated
Change-Id: Iea7f5d5ec43360cf6114caf368fa8c93ce4cf95c
Fixes:
109843982
Test: manual
TreeHugger Robot [Thu, 2 Aug 2018 04:20:08 +0000 (04:20 +0000)]
Merge "5/n: Add face settings"
TreeHugger Robot [Wed, 1 Aug 2018 23:19:13 +0000 (23:19 +0000)]
Merge "Replaced 'partition' by 'requests'"
Felipe Leme [Wed, 1 Aug 2018 22:12:18 +0000 (15:12 -0700)]
Replaced 'partition' by 'requests'
Fixes:
111987840
Test: echo "In TreeHugger we trust!"
Change-Id: I450d23677063b98d994559a64fff2a4832afe6ef
TreeHugger Robot [Wed, 1 Aug 2018 21:52:40 +0000 (21:52 +0000)]
Merge "Fixes Settings app crashing when NfcAdapter is null"
Ruchi Kandoi [Wed, 1 Aug 2018 20:30:35 +0000 (13:30 -0700)]
Fixes Settings app crashing when NfcAdapter is null
If a device doesn't support NFC then
android.settings.NFCSHARING_SETTINGS and
android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT intents shouldn't
do anything and gracefully exit.
Test: Manual; Emulate a non-NFC device and test with apks sending intents
Bug:
80094104
Bug:
80092438
Change-Id: I5b3c3fdd582679e2cb16f474ef3331bc246b0d42
TreeHugger Robot [Wed, 1 Aug 2018 19:32:41 +0000 (19:32 +0000)]
Merge "Remove unused SuggestionFeatureProvider APIs."
TreeHugger Robot [Wed, 1 Aug 2018 19:29:44 +0000 (19:29 +0000)]
Merge "Disable changing lock when device is not provisioned."
Doris Ling [Tue, 31 Jul 2018 21:04:44 +0000 (14:04 -0700)]
Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page
- remove the search menu
Bug:
110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Fan Zhang [Wed, 1 Aug 2018 16:53:54 +0000 (09:53 -0700)]
Remove unused SuggestionFeatureProvider APIs.
Bug:
111941143
Test: robotests
Change-Id: Ic4e607b3601fd43ad57dad13474e2d0ee78bf29c
TreeHugger Robot [Wed, 1 Aug 2018 07:39:01 +0000 (07:39 +0000)]
Merge "Check the device is connected when receive onProfileConnectionStateChanged()"
TreeHugger Robot [Tue, 31 Jul 2018 17:13:27 +0000 (17:13 +0000)]
Merge "Use Settings.Secure values, not Global values"
TreeHugger Robot [Tue, 31 Jul 2018 16:35:10 +0000 (16:35 +0000)]
Merge "Fix windows leaked in ZenModeScheduleRuleSettings"
hughchen [Tue, 31 Jul 2018 08:09:17 +0000 (16:09 +0800)]
Check the device is connected when receive onProfileConnectionStateChanged()
Use isFilterMatched() to decide the prefernce should be added
or removed when receive onProfileConnectionStateChanged()
Bug:
80161203
Test: make -j42 RunSettingsRoboTests
Change-Id: Icccdb9007b587d3f481a23856edd7b2f7c9b04e0
tmfang [Tue, 31 Jul 2018 08:24:57 +0000 (16:24 +0800)]
Fix windows leaked in ZenModeScheduleRuleSettings
ZenModeScheduleRuleSettings creates an DaysDialog when user clicked
Days option.
If Activity was destroyed suddenly, WindowsManager throws a windows leaked exception.
And then DaysDialog try to do something(dismiss), settings app will crash.
So, we need to dismiss dialog when activity was destroyed.
Test: robo test, change code to recover symptom, manual test
Change-Id: I8d5370fe9673573581d613da91c7ab9be55d8199
Fixes:
111841375
TreeHugger Robot [Tue, 31 Jul 2018 07:37:13 +0000 (07:37 +0000)]
Merge "Unable to send files over Bluetooth OPP"
TreeHugger Robot [Tue, 31 Jul 2018 07:26:48 +0000 (07:26 +0000)]
Merge "Remove UsbModeChooserActivity in AndroidManifest"
tmfang [Tue, 31 Jul 2018 06:20:12 +0000 (14:20 +0800)]
Unable to send files over Bluetooth OPP
DevicPickerActivity switches to an androidx fragment in layout of bluetooth_device_picker.
But android.app.Activity doesn't support androidx fragment.
So, let DevicePiackerActivity extend androidx FragmentActivity.
Change-Id: I5da98a5e2242b75d2205a786bf373b81dfe6f613
Fixes:
112010509
Test: manual test, robo test
TreeHugger Robot [Tue, 31 Jul 2018 04:54:43 +0000 (04:54 +0000)]
Merge "Use BluetoothAdapter instead of LocalBluetoothAdapter"
hughchen [Thu, 26 Jul 2018 03:22:01 +0000 (11:22 +0800)]
Use BluetoothAdapter instead of LocalBluetoothAdapter
LocalBluetoothAdapter only has a few APIs that is not supported
by BluetoothAdapter, and lots of LocalBluetoothAdapter function
pass parameter to BluetoothAdapter directly.
Do the refactor in Settings, use BluetoothAdapter instead of
LocalBluetoothAdapter.
Bug:
111769754
Test: make -j42 RunSettingsRoboTests
Change-Id: I88e5a8377b5d1106c7679e6a8c3fd1ca1a80ea6f
tmfang [Tue, 31 Jul 2018 03:12:16 +0000 (11:12 +0800)]
Remove UsbModeChooserActivity in AndroidManifest
UsbModeChooserActivity was removed since b/
70848054,
So, we also removed it in AndroidManifest.xml.
Change-Id: I42a3330eec46ac957beeb384ef7d0c130f2f82e3
Fixes:
111968651
Test: robo
TreeHugger Robot [Tue, 31 Jul 2018 02:53:01 +0000 (02:53 +0000)]
Merge "Add Hearing Aid UI into Settings-Accessibility App"
Dieter Hsu [Tue, 31 Jul 2018 00:57:33 +0000 (00:57 +0000)]
Merge "Adding icon to color correction mode"
TreeHugger Robot [Mon, 30 Jul 2018 20:53:02 +0000 (20:53 +0000)]
Merge "Remove BluetoothFeatureProvider and impl"
TreeHugger Robot [Mon, 30 Jul 2018 18:27:40 +0000 (18:27 +0000)]
Merge "Fixed AutofillPreferenceCategory so it's UI is properly refreshed."
Fan Zhang [Sat, 28 Jul 2018 00:38:31 +0000 (17:38 -0700)]
Remove BluetoothFeatureProvider and impl
It's not used by anything
Change-Id: I03a73461a391657b8efbce13670a0c92fc4e3565
Fixes:
111940586
Test: rebuild
Felipe Leme [Mon, 30 Jul 2018 16:27:36 +0000 (09:27 -0700)]
Fixed AutofillPreferenceCategory so it's UI is properly refreshed.
Test: manual verification
Test: runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
Bug:
65700540
Bug:
111838239
Change-Id: If4e80a47d65aea34b94271e43ac38612373f4fa2
TreeHugger Robot [Mon, 30 Jul 2018 16:18:12 +0000 (16:18 +0000)]
Merge "Settings crashes on opening Wi-Fi Add network"
TreeHugger Robot [Mon, 30 Jul 2018 16:16:20 +0000 (16:16 +0000)]
Merge "Fix leaked windows exception in WifiDialogActivity"
Chienyuan [Mon, 30 Jul 2018 12:16:52 +0000 (20:16 +0800)]
Remove obsolete parameter from addDevice
Bug:
111966655
Test: build pass
Change-Id: I2f9475ad6b7588946421e852f0724ae616b107ba
tmfang [Fri, 27 Jul 2018 10:41:23 +0000 (18:41 +0800)]
Fix leaked windows exception in WifiDialogActivity
WifiDialog was created by WifiDialogActivity.
If activity was destroyed suddenly, WifiDialog can't dismiss itself.
So, we need to dismiss dialog, when activity was destroyed.
Test: robo and manual test
Bug:
111841375
Change-Id: I8aaf1c78e72144bf7c9cbc2392bce30e715d86e9
timhypeng [Thu, 14 Jun 2018 05:54:05 +0000 (13:54 +0800)]
Add Hearing Aid UI into Settings-Accessibility App
- dynamically show/hide preference by HearingAid profile is supported or not
- add AccessibilityHearingAidPreferenceController to handle hearingAid preference
- add HearingAidDialogFragment to handle dialog behavior
Bug:
109948484
Test: make -j50 RunSettingsRoboTests
Change-Id: Ic55dde475dc40311f7e652f4a86d342597f09f0e
tmfang [Mon, 30 Jul 2018 05:49:43 +0000 (13:49 +0800)]
Fix some crash cases when we launch AlertDialog
AlertDialog needs to use App.Compat theme.
Change-Id: Icef2f5b5cf2d614f98fd1d793e88c6a7349b1380
Fixes:
111888332
Test: robo
TreeHugger Robot [Sat, 28 Jul 2018 02:09:48 +0000 (02:09 +0000)]
Merge "Clean up task affinity."
Fan Zhang [Fri, 27 Jul 2018 23:16:43 +0000 (16:16 -0700)]
Clean up task affinity.
If activity is launched through external intent, back button should just
go back to previous screen.
Change-Id: I5b2e57d2751f5ed7c17140d3eb8d54736b78053c
Fixes:
111864355
Test: manual
Felipe Leme [Fri, 27 Jul 2018 16:02:34 +0000 (16:02 +0000)]
Merge "Added autofill options on Developer Options screen."
TreeHugger Robot [Fri, 27 Jul 2018 16:00:22 +0000 (16:00 +0000)]
Merge "Fix Wifi off state UI"
Dieter Hsu [Fri, 27 Jul 2018 07:49:56 +0000 (15:49 +0800)]
Adding icon to color correction mode
Adding icon image with red and green so users can see the
effects of changing the color correction.
Bug:
38103344
Test: Visually saw the icon appear in Settings->Accessibility->Color
Correction
Change-Id: I922b6ef2ee0f3a8e8d6ac80a14e46cd66da15195
tmfang [Thu, 26 Jul 2018 09:32:49 +0000 (17:32 +0800)]
Settings crashes on opening Wi-Fi Add network
Since Theme_Settings_NoActionBar extends from Theme.DeviceDefault.Settings,
so it carshed when AppCompatDelegateImpl tried to get AppCompat theme from WifiDialog.
Test: visual inspection, robo
Change-Id: I751b771fdfa9ad2261baa5a06274f6bb0a70d677
Fixes:
111804691
TreeHugger Robot [Fri, 27 Jul 2018 05:25:14 +0000 (05:25 +0000)]
Merge "IME auto popup fail when tap on wifi access point"
tmfang [Tue, 24 Jul 2018 07:09:09 +0000 (15:09 +0800)]
IME auto popup fail when tap on wifi access point
Since we migrated AlertDialog to AndroidX version,
we use App.Compat theme for AndroidX AlertDialog.
Test: visual inspection, robo
Change-Id: I7911ab7f5c6338559f4568c8e8bb52357ca2edd3
Fixes:
111731279
Mill Chen [Wed, 25 Jul 2018 13:52:15 +0000 (21:52 +0800)]
Fix Wifi off state UI
- Apply footerPreferenceStyle to reduce the text size and text color
- Add "info" icon
Bug:
80087791
Test: visual, RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I19d4f67c5a9f2fc2b542f40e051c1469ab40e7db
Lei Yu [Fri, 27 Jul 2018 01:34:25 +0000 (01:34 +0000)]
Merge changes I77a53f70,I853d3611
* changes:
Add functions for table action.
Create table to store user action.
TreeHugger Robot [Fri, 27 Jul 2018 00:37:43 +0000 (00:37 +0000)]
Merge "Update AppCheckBoxPreference to show summary"
TreeHugger Robot [Thu, 26 Jul 2018 23:21:36 +0000 (23:21 +0000)]
Merge "When wallpaper colors not ready set sys ui flags when ready"
jackqdyulei [Thu, 19 Jul 2018 17:09:47 +0000 (10:09 -0700)]
Add functions for table action.
1. Insert/Update/Query/Delete
2. Update the action when app been restricted
3. Display restriction time in RestrictedAppDetails
Bug:
111366678
Test: RunSettingsRoboTests
Change-Id: I77a53f70e1ce4b612aabe28b7a1bb5df8f3ec9d5
Matthew Ng [Thu, 19 Jul 2018 20:30:54 +0000 (13:30 -0700)]
When wallpaper colors not ready set sys ui flags when ready
Uses a listener on wallpaper manager to get the wallpaper colors for
fallback home. When the colors are ready it can correctly set the system
ui flags.
Change-Id: I7119c0f035245539cb69bec1ccccecef64d3aff5
Fixes:
79776583
Test: reboot phone, unlock with pin/pattern with light them wallpaper
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FallbackHomeActivityTest
jackqdyulei [Thu, 26 Jul 2018 21:14:15 +0000 (14:14 -0700)]
Update AppCheckBoxPreference to show summary
The summary is invisible by default if we use preference_app.xml,
this CL turn it on if summary is not empty.
Bug:
111366678
Test: RunSettingsRoboTests
Change-Id: I3fe5827a5e80a8e21309b163dbbaa1070f5ee61e
TreeHugger Robot [Thu, 26 Jul 2018 21:58:49 +0000 (21:58 +0000)]
Merge "Pass in context when loading icons from Tile"
jackqdyulei [Wed, 18 Jul 2018 22:13:19 +0000 (15:13 -0700)]
Create table to store user action.
For example, it will store when user restrict an app.
Bug:
111366678
Test: Build
Change-Id: I853d3611f260436d1f97ee7b0a40c52a8bde0678
Beverly [Mon, 2 Jul 2018 20:46:11 +0000 (16:46 -0400)]
Use Settings.Secure values, not Global values
The following Settings are being moved to Settings.Secure
from Settings.Global since they are settings that exist
per user
- CHARGING_SOUNDS_ENABLED
- CHARGING_VIBRATION_ENABLED
- ZEN_DURATION
- SHOW_ZEN_UPGRADE_NOTIFICATION
- SHOW_ZEN_SETTINGS_SUGGESTION
- ZEN_SETTINGS_UPDATE
- ZEN_SETTINGS_SUGGESTION_VIEWED
Bug:
110926544
Test: make ROBOTEST_FILTER=ZenModeDurationPreferenceControllerTest RunSettingsRoboTests
Change-Id: I3e3d6f6653b81a121fbda7d2f9f1b75651f536b7
TreeHugger Robot [Thu, 26 Jul 2018 20:13:44 +0000 (20:13 +0000)]
Merge "PowerUsageSummary: move controllers to xml"
Fan Zhang [Thu, 26 Jul 2018 18:26:11 +0000 (11:26 -0700)]
Pass in context when loading icons from Tile
Bug:
111860183
Test: robotests
Change-Id: I836ad66eb420f4e0bd0bbded541f4dfe947c9b18
jackqdyulei [Tue, 24 Jul 2018 17:49:05 +0000 (10:49 -0700)]
PowerUsageSummary: move controllers to xml
Also change the following controllers to have standard constructor
1. BatteryHeaderPreferenceController
2. BatteryTipPreferenceController
Change-Id: I2e68082295eb8ef18de9fef9483a10b070c77a47
Fixes:
111131567
Test: robotest
Felipe Leme [Wed, 25 Jul 2018 00:24:40 +0000 (17:24 -0700)]
Added autofill options on Developer Options screen.
Test: manual verification
Test: atest AutofillResetOptionsPreferenceControllerTest\
AutofillLoggingLevelPreferenceControllerTest
Test: runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
Fixes:
65700540
Change-Id: I6b35fbf549529f4d97df164ce3fb6d641ee37650
Prabir Pradhan [Thu, 26 Jul 2018 05:24:49 +0000 (05:24 +0000)]
Merge "Add a boolean flag to show or hide the device name in About device."
TreeHugger Robot [Thu, 26 Jul 2018 03:34:36 +0000 (03:34 +0000)]
Merge "Fix the empty preference after clicking gear icon"
felkachang [Thu, 19 Jul 2018 12:06:50 +0000 (20:06 +0800)]
Fix the empty preference after clicking gear icon
Because there is no other options for 'None' or 'Swipe, there is no
necessary for showing the gear icon to show options.
'Lock screen message' could be found in
Settings > Display > Lock screen display.
Add testcase to verify the ChangeScreenLockPreferenceController's
behavior.
Test: make ROBOTEST_FILTER=ChangeScreenLockPreferenceControllerTest \
RunSettingsRoboTests -j40
Change-Id: Icdcd672261749d106162053d6f5228cee420a810
Fixes:
110848852
TreeHugger Robot [Thu, 26 Jul 2018 00:50:31 +0000 (00:50 +0000)]
Merge "Restore the up time preference."
Prabir Pradhan [Wed, 25 Jul 2018 20:55:56 +0000 (13:55 -0700)]
Add a boolean flag to show or hide the device name in About device.
The following boolean flag is added:
config_show_device_name
When set to false, the device name will not be shown in System > About
Device.
Bug:
111653180
Test: Updated robotests
Change-Id: Id9610e2009604c9d9693428adff01adc7d606565
TreeHugger Robot [Wed, 25 Jul 2018 23:48:14 +0000 (23:48 +0000)]
Merge "Clean up unused deps"
Doris Ling [Wed, 25 Jul 2018 23:12:57 +0000 (16:12 -0700)]
Restore the up time preference.
- up time preference is removed when we updated to the new version of
about phone settings. Add it back to the preference xml, and restore the
controller for it.
Change-Id: I245316e84d04f9d6f033377c944b615dd6e138a5
Fixes:
111828610
Test: manual
TreeHugger Robot [Wed, 25 Jul 2018 23:25:54 +0000 (23:25 +0000)]
Merge "Use Tile.getIcon() to avoid caching issue"
TreeHugger Robot [Wed, 25 Jul 2018 22:51:00 +0000 (22:51 +0000)]
Merge "Check for WiFi controller for summary population."
Fan Zhang [Wed, 25 Jul 2018 22:25:05 +0000 (15:25 -0700)]
Clean up unused deps
Test: rebuild
Change-Id: I7caa30024046ae832cafef6598ecf74db4aba8bf
Ben Lin [Fri, 20 Jul 2018 19:36:42 +0000 (12:36 -0700)]
Check for WiFi controller for summary population.
WiFiController might return not available, so we should only surface
"Wi-Fi" as a summary entry if it's available in the settings page.
This also checks for empty strings in case they are declared as such in
the XML (since XML can be device/product overlay'd), to avoid situations
such as ", data usage".
Bug:
111398942
Test: Manual check, and I see Wi-Fi no longer visible for cases where
Wifi controller isn't available.
Test: make RunSettingsRoboTests
Change-Id: I24736a6240c50e2ea38ce424fbac2316721290d8
Fan Zhang [Tue, 24 Jul 2018 19:49:30 +0000 (12:49 -0700)]
Use Tile.getIcon() to avoid caching issue
Bug:
77600770
Test: robotests
Change-Id: Icb21f5da9b542abc239b04b71813290ad3104ffb
TreeHugger Robot [Wed, 25 Jul 2018 18:28:46 +0000 (18:28 +0000)]
Merge "Remove unused interface API"
TreeHugger Robot [Wed, 25 Jul 2018 17:41:11 +0000 (17:41 +0000)]
Merge "Change floating search button icon"
Mill Chen [Wed, 25 Jul 2018 05:32:34 +0000 (13:32 +0800)]
Change floating search button icon
- Add an alias name for floating search button
Bug:
111665984
Test: rebuild
Change-Id: I020cd4a163ae586f5b8faa0d4f8d9bc8bbd84fa4
Fan Zhang [Tue, 24 Jul 2018 22:00:01 +0000 (15:00 -0700)]
Remove unused interface API
Bug:
111796429
Test: robotests
Change-Id: I5887a0a48285cf61777ac7c6a896d16dd7585a26
Doris Ling [Tue, 24 Jul 2018 17:57:43 +0000 (17:57 +0000)]
Merge "Fix new account not shown for work profile."
Kevin Chyn [Tue, 24 Jul 2018 17:42:36 +0000 (17:42 +0000)]
Merge "Update Security & location preference summary depending on biometrics"
TreeHugger Robot [Tue, 24 Jul 2018 16:20:25 +0000 (16:20 +0000)]
Merge "Modified the char limit"
Dario Freni [Tue, 24 Jul 2018 11:11:18 +0000 (04:11 -0700)]
[automerger skipped] Merge "Include NOTICE file in /product partition." am:
aa2ec5f239 -s ours am:
1e56e69a46 -s ours am:
1237373743 -s ours
am:
64e4c89ef6 -s ours
Change-Id: I8b4a41fa2ef2fb023ba4f5ac96494be8172cb6ec
Dario Freni [Tue, 24 Jul 2018 11:06:25 +0000 (04:06 -0700)]
[automerger skipped] Merge "Include NOTICE file in /product partition." am:
aa2ec5f239 -s ours am:
1e56e69a46 -s ours
am:
1237373743 -s ours
Change-Id: I00878455de5f09b6ab95d03ae5def411c8c0cb9e
Dario Freni [Tue, 24 Jul 2018 11:02:45 +0000 (04:02 -0700)]
[automerger skipped] Merge "Include NOTICE file in /product partition." am:
aa2ec5f239 -s ours
am:
1e56e69a46 -s ours
Change-Id: I0282749b861a6571326c725b5c62a0ebda99dff9
Dario Freni [Tue, 24 Jul 2018 10:58:08 +0000 (03:58 -0700)]
[automerger skipped] Merge "Include NOTICE file in /product partition."
am:
aa2ec5f239 -s ours
Change-Id: I5341a7ab21758d1a47b0618cd8b1779f063b1406
Treehugger Robot [Tue, 24 Jul 2018 10:35:44 +0000 (10:35 +0000)]
Merge "Include NOTICE file in /product partition."
TreeHugger Robot [Tue, 24 Jul 2018 10:17:53 +0000 (10:17 +0000)]
Merge "Delegate PrintServicesLoader to the framework's one"
Kevin Chyn [Tue, 24 Jul 2018 01:05:59 +0000 (18:05 -0700)]
Update Security & location preference summary depending on biometrics
Fixes:
110960063
Test: manual
Test: make -j56 SettingsRoboTests ROBOTEST_FILTER=SecuritySettingsTest
Change-Id: Ia9186af37c84f4ff0391d1b72043948934ed997b
Sunny Shao [Tue, 24 Jul 2018 03:56:49 +0000 (11:56 +0800)]
Modified the char limit
- Modified the comment in strings.xml and extended the length of the CHAR LIMIT
Change-Id: I39d065aad7473bb1111db690c7b7a1ff81de459c
Fixes:
111697704
Test: visual
Doris Ling [Mon, 23 Jul 2018 23:13:39 +0000 (16:13 -0700)]
Fix new account not shown for work profile.
When refreshing the Accounts settings UI, we uses the cached user info
for checking user status. However, when the work profile is being
updated, the UserInfo obejct for the user might be updated even the
user id is the same. Using the cached data causes stale info to be
returned for the user and results in the latest account data not
being shown properly for the user. Update the cache to the latest user
info retrieved from user manager.
Change-Id: Ic0127842203f0288f2fdea6c6346cd11e42a8bf0
Fix:
38302246
Test: make RunSettingsRoboTests
Fan Zhang [Mon, 23 Jul 2018 20:51:40 +0000 (13:51 -0700)]
Move CategoryManager to Settings.
Bug:
77600770
Test: robo
Change-Id: Id4a0c89938d43d21147944b820a191486c589238
Kevin Chyn [Wed, 11 Jul 2018 00:20:29 +0000 (17:20 -0700)]
5/n: Add face settings
This change connects the face status preference controller with the
settings fragment/activity. This change also implements the basic settings
page showing a video, a toggle for keyguard, improve/remove targets,
and footer.
Bug:
111321762
Test: manual
Change-Id: Ifc65f5acbf6551679074df63ef22ffba75229f37
Irina Dumitrescu [Mon, 23 Jul 2018 12:54:14 +0000 (13:54 +0100)]
Update notification_settings_work_profile comment.
Test: n/a
Fixes:
111699435
Change-Id: I1a33204f5305db28e7d423b4b2523ed64c675e46
Kevin Chyn [Sat, 21 Jul 2018 01:24:58 +0000 (01:24 +0000)]
Merge "Fix settings crash after androidx refactoring"
Kevin Chyn [Sat, 21 Jul 2018 00:19:39 +0000 (17:19 -0700)]
Fix settings crash after androidx refactoring
Fixes:
111701576
Change-Id: I095d4837e7a34fb9f240f2a302b5c6f7d1142db9
Fixes:
111701576
Ian Pedowitz [Fri, 20 Jul 2018 23:37:07 +0000 (16:37 -0700)]
Remove the character limit
This could cause existing messages to get clipped
Effectively reverting part of
e7c3ca0e2ebde28b98847d1a21a6aa64fb4a973e
Bug:
111577594
Test: None, is a revert of this config
Change-Id: Ifaa8c9674db3c6865b3b59fcd254bb3e2b20a5f5