Doris Ling
d523a72f76
Merge "Fix crash when activity not attached after search index finishes." into oc-dev am: d3e33ebcef
...
am: 93ff2d69f1
Change-Id: I5d55d343a800b343e3cf859ff4cd4381927d56a2
2017-05-12 08:58:02 +00:00
Chris Wren
0e06c31bae
Merge "allow secondary users to use notification settings" into oc-dev am: 72cc7b7915
...
am: 715f096678
Change-Id: I164b72d8bcff91e563b70ad6d7051b4617bc46b2
2017-05-12 08:57:05 +00:00
Doris Ling
93ff2d69f1
Merge "Fix crash when activity not attached after search index finishes." into oc-dev
...
am: d3e33ebcef
Change-Id: Idc21289911d064e676f86bae72bdc188eb07f260
2017-05-12 04:57:40 +00:00
Chris Wren
715f096678
Merge "allow secondary users to use notification settings" into oc-dev
...
am: 72cc7b7915
Change-Id: I0ea930f20fec81b5f2ada8a74f65c68375de8c55
2017-05-12 04:57:08 +00:00
TreeHugger Robot
d3e33ebcef
Merge "Fix crash when activity not attached after search index finishes." into oc-dev
2017-05-12 01:31:21 +00:00
TreeHugger Robot
631120f1ad
Merge "Add bluetooth visible item"
2017-05-11 23:45:29 +00:00
TreeHugger Robot
b823fcc431
Merge "Add animation for battery asyncLoader."
2017-05-11 23:07:00 +00:00
TreeHugger Robot
eb9c9fb569
Merge "Refactor choose lock password scrolling"
2017-05-11 22:41:15 +00:00
Bill Yi
f36cf55b94
Merge "Import translations. DO NOT MERGE"
2017-05-11 21:47:42 +00:00
Chris Wren
72cc7b7915
Merge "allow secondary users to use notification settings" into oc-dev
2017-05-11 21:31:46 +00:00
Maurice Lam
c41e408aea
Refactor choose lock password scrolling
...
Replace the negative margin + inset background hack with a overriding
call to requestRectangleOnScreen, which will also make a best effort
to show all the password requirements if there are multiple of them.
Bug: 38236574
Test: Added ScrollToParentEditTextTest
Change-Id: Id570652b64434b2d0b25c231540375d93884aaa9
2017-05-11 19:26:12 +00:00
Maurice Lam
3ffdc4d15b
Merge "Check for sidecar null-ness before removing" into oc-dev am: 59f965d698
...
am: 7e60ce0109
Change-Id: I7551cd4c9d045f274ceac271da71667aeb275966
2017-05-11 18:52:45 +00:00
Maurice Lam
7e60ce0109
Merge "Check for sidecar null-ness before removing" into oc-dev
...
am: 59f965d698
Change-Id: Ia9a520419b67304342b528220a592c7629e4c1bc
2017-05-11 18:20:19 +00:00
jackqdyulei
ae86781edd
Add bluetooth visible item
...
Show "Visible as [Device name]". Also remove the menuitem for
changing device name.
This cl creates a preference controller to handle the logic for
device name preference.
Bug: 35876447
Test: RunSettingsRoboTests
Change-Id: I9ab6c9d2df5b053d15b8ff887073ef82616243a4
2017-05-11 11:12:25 -07:00
Bill Yi
57fa84ccfd
Import translations. DO NOT MERGE
...
Change-Id: I7847ecf70524ecfc31bc2a661d7d4630b5e980b3
Auto-generated-cl: translation import
2017-05-11 11:10:10 -07:00
Chris Wren
9749835904
allow secondary users to use notification settings
...
Bug: 38197667
Test: manual
Change-Id: Ib3b5f865eccc4e47ea00b190e402c3668559f427
2017-05-11 17:51:43 +00:00
Maurice Lam
59f965d698
Merge "Check for sidecar null-ness before removing" into oc-dev
2017-05-11 17:35:17 +00: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
Bill Yi
6f33a52d32
Merge "Import translations. DO NOT MERGE" into oc-dev am: f1730bee90 -s ours
...
am: ee8789939e -s ours
Change-Id: I4078ac746b6c2382d26ef9a1aa750c09bd414ede
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
Change-Id: Ieec705671f062119f67a94b559edc40762d90950
2017-05-11 06:18:36 +00:00
Bill Yi
ee8789939e
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: f1730bee90 -s ours
Change-Id: Ia9300d42352834b86cd789d6e8167d0c47220a65
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
Change-Id: Ifa0d367e40647ce825e90985658dc6a042edc2bd
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
Change-Id: Ic6c6e8eb3e1bf0d5597e0d9e83b327265c847b3b
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
Change-Id: I9a07ac3ab22585c93f0f8d90f324dab99e24ca7f
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
Change-Id: I7194c8f3a1e17cc7b44548f97b0eabb51d4f6616
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
Change-Id: Ia2204643ca06316a48810660fbbce5758020e45b
2017-05-11 00:53:19 +00:00
Daniel Nishi
123afeae2d
Merge "Fix the top summary layout." into oc-dev am: 154824f124
...
am: 4bff3e9841
Change-Id: I5b63fe9eca62a4c3a06206ebc1dfcd63e5b080bc
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
Change-Id: I0024eee4c96f8193d3a8eb94b6199d344c5c6f5d
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
Change-Id: Ic83a42d3fa508b2de14ee377eed6de92970fd31c
2017-05-11 00:22:12 +00:00
Doris Ling
2a23542e68
Merge "Also update the account preferences in displayPreference()." into oc-dev
...
am: cf162d5354
Change-Id: I73133604ea118457e49def80edbdcddb553e9bcd
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
Change-Id: I868f67c90626a39c3c0dd2f4107ab9bd755bb40c
2017-05-11 00:21:06 +00:00
Jesse Evans
28839c0531
Merge "Properly set isInstantApp for power usage page" into oc-dev
...
am: 3c19120945
Change-Id: I1cfc5a19c5a133607e5ebc0731632aca25a8f044
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
Change-Id: I27166b54cd51b055d80a96afded31b2f55dbdb8e
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
Change-Id: I20c3fc6dc977145a9f9938c470ea69a393061000
2017-05-11 00:19:46 +00:00
Daniel Nishi
4bff3e9841
Merge "Fix the top summary layout." into oc-dev
...
am: 154824f124
Change-Id: I5f062c3d6d6df40c0e78f353f608c7efa7137c9f
2017-05-11 00:19:20 +00:00
Daniel Nishi
a3349519d5
Merge "Add the badged icon for Movies & TV." into oc-dev
...
am: 9a5bac7d5a
Change-Id: I59cea940381aa360be456c44afb36c58964c3065
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