OSDN Git Service
Ilya Matyukhin [Tue, 26 Nov 2019 01:01:22 +0000 (17:01 -0800)]
Fix "Skip lock screen" not working for secondary user
Bug:
140878309
Test: the option is not grayed out for secondary user.
Change-Id: I2413aa3c634e89a90d104e9ad60df15e49c75ed2
Quang Luong [Tue, 3 Dec 2019 20:03:10 +0000 (20:03 +0000)]
Merge "Use WifiPickerTracker to get connected WifiEntry"
Automerger Merge Worker [Tue, 3 Dec 2019 19:34:32 +0000 (19:34 +0000)]
Battery saver mode should disable dark mode modification am:
5fb68ae95d
Change-Id: I9b4b1dace76a6194fafe27e624465c3c05823bb1
Jay Aliomer [Tue, 3 Dec 2019 17:47:41 +0000 (09:47 -0800)]
Battery saver mode should disable dark mode modification
am:
f4bc80c45c
Change-Id: Iff4cb52ba46e20bd012f95e9d29917f7952b4259
TreeHugger Robot [Tue, 3 Dec 2019 17:37:11 +0000 (17:37 +0000)]
Merge "Support installation of the new app source certificate"
tim peng [Tue, 3 Dec 2019 07:12:17 +0000 (07:12 +0000)]
Merge "Add base dialog preference controller for new Bluetooth developer option"
tim peng [Tue, 3 Dec 2019 07:12:17 +0000 (07:12 +0000)]
Merge "Add base preference controller for new Bluetooth developer option"
tim peng [Tue, 3 Dec 2019 07:11:59 +0000 (07:11 +0000)]
Merge "Add base preference for new Bluetooth developer option"
TreeHugger Robot [Tue, 3 Dec 2019 05:46:38 +0000 (05:46 +0000)]
Merge "Remove framelayout to make focus don't have duplicate action"
hughchen [Tue, 3 Dec 2019 03:52:50 +0000 (11:52 +0800)]
Remove framelayout to make focus don't have duplicate action
Fixes:
131128155
Test: Manual
Change-Id: Ifb96698007a2bfafb545dbc04f61343160a41ef7
timhypeng [Tue, 26 Nov 2019 05:24:15 +0000 (13:24 +0800)]
Add base dialog preference controller for new Bluetooth developer option
Bug:
142227996
Test: manual
Change-Id: I15335d9c783b5ddba1b93322449f345f450d587f
Jay Aliomer [Wed, 27 Nov 2019 22:46:58 +0000 (17:46 -0500)]
Battery saver mode should disable dark mode modification
disable toggle options and disable the dark theme drop down selection
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"
Fixes:
145098277
Fixes:
145297188
Fixes:
145254016
Change-Id: I5c81a295810cc2d9a45657978104647e9c15da46
Abhijeet Kaur [Mon, 2 Dec 2019 15:48:28 +0000 (15:48 +0000)]
Merge "Make Settings UI fuse flag "settings_fuse" persistent"
TreeHugger Robot [Mon, 2 Dec 2019 13:54:05 +0000 (13:54 +0000)]
Merge "Reorganize notification Settings classes"
TreeHugger Robot [Mon, 2 Dec 2019 10:26:09 +0000 (10:26 +0000)]
Merge "Adjust preferene to align the lastest mock"
Raff Tsai [Mon, 2 Dec 2019 08:51:54 +0000 (16:51 +0800)]
Change icon
Test: rebuild
Fixes:
145242321
Screenshot: https://screenshot.googleplex.com/zLg7iWd0s66
Change-Id: I0425a44fd10f01d657c91b8633e415b0c19817f0
TreeHugger Robot [Mon, 2 Dec 2019 08:01:28 +0000 (08:01 +0000)]
Merge "Hide PIP related preference when device didn't support this feature"
Raff Tsai [Mon, 2 Dec 2019 07:09:26 +0000 (15:09 +0800)]
Adjust preferene to align the lastest mock
- Because removeAll in updateState will cause preference list janking,
move updateState code to displayPreference.
Bug:
141601408
Fixes:
145369584
Test: manual and robolectric
Change-Id: Ic6ffeedfdd7a64671e497a61894d7c0d443750ef
Edgar Wang [Wed, 20 Nov 2019 10:23:59 +0000 (18:23 +0800)]
Hide PIP related preference when device didn't support this feature
Fixes:
79945310
Test: atest & manual
Change-Id: I24b9de06ec94a008656cbbc016a50a4e217fece1
timhypeng [Tue, 26 Nov 2019 05:23:00 +0000 (13:23 +0800)]
Add base preference controller for new Bluetooth developer option
Bug:
142227996
Test: make -j50 RunSettingsRoboTests
Change-Id: I9d10019228bc575f4ac38494e4dd27d672d5da6d
Raff Tsai [Thu, 28 Nov 2019 02:13:11 +0000 (10:13 +0800)]
Fix testcase error
- ignore testcase in MobileNetworkActivityTest
- To avoid null pointer access in LocationForWorkPreferenceController,
move mUserManager initialization in constructor
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.search"
Change-Id: Icf6c36ecef22149def6d5924741a798e8f506033
TreeHugger Robot [Mon, 2 Dec 2019 02:44:00 +0000 (02:44 +0000)]
Merge "Add page creation latency for updatePreferenceStates"
Goven Liu [Fri, 29 Nov 2019 03:28:05 +0000 (03:28 +0000)]
Merge "[Wi-Fi] Add one network request case for adding Wi-Fi for apps feature."
Bonian Chen [Thu, 28 Nov 2019 15:30:09 +0000 (07:30 -0800)]
Merge "Consider subId when loading Wfc string resources" am:
9c2c1b4784 am:
944689abd6
am:
6c1861b3c0
Change-Id: I3d8c02c344d0aa70952dca9aac6597ca6b36a4db
Bonian Chen [Thu, 28 Nov 2019 15:28:07 +0000 (07:28 -0800)]
Merge "Consider subId when loading Wfc string resources" am:
9c2c1b4784
am:
944689abd6
Change-Id: I6bfa2099cdb382109c90f0c3b9ea76a2a7df4d19
Bonian Chen [Thu, 28 Nov 2019 15:26:07 +0000 (07:26 -0800)]
Merge "Consider subId when loading Wfc string resources"
am:
9c2c1b4784
Change-Id: Ib680198aff74daa31d5ca0413ca3dd869b3126af
Bonian Chen [Thu, 28 Nov 2019 15:22:21 +0000 (15:22 +0000)]
Merge "Consider subId when loading Wfc string resources"
TreeHugger Robot [Thu, 28 Nov 2019 11:45:23 +0000 (11:45 +0000)]
Merge "Fix bottom zone is transparent in add network page"
Tsung-Mao Fang [Thu, 28 Nov 2019 09:25:08 +0000 (17:25 +0800)]
Fix bottom zone is transparent in add network page
Override clipToPadding and clipToChildren attributes
to prevent view from overlapping problem.
Change-Id: I3493d80d89950545ea74b76e25c6f55069f83f5e
Fix:
145332638
Test: visual
timhypeng [Tue, 26 Nov 2019 05:20:47 +0000 (13:20 +0800)]
Add base preference for new Bluetooth developer option
Bug:
142227996
Test: manual
Change-Id: I23c11072a326473bdc7ce169c6c2fb970a8f828d
Neil Fuller [Thu, 28 Nov 2019 09:04:26 +0000 (01:04 -0800)]
[automerger skipped] Merge "Switch settings to use TimeDetector" am:
d32eee26e3 am:
5ef64ad89b
am:
3296857f38 -s ours
am skip reason: change_id I671bf0e7e7364f64f1397d524c6277591eb4e22e with SHA1
9861696306 is in history
Change-Id: I0d02b8b75e2e5481946fead9520b14b7e21f8789
Sunny Shao [Wed, 27 Nov 2019 10:55:16 +0000 (18:55 +0800)]
Add page creation latency for updatePreferenceStates
- The updatePreferenceStates is called in the onResume. Here creates a new enum to
record the elapsed time.
Bug:
137558156
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
Change-Id: I02bdbeecd61fbc0082eea19ea64cbfe7541a6970
Neil Fuller [Thu, 28 Nov 2019 08:59:44 +0000 (00:59 -0800)]
Merge "Switch settings to use TimeDetector" am:
d32eee26e3
am:
5ef64ad89b
Change-Id: I8901a6595677380013cc3d063426a4dfead18b97
Neil Fuller [Thu, 28 Nov 2019 08:54:40 +0000 (00:54 -0800)]
Merge "Switch settings to use TimeDetector"
am:
d32eee26e3
Change-Id: I1f3c05b986768be9c29043eea51143d6ab22bd12
Neil Fuller [Thu, 28 Nov 2019 08:47:32 +0000 (08:47 +0000)]
Merge "Switch settings to use TimeDetector"
govenliu [Tue, 26 Nov 2019 05:37:56 +0000 (13:37 +0800)]
[Wi-Fi] Add one network request case for adding Wi-Fi for apps feature.
Handle adding one network case, add UI components and process saving/connecting flow.
Bug:
136472483
Test: Add unit test cases to test one network in list case and null list case, and also check if the SSID set correct or not.
Change-Id: I99f804a967575538c9dc3f1faabb2b507e92e558
TreeHugger Robot [Thu, 28 Nov 2019 08:12:01 +0000 (08:12 +0000)]
Merge "Make some existing slices public."
TreeHugger Robot [Thu, 28 Nov 2019 08:12:01 +0000 (08:12 +0000)]
Merge "Make some accessibility related slices public."
TreeHugger Robot [Thu, 28 Nov 2019 08:12:01 +0000 (08:12 +0000)]
Merge "Make some gesture related slices public."
TreeHugger Robot [Thu, 28 Nov 2019 08:12:01 +0000 (08:12 +0000)]
Merge "Make some device info related slices public."
TreeHugger Robot [Thu, 28 Nov 2019 08:12:01 +0000 (08:12 +0000)]
Merge changes from topic "expose_slices"
* changes:
Make some display related slices public.
Make all TogglePreferenceController slice-able.
Yi-Ling Chuang [Wed, 27 Nov 2019 08:55:26 +0000 (16:55 +0800)]
Make some device info related slices public.
Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.
Bug:
141088937
Test: robotests
Change-Id: Id38fd0203a4efc812e30990491786b4d8aff8902
Yi-Ling Chuang [Wed, 27 Nov 2019 10:33:34 +0000 (18:33 +0800)]
Make some existing slices public.
Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.
Bug:
141088937
Test: robotests
Change-Id: I5934e89bc1b268fdd44acd630621fa46987728ff
Yi-Ling Chuang [Wed, 27 Nov 2019 09:48:21 +0000 (17:48 +0800)]
Make some accessibility related slices public.
Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.
Bug:
141088937
Test: robotests
Change-Id: If0fa79f7c270b10f8f1a47cb5f914d19566dedfb
Yi-Ling Chuang [Wed, 27 Nov 2019 09:14:17 +0000 (17:14 +0800)]
Make some gesture related slices public.
Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.
Bug:
141088937
Test: robotests
Change-Id: I0b54e752c5982f13193590db47dc3a84dde5311d
Yi-Ling Chuang [Wed, 27 Nov 2019 06:25:56 +0000 (14:25 +0800)]
Make some display related slices public.
Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.
Bug:
141088937
Test: robotests
Change-Id: I2a36da4ac4bb14a4d2ac7b89ab2bb3ebf8e655f7
Yi-Ling Chuang [Wed, 27 Nov 2019 08:09:34 +0000 (16:09 +0800)]
Make all TogglePreferenceController slice-able.
All the descendants of TogglePreferenceController are now slice-able by
default, where every controller can still disable it by overriding this
value. Though all of them are now slice-able, doesn't necessarily means
they are exposed publicly as we set the default value of isPublicSlice()
to false. For those that want to be public ones will have to override
this value.
Bug:
141088937
Test: robotests
Change-Id: I2ea529c11f0177cd6c55754b632cd1fea1dcc48f
Stanley Wang [Thu, 28 Nov 2019 03:45:58 +0000 (03:45 +0000)]
Merge "Add work profile items of Account page to dynamic index."
Raff Tsai [Wed, 27 Nov 2019 16:42:03 +0000 (16:42 +0000)]
Merge "Separate personal/work tab in LocationSettings"
Neil Fuller [Sat, 23 Nov 2019 11:42:39 +0000 (11:42 +0000)]
Switch settings to use TimeDetector
Switch settings to use TimeDetector when setting the system clock rather
than using AlarmManager directly.
Bug:
140712361
Test: treehugger
Test: manual
Test: make -j30 RunSettingsRoboTests ROBOTEST_FILTER=TimePreferenceControllerTest
Test: make -j30 RunSettingsRoboTests ROBOTEST_FILTER=DatePreferenceControllerTest
Change-Id: I671bf0e7e7364f64f1397d524c6277591eb4e22e
Merged-In: I671bf0e7e7364f64f1397d524c6277591eb4e22e
(cherry picked from commit
9861696306fb9a4e33d644adf4a989abea91b4fb)
Neil Fuller [Wed, 27 Nov 2019 16:15:03 +0000 (16:15 +0000)]
Merge "Switch settings to use TimeDetector"
Victor Hsieh [Wed, 30 Oct 2019 22:35:19 +0000 (15:35 -0700)]
Support installation of the new app source certificate
The new certificate can be installed from Settings ("Install a
certificate > App Source certificate"). The installation flow includes
a warning with user authorization to proceed, then a prompt for reboot
(now or later).
Installed certificate can be managed in "User credentials". The name is
currently a hash of hex numbers.
Upon deletion, there will also be a promot for reboot (now or later).
Test: Only see the new setting entry if feature is enabled
Test: Install from Settings, see the expected file name in
/data/misc/keysetore/user_0. Reboot also works.
Test: Able to see the certificate in Settings after installed
Test: Able to delete the certificate, which triggers confirmation dialog
to reboot. Reboot works.
Test: add certificate, see dialog, "not now" / tapping elsewhere does
nothing
Test: atest RestrictedEncryptionPreferenceControllerTest
Bug:
112038744
Change-Id: I7a4494ea0f243730df2212076588074d8774ae23
Raff Tsai [Wed, 27 Nov 2019 15:44:48 +0000 (15:44 +0000)]
Merge "Fix talkback speak wrong item"
Julia Reynolds [Tue, 26 Nov 2019 21:14:03 +0000 (16:14 -0500)]
Reorganize notification Settings classes
The notification package was getting too big.
Test: make -j64 RunSettingsRoboTests
Fixes:
145224451
Change-Id: I25ba82f42f7a137d8adcce72dcf8089d0e018bdc
Neil Fuller [Sat, 23 Nov 2019 11:42:39 +0000 (11:42 +0000)]
Switch settings to use TimeDetector
Switch settings to use TimeDetector when setting the system clock rather
than using AlarmManager directly.
Bug:
140712361
Test: treehugger
Test: manual
Test: make -j30 RunSettingsRoboTests ROBOTEST_FILTER=TimePreferenceControllerTest
Test: make -j30 RunSettingsRoboTests ROBOTEST_FILTER=DatePreferenceControllerTest
Change-Id: I671bf0e7e7364f64f1397d524c6277591eb4e22e
Torbjorn Eklund [Wed, 6 Mar 2019 15:12:20 +0000 (16:12 +0100)]
Consider subId when loading Wfc string resources
Consider subId when loading string resources in screen
WifiCallingSettingsForSub and Wi-Fi Calling slice.
This ensures that correct string resources is loaded in multi sim
scenario when operators are using customized strings.
Bug:
129893058
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingPreferenceController
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSliceHelper
Change-Id: Ia5b763d4b59f7e738cb741b778bb859884a85198
TreeHugger Robot [Wed, 27 Nov 2019 11:09:31 +0000 (11:09 +0000)]
Merge changes from topic "query_nonpublic_slices"
* changes:
Enable Settings Search to query private Slices.
Add the impl for the ability to query non-public Slices
Stanley Wang [Wed, 27 Nov 2019 02:39:59 +0000 (10:39 +0800)]
Add work profile items of Account page to dynamic index.
- Add "Work profile settings" & "Remove work profile"
to dynamic index
Test: manual & robotests AccountPreferenceControllerTest
Change-Id: I122269927fd466bc8fbce1dd68faa372a6a7477b
Bugs:
69907442
TreeHugger Robot [Wed, 27 Nov 2019 10:02:33 +0000 (10:02 +0000)]
Merge "Make Settings self-injected toggle switch searchable"
Jason Chiu [Tue, 26 Nov 2019 08:53:11 +0000 (16:53 +0800)]
Make Settings self-injected toggle switch searchable
- only skip ActivityTile
- skip items that has no static title
Bug:
132812768
Test: robotest
Change-Id: Idb3c111966c1dd96e2886aca2c7ead3b57ba119e
Raff Tsai [Wed, 27 Nov 2019 08:54:09 +0000 (16:54 +0800)]
Fix talkback speak wrong item
Fixes:
145251855
Test: manual
Change-Id: I041d9fd6416e5ae5a12ea51fd8b70ca2f233f480
TreeHugger Robot [Wed, 27 Nov 2019 07:24:51 +0000 (07:24 +0000)]
Merge "Minor code simplification."
TreeHugger Robot [Wed, 27 Nov 2019 05:01:09 +0000 (05:01 +0000)]
Merge "Focus remains on the button after turning on/off"
Bonian Chen [Wed, 27 Nov 2019 01:51:38 +0000 (17:51 -0800)]
Merge "IMS: Grey out Wifi calling option when either sub is having call." am:
262b4f7434 am:
37e02742a4
am:
b61f54519b
Change-Id: Ia60aa3828cb0b4a28e72ae43fb47a09982ae0b5f
Bonian Chen [Wed, 27 Nov 2019 01:49:06 +0000 (17:49 -0800)]
Merge "IMS: Grey out Wifi calling option when either sub is having call." am:
262b4f7434
am:
37e02742a4
Change-Id: I81eac0ecd2948e7b5bd6b92ae90b349ab46675e7
Bonian Chen [Wed, 27 Nov 2019 01:46:38 +0000 (17:46 -0800)]
Merge "IMS: Grey out Wifi calling option when either sub is having call."
am:
262b4f7434
Change-Id: I59a18265dc053386854c6c4b4b30e90c287b34e8
Bonian Chen [Wed, 27 Nov 2019 01:35:23 +0000 (01:35 +0000)]
Merge "IMS: Grey out Wifi calling option when either sub is having call."
Roshan Pius [Tue, 26 Nov 2019 19:22:18 +0000 (19:22 +0000)]
Merge "Revert "Settings(wifi): Allow mainline wifi stack to use network request dialog""
Jay Aliomer [Tue, 26 Nov 2019 15:44:20 +0000 (15:44 +0000)]
Merge "Fix Master: Add settings for scheduling dark theme"
Beverly [Tue, 26 Nov 2019 15:14:32 +0000 (10:14 -0500)]
Focus remains on the button after turning on/off
Test: manually test talkback
Fixes:
145181672
Change-Id: I16ceb81dd686e4a18354dfd464c7683ba94df79d
Alan Stokes [Tue, 26 Nov 2019 11:39:22 +0000 (11:39 +0000)]
Minor code simplification.
Test: atest VerifyAppsOverUsbPreferenceControllerTest
Bug:
135751498
Change-Id: I51696147a211792e53cc6178e0912c760d667034
TreeHugger Robot [Tue, 26 Nov 2019 10:44:04 +0000 (10:44 +0000)]
Merge "Add new bit per sample dialog layout for new Bluetooth developer option"
Bonian Chen [Tue, 26 Nov 2019 10:14:42 +0000 (02:14 -0800)]
[automerger skipped] Merge "[Setting] Fix merge conflict" am:
67805d8e5e am:
ec4e1a14e0
am:
42eec15834 -s ours
am skip reason: change_id I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a with SHA1
0f844d168b is in history
Change-Id: I8254182adcae306506742d4f67cc03a1465c3293
Bonian Chen [Tue, 26 Nov 2019 10:11:19 +0000 (02:11 -0800)]
Merge "[Setting] Fix merge conflict" am:
67805d8e5e
am:
ec4e1a14e0
Change-Id: I716436a78316eb111fa53bb6834d81934f7830f1
Bonian Chen [Tue, 26 Nov 2019 10:02:03 +0000 (02:02 -0800)]
Merge "[Setting] Fix merge conflict"
am:
67805d8e5e
Change-Id: Ie7f67b9a80efdceb1e3c5fd3054dd4eb71c4dcd8
TreeHugger Robot [Tue, 26 Nov 2019 09:39:26 +0000 (09:39 +0000)]
Merge "Add new LDAC quality dialog layout for new Bluetooth developer option"
Raff Tsai [Fri, 22 Nov 2019 08:36:21 +0000 (16:36 +0800)]
Separate personal/work tab in LocationSettings
- Add LocationPersonalSettings for personal location Settings
- Add LocationWorkProfileSettings for workprofile location settings
Bug:
141601408
Test: manual
Change-Id: Iaaa3a1db5abe02881c4d8afdaec1013ab5552eb3
Yi-Ling Chuang [Mon, 25 Nov 2019 09:59:36 +0000 (17:59 +0800)]
Enable Settings Search to query private Slices.
The base Uri is now determined by whether a certain config string is set
or not. When the config is set, Settings Search will then be able to
query private Slices, otherwise we'll just provide public ones.
Bug:
141088937
Test: rebuild
Change-Id: I63b689de4491b664a2d6f88867fbbb9b1da38277
Yi-Ling Chuang [Thu, 21 Nov 2019 06:48:14 +0000 (14:48 +0800)]
Add the impl for the ability to query non-public Slices
Apps get Settings Slices through onGetSliceDescendants(), so adding some
codes here to make us be capable returning non-public Slices. As these
SliceData come from slice_index.db, where SliceDatabaseAccessor is the
middleman for us to access those data, so adding a parameter in
getSliceUris() to determine what data should be returned.
Bug:
141088937
Test: robotests
Change-Id: I411eb1ff194b7c8915b9e7309c684046dbde29fb
Bonian Chen [Tue, 26 Nov 2019 08:45:05 +0000 (08:45 +0000)]
Merge "[Setting] Fix merge conflict"
Raff Tsai [Tue, 26 Nov 2019 08:07:40 +0000 (00:07 -0800)]
Merge "Prevent null point exception" am:
45b03edd00 am:
bfa1f2979e
am:
14990a1901
Change-Id: I5ef5583fb0c1a0943941a378d4421bedec703371
Raff Tsai [Tue, 26 Nov 2019 08:04:15 +0000 (00:04 -0800)]
Merge "Prevent null point exception" am:
45b03edd00
am:
bfa1f2979e
Change-Id: Ib0afc6d71113b52fc63caf5b960ca7239a5c364c
Raff Tsai [Tue, 26 Nov 2019 08:02:27 +0000 (00:02 -0800)]
Merge "Prevent null point exception"
am:
45b03edd00
Change-Id: Ifbcf83606e115cb1a759382b38949f49af4e4112
TreeHugger Robot [Tue, 26 Nov 2019 07:22:53 +0000 (07:22 +0000)]
Merge "Add FutureTask approach in DashboardFragment"
Bonian Chen [Tue, 26 Nov 2019 07:14:02 +0000 (15:14 +0800)]
[Setting] Fix merge conflict
Fix merge conflict for I367ae3a5f97ff92e03312bed6fe37727ae3798ab
Bug:
144960427
Test: build pass
Change-Id: I24d684b4e695e8ab777f2ba7811b93f6028260d9
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
Treehugger Robot [Tue, 26 Nov 2019 07:10:47 +0000 (07:10 +0000)]
Merge "Prevent null point exception"
Bonian Chen [Tue, 26 Nov 2019 05:48:54 +0000 (21:48 -0800)]
Merge "[Settings] Fix test case" am:
9d66571966 am:
1aac3bb569
am:
5b6dcf42af
Change-Id: Ia68856654d377c38444299282a7d4e1bb5c4c6e5
Bonian Chen [Tue, 26 Nov 2019 05:46:21 +0000 (21:46 -0800)]
Merge "[Settings] Fix test case" am:
9d66571966
am:
1aac3bb569
Change-Id: I699e94aef7180509ca1f8bf4dd8d4f6ade7413fd
Bonian Chen [Tue, 26 Nov 2019 05:43:52 +0000 (21:43 -0800)]
Merge "[Settings] Fix test case"
am:
9d66571966
Change-Id: Ieea99bd4da19962a6d7bd826b6678168e755cf2f
Bonian Chen [Tue, 26 Nov 2019 05:32:00 +0000 (05:32 +0000)]
Merge "[Settings] Fix test case"
Bonian Chen [Tue, 26 Nov 2019 05:31:39 +0000 (05:31 +0000)]
Merge "[Settings] Re-enable test case"
Raff Tsai [Tue, 26 Nov 2019 05:31:36 +0000 (05:31 +0000)]
Merge "Remove shadow below the actionbar"
Raff Tsai [Tue, 26 Nov 2019 04:05:58 +0000 (12:05 +0800)]
Prevent null point exception
Test: Settings -> click search bar, not seeing null point exception
Change-Id: Ib9df9d97b374246fa36c79f531760b57d7c6c508
Sunny Shao [Mon, 18 Nov 2019 08:38:19 +0000 (16:38 +0800)]
Add FutureTask approach in DashboardFragment
- Use the multiple tasks to enhance the controllers loading.
Bug:
137558156
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.dashboard
Change-Id: I629ff5dc81347cddf9762a87015b9b86b6a46e50
Raff Tsai [Mon, 25 Nov 2019 08:58:14 +0000 (16:58 +0800)]
Remove shadow below the actionbar
Bug:
141601408
Test: manual
Change-Id: Iaa196ff3b67dbc274116b5215ef48e126099edb9
Jay Aliomer [Thu, 24 Oct 2019 17:42:38 +0000 (13:42 -0400)]
Fix Master: Add settings for scheduling dark theme
Adding a settings page similar to night light for Dark theme. it will allow the user to schedule
dark mode from sunrise to sunset
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"
Fixes:
141567787
Change-Id: Iee5d020ac6ea093be712a4f191d4601c9d4617fa
Bill Yi [Mon, 25 Nov 2019 16:30:37 +0000 (08:30 -0800)]
[automerger skipped] Import translations. DO NOT MERGE am:
5dd4272ee4 -s ours
am:
2245b41b31 -s ours
am skip reason: subject contains skip directive
Change-Id: If89fcb13087b6a6c27bbc9e35b77e435b35b24f7
Bonian Chen [Mon, 25 Nov 2019 16:26:00 +0000 (08:26 -0800)]
[automerger skipped] Merge "[Settings] Fix conflict of AOSP merge on wifi call" am:
95e1c8d099 am:
d7f0fb6cc1
am:
8efd95c413 -s ours
am skip reason: change_id Idb063bdab3d3b11c348804c1c0ecb268cca3068e with SHA1
2aafbd38e7 is in history
Change-Id: I55c5c96a2855c56bbc8c3dc46a0afea5909aafbf
Jay Aliomer [Mon, 25 Nov 2019 16:17:29 +0000 (08:17 -0800)]
[automerger skipped] Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev am:
26ce6885c9
am:
c2302a3d93 -s ours
am skip reason: change_id I8f05b50f8198c4b2565bb9b6f62ddda5029c8365 with SHA1
abf06340cb is in history
Change-Id: I59a988a34d06d6f6a64f3c207b907726f4a7dade
Bill Yi [Mon, 25 Nov 2019 16:12:33 +0000 (08:12 -0800)]
[automerger skipped] Import translations. DO NOT MERGE am:
adfc51a550 -s ours
am:
0014dd2d63 -s ours
am skip reason: subject contains skip directive
Change-Id: I3fdb30af2db3035e4e4a39f4e72e0cf3f950765f
OSDN Git Service
