Maurice Lam
59f965d698
Merge "Check for sidecar null-ness before removing" into oc-dev
2017-05-11 17:35:17 +00:00
Badhri Jagan Sridharan
d452bd5fe7
Use StartActivityForResult to launch the intent.
...
Revert back to StartActivity once HelpUtils.getHelpIntent is
refactored.
More info in b/38230998
Bug: 36604276
Bug: 33090449
Test: Tapping on Analog accessory notification launch
the support article in GMH app.
Change-Id: If30f7bc627b0a9cf90ceb875665b575e7f69b16d
2017-05-11 10:33:08 -07:00
jackqdyulei
14dcca0e91
Add animation for battery asyncLoader.
...
Fix merge conflict from oc-dev
When battery asyncLoader is loading batterystats, show a battery
placeholder(critical level) and animate to real status once data is
loaded.
Bug: 35917699
Test: RunSettingsRoboTests
Change-Id: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
2017-05-11 10:05:33 -07:00
Matthew Fritze
e2cb72fa7f
Remove dynamic summaries for "On the lockscreen"
...
Bug:36101902
Test: make RunSettingsRoboTests
Change-Id: Ie004f07f4c543a99c2b2ad1e5d7c8b2ef49246d5
2017-05-11 08:54:31 -07:00
Bill Yi
6f33a52d32
Merge "Import translations. DO NOT MERGE" into oc-dev am: f1730bee90 -s ours
...
am: ee8789939e
2017-05-11 11:50:09 +00:00
Stephen Chen
9eecfb3de7
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev am: 25d1848e5f
...
am: ac1b935437
2017-05-11 06:18:36 +00:00
Bill Yi
ee8789939e
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: f1730bee90
2017-05-11 01:21:10 +00:00
Doris Ling
1886fe1bae
Merge "Also update the account preferences in displayPreference()." into oc-dev am: cf162d5354
...
am: 2a23542e68
2017-05-11 01:04:40 +00:00
Roozbeh Pournader
d0f3d716a3
Merge "Set textDirection of app name to locale direction" into oc-dev am: 319250b1eb
...
am: 3a32750ee6
2017-05-11 01:04:05 +00:00
Jesse Evans
eabee5af2f
Merge "Properly set isInstantApp for power usage page" into oc-dev am: 3c19120945
...
am: 28839c0531
2017-05-11 01:03:32 +00:00
Matthew Fritze
a20e068d2c
Merge "Only add icons to settings items with icons" into oc-dev am: ec00573139
...
am: ab13b378c9
2017-05-11 00:54:01 +00:00
Alison Cichowlas
74dd8bd3fb
Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev am: b9a2d6a6e3
...
am: 16bc088c4e
2017-05-11 00:53:19 +00:00
Daniel Nishi
123afeae2d
Merge "Fix the top summary layout." into oc-dev am: 154824f124
...
am: 4bff3e9841
2017-05-11 00:52:43 +00:00
Daniel Nishi
2c00b770eb
Merge "Add the badged icon for Movies & TV." into oc-dev am: 9a5bac7d5a
...
am: a3349519d5
2017-05-11 00:52:07 +00:00
TreeHugger Robot
f1730bee90
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-05-11 00:30:32 +00:00
Stephen Chen
ac1b935437
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev
...
am: 25d1848e5f
2017-05-11 00:22:12 +00:00
Doris Ling
2a23542e68
Merge "Also update the account preferences in displayPreference()." into oc-dev
...
am: cf162d5354
2017-05-11 00:21:31 +00:00
Roozbeh Pournader
3a32750ee6
Merge "Set textDirection of app name to locale direction" into oc-dev
...
am: 319250b1eb
2017-05-11 00:21:06 +00:00
Jesse Evans
28839c0531
Merge "Properly set isInstantApp for power usage page" into oc-dev
...
am: 3c19120945
2017-05-11 00:20:40 +00:00
Matthew Fritze
ab13b378c9
Merge "Only add icons to settings items with icons" into oc-dev
...
am: ec00573139
2017-05-11 00:20:13 +00:00
Alison Cichowlas
16bc088c4e
Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev
...
am: b9a2d6a6e3
2017-05-11 00:19:46 +00:00
Daniel Nishi
4bff3e9841
Merge "Fix the top summary layout." into oc-dev
...
am: 154824f124
2017-05-11 00:19:20 +00:00
Daniel Nishi
a3349519d5
Merge "Add the badged icon for Movies & TV." into oc-dev
...
am: 9a5bac7d5a
2017-05-11 00:18:53 +00:00
Maurice Lam
e1976ac302
Check for sidecar null-ness before removing
...
Test: cd tests/robotests && mma
Bug: 36681116
Change-Id: Id48113502c538b607d92700d3e58943614cfc150
2017-05-10 17:17:44 -07:00
TreeHugger Robot
25d1848e5f
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev
2017-05-11 00:05:53 +00:00
TreeHugger Robot
cf162d5354
Merge "Also update the account preferences in displayPreference()." into oc-dev
2017-05-10 23:39:53 +00:00
Roozbeh Pournader
319250b1eb
Merge "Set textDirection of app name to locale direction" into oc-dev
2017-05-10 23:23:46 +00:00
Bill Yi
dfdad31e93
Import translations. DO NOT MERGE
...
Change-Id: I4a7428ff3dd2681fabcade2cd507c5ac06b78ad5
Auto-generated-cl: translation import
2017-05-10 13:48:13 -07:00
TreeHugger Robot
3c19120945
Merge "Properly set isInstantApp for power usage page" into oc-dev
2017-05-10 20:47:29 +00:00
Lei Yu
7932d5a66f
Merge "Expose mac address in bluetooth main page"
2017-05-10 20:42:03 +00:00
TreeHugger Robot
ec00573139
Merge "Only add icons to settings items with icons" into oc-dev
2017-05-10 20:16:14 +00:00
Roozbeh Pournader
e1e45d02c1
Set textDirection of app name to locale direction
...
Test: Manual
Fixes: 37347408
Change-Id: Icc01f3fdcf584c839cbbff151696171fb3c33c90
2017-05-10 12:56:20 -07:00
Lei Yu
c0d798ff06
Merge "Add feature provider for Bluetooth"
2017-05-10 19:55:17 +00:00
Doris Ling
633250bd78
Also update the account preferences in displayPreference().
...
- start creating the account preferences in displayPreference() to make
the data available earlier.
- when trying to update the UI when the page is resumed, instead of
clearing the whole list and add the latest accounts, compare the
differences between the currently shown accounts and the latest accounts
and only update the account preferences that has been changed.
Change-Id: I249eb2fe67f4adaab02bf77680c62d07756dc94a
Fix: 34035653
Test: make RunSettingsRoboTests
2017-05-10 11:59:47 -07:00
Doris Ling
c55f9f5625
Fix crash when activity not attached after search index finishes.
...
When search indexing completes, check for valid activity before
proceeding with further operations.
Change-Id: I7c72aa358574f79e2184d60bc9d0241595ea5d3b
Fix: 38198223
Test: make RunSettingsRoboTests
2017-05-10 11:52:29 -07:00
Salvador Martinez
37e51e2d3b
Merge "Fix null pointer error && add settings side guard"
2017-05-10 18:50:55 +00:00
Alison Cichowlas
b9a2d6a6e3
Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev
2017-05-10 18:42:54 +00:00
Alison Cichowlas
28543f82f9
Notifications settings updates to match spec:
...
- change badge language & remove summary
- change caps on sound text
Bug: 37479730, 37480708
Test: string changes manually verified
Change-Id: Iae7416cecd2cd6d84c2a05fd707f791bc5fe7ceb
2017-05-10 14:31:01 -04:00
jackqdyulei
d2ba0117fc
Expose mac address in bluetooth main page
...
This mac address means the owned device, not the device
to connect.
Bug: 35875420
Test: RunSettingsRoboTests
Change-Id: I142f49fdca72d8ffbb9b8b2e2666a61aefb80505
2017-05-10 11:18:10 -07:00
Matthew Fritze
5416a5992b
Only add icons to settings items with icons
...
Currently the icon for the category of setting is used for
each setting result. Change it to only add an icon when
it exists in xml.
Bug: 37858983
Test: make RunSettingsRoboTests
Change-Id: Ib95e76c5a9ba2e73738cea716d72c5994a6aa0ba
2017-05-10 11:11:28 -07:00
Stephen Chen
a99b86c56a
Update Wi-Fi Wakeup setting to check whether the feature is available.
...
Bug: 38037361
Test: make ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest
RunSettingsRoboTests -j40
Change-Id: I1c1b930546cc090d72f3047058a428acd1b2883a
2017-05-10 11:06:05 -07:00
Daniel Nishi
154824f124
Merge "Fix the top summary layout." into oc-dev
2017-05-10 17:59:38 +00:00
Daniel Nishi
9a5bac7d5a
Merge "Add the badged icon for Movies & TV." into oc-dev
2017-05-10 17:59:09 +00:00
Alex Salo
2664ccae50
Merge "Location setting now updates summary timely."
2017-05-10 17:49:00 +00:00
Lei Yu
eb030fe391
Merge "Add framework for anomaly detection flags"
2017-05-10 17:39:58 +00:00
Matthew Fritze
ff18ec37dc
Merge "Remove accessibility duplicates in settings search" into oc-dev am: 8fc602fed8
...
am: bdba7ab697
2017-05-10 05:40:55 +00:00
Matthew Fritze
bdba7ab697
Merge "Remove accessibility duplicates in settings search" into oc-dev
...
am: 8fc602fed8
2017-05-10 05:24:56 +00:00
TreeHugger Robot
8fc602fed8
Merge "Remove accessibility duplicates in settings search" into oc-dev
2017-05-10 05:07:53 +00:00
Fan Zhang
7517975834
Merge "Update setting icon paddings to align with actionbar title" into oc-dev am: 8ff8b5e95b
...
am: 1b628ea972
2017-05-10 03:18:53 +00:00
Doris Ling
f4cd59a5b1
Merge "Fix crash when silencing condition." into oc-dev am: ba2f3ee3ba
...
am: ce5e0c3dc6
2017-05-10 03:18:21 +00:00
