Sean Stout
6760508e5e
Merge "Rename ACTION_VIEW_ADVANCED_POWER_USAGE_DETAIL" into qt-dev
...
am: 5a8b2cf1dc
2019-04-16 11:19:11 -07:00
Fan Zhang
9a5481d749
Merge "Use android:attr for display font preview layout background" into qt-dev
...
am: 75691d29ef
2019-04-16 10:48:48 -07:00
Sean Stout
5a8b2cf1dc
Merge "Rename ACTION_VIEW_ADVANCED_POWER_USAGE_DETAIL" into qt-dev
2019-04-16 17:47:29 +00:00
Yanting Yang
18e0119391
Merge "Clean up NotificationChannelSlice" into qt-dev
...
am: 1fa45975eb
2019-04-16 10:25:53 -07:00
Raff Tsai
fbab258c8b
Merge "Tint battery fix icon" into qt-dev
...
am: 77c56714ed
2019-04-16 10:13:51 -07:00
TreeHugger Robot
75691d29ef
Merge "Use android:attr for display font preview layout background" into qt-dev
2019-04-16 17:05:43 +00:00
TreeHugger Robot
1fa45975eb
Merge "Clean up NotificationChannelSlice" into qt-dev
2019-04-16 16:31:22 +00:00
TreeHugger Robot
77c56714ed
Merge "Tint battery fix icon" into qt-dev
2019-04-16 16:25:34 +00:00
Fan Zhang
7f7b9e7736
Merge "Correct the state when prevent ringing page is launched." into qt-dev
...
am: 957da73a7d
2019-04-16 08:33:30 -07:00
Fan Zhang
60fd2efb96
Merge "Update switchbar background color in disabled state." into qt-dev
...
am: cae16fa07b
2019-04-16 08:32:38 -07:00
Amin Shaikh
900d8c9e12
Merge "Create TintDrawable in Settings." into qt-dev
...
am: c4e7cf594c
2019-04-16 08:28:24 -07:00
Fan Zhang
957da73a7d
Merge "Correct the state when prevent ringing page is launched." into qt-dev
2019-04-16 15:22:26 +00:00
Fan Zhang
cae16fa07b
Merge "Update switchbar background color in disabled state." into qt-dev
2019-04-16 15:19:25 +00:00
TreeHugger Robot
c4e7cf594c
Merge "Create TintDrawable in Settings." into qt-dev
2019-04-16 15:16:26 +00:00
Yanting Yang
ce3359f4d4
Clean up NotificationChannelSlice
...
- Remove unused variable.
- Change function interface.
Bug: 123065955
Test: visual, robotests
Change-Id: I39c0a92539d45cdbc11bd9090a3ab97a72482632
2019-04-16 23:08:40 +08:00
Lei Yu
65628c28a9
Merge "Add remote volume slider conditionally." into qt-dev
...
am: ee6825fd5b
2019-04-16 05:58:13 -07:00
TreeHugger Robot
ee6825fd5b
Merge "Add remote volume slider conditionally." into qt-dev
2019-04-16 12:46:55 +00:00
Chandan Nath
552c951808
Merge "If backup service is not available, remove Settings->Backup and Backup->"Backup is disabled by admin" from search results." into qt-dev
...
am: 2ec2c6330e
2019-04-16 04:41:54 -07:00
Chandan Nath
2ec2c6330e
Merge "If backup service is not available, remove Settings->Backup and Backup->"Backup is disabled by admin" from search results." into qt-dev
2019-04-16 11:21:10 +00:00
Raff Tsai
006582b48e
Tint battery fix icon
...
Fixes: 129492004
Test: manual
Change-Id: I161284619bc47e342d78f1507ae291f7c23ad3ff
2019-04-16 17:05:52 +08:00
Antony Sargent
eb16066b90
Merge "Fix problem of multiple stacked copies of "Select SIM" dialog" into qt-dev
...
am: 01b633275a
2019-04-16 01:40:47 -07:00
TreeHugger Robot
01b633275a
Merge "Fix problem of multiple stacked copies of "Select SIM" dialog" into qt-dev
2019-04-16 08:30:30 +00:00
Raff Tsai
22606bcfdd
Merge "Remove error slice from Settings in rendering time" into qt-dev
...
am: e128d27a7a
2019-04-15 22:26:48 -07:00
TreeHugger Robot
e128d27a7a
Merge "Remove error slice from Settings in rendering time" into qt-dev
2019-04-16 05:20:58 +00:00
Felipe Leme
aba152b7ef
Merge "Change Content Capture strings." into qt-dev
...
am: d51e020cc6
2019-04-15 22:08:33 -07:00
Felipe Leme
d51e020cc6
Merge "Change Content Capture strings." into qt-dev
2019-04-16 04:51:24 +00:00
Alex Salo
6f0624a025
Merge "Rename screen aware into screen attention" into qt-dev
...
am: ad4483c2a2
2019-04-15 20:56:13 -07:00
Edgar Wang
515d30f819
Merge ""Disallow adjust volume" restricted dialog didn't show" into qt-dev
...
am: 83fcc3582e
2019-04-15 20:46:16 -07:00
Pasty Chang
686fe46e78
Merge "Set WifiDialog to light theme in setup flow" into qt-dev
...
am: 997128ee91
2019-04-15 20:45:25 -07:00
Fan Zhang
e2a3670672
Merge "Clean up DND slice in search." into qt-dev
...
am: 12ee53f122
2019-04-15 20:43:50 -07:00
Colin Cross
2e7a226e65
Merge "Update Settings for guava 27.1" into qt-dev-plus-aosp
2019-04-16 03:35:51 +00:00
TreeHugger Robot
ad4483c2a2
Merge "Rename screen aware into screen attention" into qt-dev
2019-04-16 03:17:50 +00:00
TreeHugger Robot
83fcc3582e
Merge ""Disallow adjust volume" restricted dialog didn't show" into qt-dev
2019-04-16 03:12:41 +00:00
Pasty Chang
997128ee91
Merge "Set WifiDialog to light theme in setup flow" into qt-dev
2019-04-16 02:53:29 +00:00
Fan Zhang
12ee53f122
Merge "Clean up DND slice in search." into qt-dev
2019-04-16 02:50:10 +00:00
Edgar Wang
73454f2607
"Disallow adjust volume" restricted dialog didn't show
...
root casue: VolumeSeekBarPreference & SeekBarPreference will return
false when call isSelectable() then this preference won't perform Click
Fixes: 123745455
Test: Manual & robotest
Change-Id: Iba27b503e8a272260c80bd41aecdd5cdbc39f962
2019-04-16 09:41:07 +08:00
Sean Stout
44eecb7375
Rename ACTION_VIEW_ADVANCED_POWER_USAGE_DETAIL
...
ACTION_VIEW_ADVANCED_POWER_USAGE_DETAIL is now ACTION_APP_BATTERY_SETTINGS
Test: adb shell am start -a \
"android.settings.VIEW_ADVANCED_POWER_USAGE_DETAIL" -d \
"package:com.google.android.deskclock" --ez \
"request_ignore_background_restriction" 1
Bug: 129901520
Change-Id: Iec103ee46863c05497f9aa53f0ae81b105fdd309
2019-04-15 17:20:02 -07:00
Raff Tsai
000ba3fabe
Remove error slice from Settings in rendering time
...
We filter error slice in EligibleCardChecker but not filter it in
SliceContextualCardRenderer, these two part should use the same
logic.
Fixes:128687331
Test: manual
Change-Id: I217bc6b578ceb36b0a67b44dc8a08ecd02771d82
2019-04-16 07:41:31 +08:00
Jordan Liu
5ccb19e418
[automerger skipped] Merge "Make RadioInfo settings menu work for mSIM" into qt-dev
...
am: 80584fe1f7e431f6337f
2019-04-15 15:35:37 -07:00
Jordan Liu
80584fe1f7
Merge "Make RadioInfo settings menu work for mSIM" into qt-dev
2019-04-15 21:55:43 +00:00
Fan Zhang
dd2efc0073
Update switchbar background color in disabled state.
...
Fixes: 129991749
Test: visual
Change-Id: Ief3a6a09d2ca905e30e74b7cbd6b4c1500311053
2019-04-15 14:25:51 -07:00
Lei Yu
c1dbd34b9d
Add remote volume slider conditionally.
...
Issue before this CL:
RemoteVolumePreferenceController only return available when
it is casting, otherwise return CONDITIONALLY_UNAVAILABLE.
However slice database only index available controllers and keep
this cache. So remote slider won't be indexed if it is not casting
at that time.
As a tmp fix, this CL make controller always return available
unsearchable to make it indexed by database. However only add
that slice if it is casting.
Bug: 130124950
Test: RunSettingsRoboTests
Change-Id: I191144844d6ba7ccbe3dc1c9d19801adb978abc6
2019-04-15 13:49:46 -07:00
Felipe Leme
6beb5e4581
Change Content Capture strings.
...
Test: manual verification
Bug: 129403630
Change-Id: Idfc560c78e29a0557cb009dddf98f4e1ce879f25
2019-04-15 13:08:50 -07:00
Chandan Nath
826a91c56e
If backup service is not available, remove Settings->Backup and Backup->"Backup is disabled by
...
admin" from search results.
"Backup -> Backup" still appears due to the PrivacySettingsActivity. On clicking that,
we get "Backup is disabled by admin" which is OK
Bug: 129743816
Test: 1. atest -v UserBackupSettingsActivityTest
2. atest -v BackupInactivePreferenceControllerTest
3. Create and switch to secondary user. Type "backup" in settings search. Note that only
"Backup->Backup" is shown and on clicking it, we get "Backup is disabled by admin"
Change-Id: Ic13e2d745c9511cbebe27aa4c6f5cd89b277fc37
2019-04-15 20:47:34 +01:00
Jordan Liu
f47e4cc536
[automerger skipped] Merge "Do not reuse phonestatelistener" am: c99fddfe75
...
am: 163634432585f1d2a704
2019-04-15 12:42:46 -07:00
Jordan Liu
1636344325
Merge "Do not reuse phonestatelistener"
...
am: c99fddfe75
2019-04-15 12:37:48 -07:00
Jordan Liu
c99fddfe75
Merge "Do not reuse phonestatelistener"
2019-04-15 19:27:06 +00:00
Fan Zhang
80f0dc61c7
Use android:attr for display font preview layout background
...
Fixes: 117441518
Test: visual
Change-Id: I00ba298c37e9b1dd2bf5bf0890076b204d10de94
2019-04-15 11:26:46 -07:00
Lei Yu
c562fdcebf
Merge "Hide app usage time in high usage dialog" into qt-dev
...
am: 9515a685e3
2019-04-15 11:12:22 -07:00
Lei Yu
9515a685e3
Merge "Hide app usage time in high usage dialog" into qt-dev
2019-04-15 17:54:39 +00:00
