Commit Graph

36008 Commits

Author SHA1 Message Date
Amin Shaikh
1383a9e882 Revert "Update "Open networks available" toggle to instead open notification channel preferences." am: dfa9bb8914
am: c3666f1c35

Change-Id: I1a7446265677c35ef6d000a77383916d584a3a72
2017-05-12 09:00:24 +00:00
Matthew Fritze
031bb4e3a5 Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev am: b38c1e5353
am: 01f5f5d5c9

Change-Id: I2eebd4c6d7b7452d419d02df2dc378bc6847901b
2017-05-12 08:59:41 +00:00
Chris Wren
fed86ddf91 Merge "add a global control for badging" into oc-dev am: 1425b91bac
am: aebf049b4f

Change-Id: I68417e74c7a46cf6283529f17a5f3f9d5547354a
2017-05-12 08:59:11 +00:00
jackqdyulei
4f93c27831 Merge "Add animation for battery asyncLoader." into oc-dev am: 6c680a36c5
am: 4b749c2b0a  -s ours

Change-Id: Ic9916764c661041609a80ffe4edc35406ff10cad
2017-05-12 08:58:41 +00:00
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
Amin Shaikh
c3666f1c35 Revert "Update "Open networks available" toggle to instead open notification channel preferences."
am: dfa9bb8914

Change-Id: I7e651b05a13d9c9149149d4161da440a9a0f31d6
2017-05-12 06:48:04 +00:00
Matthew Fritze
01f5f5d5c9 Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev
am: b38c1e5353

Change-Id: Ia8323363dabd6937a33c6b53ea6755c904e776d4
2017-05-12 06:46:32 +00:00
Chris Wren
aebf049b4f Merge "add a global control for badging" into oc-dev
am: 1425b91bac

Change-Id: Iaf8eb302360f077b1629a170675ebc3f5e794fa6
2017-05-12 05:57:49 +00:00
jackqdyulei
4b749c2b0a Merge "Add animation for battery asyncLoader." into oc-dev
am: 6c680a36c5

Change-Id: I7a04ed25dd48fdb9f3837f03c93dc4818aaadfde
2017-05-12 04:58:12 +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
b38c1e5353 Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev 2017-05-12 02:04:38 +00:00
Chris Wren
1425b91bac Merge "add a global control for badging" into oc-dev 2017-05-12 01:49:07 +00:00
TreeHugger Robot
6c680a36c5 Merge "Add animation for battery asyncLoader." into oc-dev 2017-05-12 01:35:23 +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
jackqdyulei
a3c528f64d Add animation for battery asyncLoader.
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
Merged-In: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
2017-05-11 15:27:23 -07: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
Chris Wren
485e75e063 add a global control for badging
Bug: 36021111
Test: make RunSettingsRoboTests
Change-Id: I7ffd2ade4c927d261e302ddadfae486040d62824
2017-05-11 17:22:32 -04: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
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  -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