Commit Graph

46416 Commits

Author SHA1 Message Date
TreeHugger Robot
04af70a604 Merge "Revert "Settings: Add logical camera default switch"" 2018-06-04 17:35:57 +00:00
TreeHugger Robot
e763ebcba1 Merge "Add Wifi calling Preference slice and other cleanup" 2018-06-01 22:32:11 +00:00
TreeHugger Robot
4661045f2c Merge "Add Slices for Enhanced 4G LTE" 2018-06-01 21:28:11 +00:00
TreeHugger Robot
b6ce6d3663 Merge "Removed guest user access to Tap & Pay via Search." 2018-06-01 19:06:39 +00:00
Bill Yi
05e543299c [automerger skipped] Import translations. DO NOT MERGE am: 8c56825ecd -s ours
am: 5236bf8780  -s ours

Change-Id: Ibdb9322f8935be31ef56c583bc90ab4ac5a49c39
2018-06-01 11:23:28 -07:00
Bill Yi
5236bf8780 [automerger skipped] Import translations. DO NOT MERGE
am: 8c56825ecd  -s ours

Change-Id: I3a9cfd19929f45a1d551c2e09d5b7e67103a89aa
2018-06-01 11:19:28 -07:00
Naina Nalluri
6b1869351a Add Wifi calling Preference slice and other cleanup
WifiCallingPreference Slice Provider:
  1. If Wifi calling is not enabled - display message to user
     to enable Wifi calling
  2. Else if Wifi preference is not editable - return a null
     Slice
  3. Else provide a slice with rows - first row giving current pref
     information, followed by preference items (in each row).
     wifi_only is displayed only when it is allowed to display it.
     Each row with preference item has specific intent action.
WifiCallingPreference Slice BroadcastReceiver:
   1. If only Wifi calling is enabled & Wifi preference is editable &
      there is a change in current value modify wifi pref setting
   2. And Ask to re-query the slice in one second to display
      updated settings if 1 is valid or display appropriate message.
Clean-up:
   1. Return null instead of non-actionable slices.
   2. Use getText to get string resources.
   3. Remove unnecessary extra variables.

Bug: 79548264
Test: Use support-slices-demos-debug.apk to test on device
Change-Id: I186f19be2007c2331eaf6195e70b4a9c635adf9e
2018-06-01 11:02:59 -07:00
Andre Garivay
6d48242da7 Removed guest user access to Tap & Pay via Search.
Gathered user info to verify that user is not a guest. If user is a
guest (and only a guest: other alternate users may use the feature),
they are not allowed to load the nfc_payment_settings xml file.

Change-Id: I5700b9cd4b639b031b6d464827d16f4ea4cfa03f
Fixes: 80111261
Test: Robotests
2018-06-01 09:57:23 -07:00
Beverly
23ea118788 Increase char limit to 76 for Settings string
Test: n/a
Change-Id: I97ac988fc85e8e7cbde516d9d8ad2dc86dee7e80
Fixes: 80200230
2018-06-01 10:14:15 -04:00
TreeHugger Robot
eec3faea44 Merge "Fix null pointer in StarredContactsPrefController" 2018-06-01 12:07:30 +00:00
TreeHugger Robot
8885e93f90 Merge "Import translations. DO NOT MERGE" 2018-06-01 06:06:36 +00:00
Ryan Lin
1e7e455495 Merge "Handle Bluetooth is not supported on emulator" into pi-dev am: 942b07da93
am: 15eb7fe8c4

Change-Id: I515f9679afa7962fda4f2d04392007d201468070
2018-05-31 22:41:53 -07:00
Bill Yi
8c56825ecd Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I67611d91d92e62641467382da0079497eb5dcd06
2018-05-31 22:05:33 -07:00
Bill Yi
cd69e1f808 Import translations. DO NOT MERGE
Change-Id: I01a0990e89de81507a540cbaa6b1bd1b2de3b2f9
Auto-generated-cl: translation import
2018-05-31 21:25:44 -07:00
Ryan Lin
15eb7fe8c4 Merge "Handle Bluetooth is not supported on emulator" into pi-dev
am: 942b07da93

Change-Id: I9977e19cc055effe3c9ce91a2665462957a97481
2018-05-31 17:16:12 -07:00
Ryan Lin
942b07da93 Merge "Handle Bluetooth is not supported on emulator" into pi-dev 2018-05-31 23:22:30 +00:00
Beverly
dc0c9a0ab9 Merge "No need for "and" - ListFormatter adds it" into pi-dev am: fa01fcb2c9
am: 60d57976bc

Change-Id: I77f7aa7076786c6f3855f9b976cfa70e23f0d8a0
2018-05-31 16:03:12 -07:00
Matthew Fritze
adff8a2643 Merge "Make Settings Slider Slices one row" into pi-dev am: 4199198ec2
am: 2c7fe6f8ea

Change-Id: I0910df206d702cc348371c57da27ddf698faa6ff
2018-05-31 15:38:17 -07:00
Shuzhen Wang
6cd426482e Revert "Settings: Add logical camera default switch"
This reverts commit 5aab8d9ee1.

Reason for revert: This setting is for internal QC purpose only
Bug: 80007047

Change-Id: Id5f01e5de94ffaa86de1e96f6bde1092b0c586a2
2018-05-31 22:29:29 +00:00
TreeHugger Robot
2760369d4f Merge "Added keyword 'bug' to Send Device Feedback" 2018-05-31 21:35:15 +00:00
Beverly
1aa6826e80 Fix null pointer in StarredContactsPrefController
Change-Id: I9b2209825b30a6cc8dfe355632201b8082572dbb
Fixes: 80084826
Test: ZenModeStarredContactsPreferenceControllerTest.java
2018-05-31 17:29:08 -04:00
Beverly
60d57976bc Merge "No need for "and" - ListFormatter adds it" into pi-dev
am: fa01fcb2c9

Change-Id: If899d486356937f740a959f1ca6d94b8675d857a
2018-05-31 14:24:11 -07:00
Matthew Fritze
2c7fe6f8ea Merge "Make Settings Slider Slices one row" into pi-dev
am: 4199198ec2

Change-Id: I3716adf421c539c4a4f0617a5ab8d1a1f89e7cbc
2018-05-31 11:37:19 -07:00
TreeHugger Robot
fa01fcb2c9 Merge "No need for "and" - ListFormatter adds it" into pi-dev 2018-05-31 18:12:00 +00:00
Josh Hou
606222da7f Add Slices for Enhanced 4G LTE
Add Slices for Enhanced 4G LTE
Enhanced 4G LTE Slice Provider:
Create slice to display appropriate message with further instructions
Enhanced 4G LTE Slice Broadcast Reciver:
1. Change the setting via ImsManager
2. Ask to requery the slice in one second to display updated settings if 1 is valid or display appropriate message

Bug: 79270171
Test: Robotests
Test: Use support-slices-demos-debug.apk to test on device
Change-Id: I48d412de94d5d9f1ad42a299691ec5cf8001c6a1
2018-05-31 10:34:00 -07:00
TreeHugger Robot
4199198ec2 Merge "Make Settings Slider Slices one row" into pi-dev 2018-05-31 16:03:25 +00:00
Beverly
ab5a016e26 No need for "and" - ListFormatter adds it
Test: manual, visual inspection
Change-Id: I5ce1442cc762c9c0ca22827df429dc64714c2f20
Fixes: 80303010
2018-05-31 09:32:26 -04:00
TreeHugger Robot
e68598380e Merge "Shown toast when BT turned on" 2018-05-31 07:00:27 +00:00
ryanywlin
d67314e771 Handle Bluetooth is not supported on emulator
- Disable audio swicher while Bluetooth feature is not supported
- Error handle before using LocalBluetoothManager in the constructor

Bug: 80491267
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j42

Change-Id: I971f31cd08dd0a2778548f6d1d675f279d92ef8e
2018-05-31 12:48:13 +08:00
Weien Wang
31f17d88d0 Merge "Fix the battery icon on the battery page when low battery" 2018-05-31 04:37:05 +00:00
hughchen
3051845840 Shown toast when BT turned on
* Shown "Bluetooth turned on" toast only when BT turned on in "Pair new device"
* Add test to verify shown toast function can be called when BT turned on.

Bug: 79383997
Test: make -j42 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothPairingDetailTest
Change-Id: I25f75aaa04063d9ef8a0df4bb06aeaa70d7ac146
2018-05-31 11:03:37 +08:00
TreeHugger Robot
d3fede04a8 Merge "Add strings for multiple user footer" 2018-05-30 23:53:34 +00:00
TreeHugger Robot
32f70ecd95 Merge "Use settingslib shadows in Settings robotest" 2018-05-30 23:00:20 +00:00
Matthew Fritze
93307cdb69 Make Settings Slider Slices one row
To unify all Settings slices into one row, we change
Settings Slider from user a header and a input range to
only using an Input Range.

Change-Id: I61715a45b29b6a52a47711811e5c6b2c83d50901
Fixes: 80430118
Test: robotests
2018-05-30 15:39:43 -07:00
Fan Zhang
fb6f95fb99 Add strings for multiple user footer
Bug: 72319180
Test: rebuild
Change-Id: If12ff75555aa362c8663dc19ca6ba4d99a7c8a47
2018-05-30 15:38:26 -07:00
TreeHugger Robot
ae20b1ef0c Merge "Added new keywords to adaptive brightness results." 2018-05-30 22:35:38 +00:00
Fan Zhang
6fc7ebd72b Use settingslib shadows in Settings robotest
Change-Id: Ieae5d65bb5efdbc4c91455d1f722e84fe9e60116
Fixes: 80428049
Test: robotest
2018-05-30 14:36:26 -07:00
Michael
6097fe9c3e Added new keywords to adaptive brightness results.
Added two new strings to the string resource. Added smart brightness and
dyanmic brightness.

Fixes: 80481385
Test: UI change
Change-Id: Iafde3501d41cac13d5f6da16e4575518c8e7ffa9
2018-05-30 14:26:40 -07:00
Andre Garivay
81bb3cfbf4 Added keyword 'bug' to Send Device Feedback
Added string resource for keywords

Change-Id: I174a401bab93672a2260cf342c6bf52c311383d3
Fixes: 80419062
Test: UI change
2018-05-30 14:26:16 -07:00
Hansong Zhang
f1dc08a608 [automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d am: 48aa959b14 am: 7cc441bf2f -s ours am: acfbc0eff4
am: 6197f671b2  -s ours

Change-Id: Ib3ccb0ba92d443b4cd85f4f93c24292bf3efaace
2018-05-30 14:11:13 -07:00
Hansong Zhang
6197f671b2 [automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d am: 48aa959b14 am: 7cc441bf2f -s ours
am: acfbc0eff4

Change-Id: If3486b74a7b37cf12637aabeeece719c9567093a
2018-05-30 13:59:15 -07:00
Hansong Zhang
acfbc0eff4 [automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d am: 48aa959b14
am: 7cc441bf2f  -s ours

Change-Id: I19de0cbe315d298550edfb85039fbc87c42e6dc6
2018-05-30 13:41:41 -07:00
Hansong Zhang
7cc441bf2f DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d
am: 48aa959b14

Change-Id: I13480b0bf786ddd05959cb597492041e273d920c
2018-05-30 13:32:52 -07:00
TreeHugger Robot
2c032fdd19 Merge "Stop using AppState for app icon in DomainAppPreference." 2018-05-30 20:31:54 +00:00
Hansong Zhang
48aa959b14 DO NOT MERGE Give PBAP permission only after user confirms
am: e36ca3e96d

Change-Id: I6fe221ad379ab6398b01bfb96fe7390d0369c15d
2018-05-30 13:23:53 -07:00
TreeHugger Robot
ad90960b6e Merge "delete DeviceInfoSettings and activity, pref xml" 2018-05-30 20:14:50 +00:00
Fan Zhang
179f537173 Stop using AppState for app icon in DomainAppPreference.
Change-Id: I080ed9d2d7d70c092bec54ed4e4b6bb2b6c8f453
Fixes: 77967533
Test: robotest
2018-05-30 12:33:26 -07:00
TreeHugger Robot
50437769a2 Merge "Skip device index job if caller is not Settings app." 2018-05-30 18:40:21 +00:00
Hansong Zhang
aaf637ff5f Merge "Give PBAP permission only after user confirms" into pi-dev am: fcac34d723
am: cd09ff50bb

Change-Id: I404d323a39dc7a42f20c3411aebb2237c1fb13f3
2018-05-30 10:46:36 -07:00
Hansong Zhang
cd09ff50bb Merge "Give PBAP permission only after user confirms" into pi-dev
am: fcac34d723

Change-Id: I96b3a2f59ff77d646c641043428db673eaaf2653
2018-05-30 10:41:35 -07:00