Bill Yi
e616b683bc
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 8a9c47e1ba
2018-05-12 22:14:43 -07:00
TreeHugger Robot
8a9c47e1ba
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-05-13 05:08:26 +00:00
Bill Yi
9c5d8fdc5a
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ide496214e78fbc4bdbd606ecff720a8cf988daa5
2018-05-12 12:16:11 -07:00
Salvador Martinez
34b1805053
[automerger skipped] Merge "Make it so client code does not tie tether to wifi" into pi-dev am: f005640b9c
...
am: de5cc27f0f
2018-05-11 21:47:42 -07:00
Salvador Martinez
de5cc27f0f
Merge "Make it so client code does not tie tether to wifi" into pi-dev
...
am: f005640b9c
2018-05-11 21:42:41 -07:00
TreeHugger Robot
f005640b9c
Merge "Make it so client code does not tie tether to wifi" into pi-dev
2018-05-12 04:37:27 +00:00
Hansong Zhang
e8cb916849
Remove developer menu: AVDTP delay reports/inband ringing
...
Bluetooth AVDTP delay reports and inband ringing are used by default.
Developer option menu no longer used.
Bug: 79610154
Test: robolectric
Change-Id: I67fe10808151f101fc7e891f75953f8539255026
2018-05-12 00:22:21 +00:00
Hansong Zhang
f4f68c4117
Remove developer menu: AVDTP delay reports/inband ringing
...
Bluetooth AVDTP delay reports and inband ringing are used by default.
Developer option menu no longer used.
Bug: 79610154
Test: robolectric
Change-Id: I67fe10808151f101fc7e891f75953f8539255026
Merged-In: I67fe10808151f101fc7e891f75953f8539255026
2018-05-12 00:22:16 +00:00
Doris Ling
b9a3b0c490
Merge "Update the initial expanded count for apps and notifications." into pi-dev am: 4af11079e8
...
am: b422264d55
2018-05-11 17:17:47 -07:00
TreeHugger Robot
2ba69a08c8
Merge "Update the battery broadcast receiver."
2018-05-12 00:01:12 +00:00
Suprabh Shukla
a8eb28f219
Merge "Unrestricting app when put on power whitelist" into pi-dev am: e70e27ccea
...
am: d47817ffcb
2018-05-11 17:00:22 -07:00
Doris Ling
b422264d55
Merge "Update the initial expanded count for apps and notifications." into pi-dev
...
am: 4af11079e8
2018-05-11 16:50:15 -07:00
Lei Yu
a01cefad2e
Merge "Add help uri for restricted apps page" into pi-dev am: f4c8a4cdf5
...
am: b8cfe7fff0
2018-05-11 16:44:09 -07:00
Doris Ling
4af11079e8
Merge "Update the initial expanded count for apps and notifications." into pi-dev
2018-05-11 23:33:36 +00:00
Suprabh Shukla
d47817ffcb
Merge "Unrestricting app when put on power whitelist" into pi-dev
...
am: e70e27ccea
2018-05-11 16:22:15 -07:00
Lei Yu
b8cfe7fff0
Merge "Add help uri for restricted apps page" into pi-dev
...
am: f4c8a4cdf5
2018-05-11 16:20:23 -07:00
Beverly Tai
451eeaa08a
[automerger skipped] Merge "DO NOT MERGE Add DND Settings suggestion" into pi-dev am: 49499bcb06
...
am: e493237128
2018-05-11 16:16:10 -07:00
TreeHugger Robot
e70e27ccea
Merge "Unrestricting app when put on power whitelist" into pi-dev
2018-05-11 23:06:49 +00:00
Lei Yu
f4c8a4cdf5
Merge "Add help uri for restricted apps page" into pi-dev
2018-05-11 23:05:41 +00:00
Lei Yu
d2b295ba36
Update the battery broadcast receiver.
...
Add a type for battery receiver, then in callback client know for
which reason it been invoked:
1. battery level change
2. battery saver state change
3. battery plug state change
So in this CL, we won't update battery tip for battery level change,
then battery tip won't be dismissed by itself.
Also note in onResume() we will manually update battery tip. So if
user stay in battery settings page and close the screen, once he opens
it we will still force update everything.
Fixes: 79171742
Test: RunSettingsRoboTests
Change-Id: I997844216fd8267e545d74e0d434de9e338f76a1
2018-05-11 16:02:07 -07:00
Doris Ling
079738a26a
Merge "Rename settings category." into pi-dev am: a44d07c10d
...
am: 374d15333f
2018-05-11 16:01:38 -07:00
Ryan Lin
18aa25ea47
Merge "Add call volume in sound settings" into pi-dev am: b46389a588
...
am: 71b333f162
2018-05-11 15:44:53 -07:00
Ryan Lin
440e08faf5
Merge "Implement getProfileId() method in the subclass" into pi-dev am: 0a87e54edb
...
am: 325b292eb6
2018-05-11 15:25:02 -07:00
Ryan Lin
b5f9ba4e9b
Merge "Use another callback to notify the updater that UI should be updated" into pi-dev am: dee5035764
...
am: 5d7faa9696
2018-05-11 15:24:30 -07:00
TreeHugger Robot
4ef5b7c738
Merge "Update screen title for lock screen preferences."
2018-05-11 22:05:32 +00:00
Fan Zhang
326ff3dbe1
Add help uri for restricted apps page
...
Bug: 77299457
Test: Build
Change-Id: I46c208f9805f47a4f42e44338ea5dce0451dd671
2018-05-11 14:56:49 -07:00
TreeHugger Robot
38be78fbea
Merge "Make pref unsearchable for more availibility status."
2018-05-11 21:53:18 +00:00
Doris Ling
362d783a17
Update the initial expanded count for apps and notifications.
...
- increase it by 1 to accomodate the injected setting.
Change-Id: I0e131c87ffbf2b296b66717b2c6f160abb3b3269
Fixes: 77823915
Test: visual
2018-05-11 14:37:55 -07:00
Beverly Tai
e493237128
Merge "DO NOT MERGE Add DND Settings suggestion" into pi-dev
...
am: 49499bcb06
2018-05-11 14:10:11 -07:00
Suprabh Shukla
0f447022cf
Unrestricting app when put on power whitelist
...
Power whitelisting and background restrictions are opposing rules, so to
keep apps out of confusing states, unrestricting an app whenever it is
put on the power whitelist.
Test: atest RunSettingsRoboTests:HighPowerDetailTest
Bug: 77924141
Change-Id: I4952ac6c893bc7e98aa1b6ad3a86906fc299dea5
2018-05-11 14:00:28 -07:00
Beverly Tai
49499bcb06
Merge "DO NOT MERGE Add DND Settings suggestion" into pi-dev
2018-05-11 20:59:49 +00:00
Beverly
d4e7eedfc9
DO NOT MERGE Add DND Settings suggestion
...
Test: SettingsSuggestionsTest, ZenOnboardingActivityTest
Change-Id: Ie78c9cf8287ee56bc4596efe20d27f8eb432ab6c
Bug: 78445134
2018-05-11 20:59:38 +00:00
Doris Ling
374d15333f
Merge "Rename settings category." into pi-dev
...
am: a44d07c10d
2018-05-11 13:56:47 -07:00
TreeHugger Robot
a44d07c10d
Merge "Rename settings category." into pi-dev
2018-05-11 20:49:35 +00:00
Fan Zhang
ea04e32eed
Update screen title for lock screen preferences.
...
Bug: 71892510
Test: visual
Change-Id: I4abe0c2370f10bb68e668c07a033852601b4c2ab
2018-05-11 13:45:02 -07:00
Ryan Lin
71b333f162
Merge "Add call volume in sound settings" into pi-dev
...
am: b46389a588
2018-05-11 13:36:20 -07:00
TreeHugger Robot
d43283b53a
Merge changes Ic9d1b08c,Id6db9ce2,I7b980218
...
* changes:
Add zen starred contacts preference
Clear deprecated effects when saving zen policy
DND settings redesign
2018-05-11 20:33:10 +00:00
Ryan Lin
325b292eb6
Merge "Implement getProfileId() method in the subclass" into pi-dev
...
am: 0a87e54edb
2018-05-11 13:22:07 -07:00
Ryan Lin
5d7faa9696
Merge "Use another callback to notify the updater that UI should be updated" into pi-dev
...
am: dee5035764
2018-05-11 13:21:29 -07:00
Ryan Lin
b46389a588
Merge "Add call volume in sound settings" into pi-dev
2018-05-11 20:13:16 +00:00
Ryan Lin
0a87e54edb
Merge "Implement getProfileId() method in the subclass" into pi-dev
2018-05-11 19:53:19 +00:00
Ryan Lin
dee5035764
Merge "Use another callback to notify the updater that UI should be updated" into pi-dev
2018-05-11 19:53:19 +00:00
Lei Yu
938176292f
Merge "Remove the padding for VideoPreference" into pi-dev am: d7ebfe3475
...
am: 8abf13ecc2
2018-05-11 12:34:22 -07:00
Fan Zhang
c71d4fc405
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev am: fe522dc2db
...
am: 75cbd6d88d
2018-05-11 12:03:38 -07:00
TreeHugger Robot
1f0ff7214c
Merge "Make local variables final where possible in CredentialStorage"
2018-05-11 19:03:21 +00:00
Lei Yu
8abf13ecc2
Merge "Remove the padding for VideoPreference" into pi-dev
...
am: d7ebfe3475
2018-05-11 11:57:05 -07:00
Todd Kennedy
4fa4eeb675
Merge "OMS: rebase settings when overlays update" into pi-dev am: 203b7b1792
...
am: 45d58cab2c
2018-05-11 11:53:09 -07:00
Fan Zhang
80376a5b46
Make pref unsearchable for more availibility status.
...
Bug: 72748524
Test: robotest
Change-Id: I12b13ac3503f851857787df98a2d2f599c71b9b7
2018-05-11 11:45:02 -07:00
Fan Zhang
75cbd6d88d
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
...
am: fe522dc2db
2018-05-11 11:38:31 -07:00
TreeHugger Robot
d7ebfe3475
Merge "Remove the padding for VideoPreference" into pi-dev
2018-05-11 18:13:48 +00:00
