Commit Graph

35371 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Matthew Fritze
bdba7ab697 Merge "Remove accessibility duplicates in settings search" into oc-dev
am: 8fc602fed8

Change-Id: Id19a964f26287a8f35a30ea33cf784deab088921
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
1b628ea972 Merge "Update setting icon paddings to align with actionbar title" into oc-dev
am: 8ff8b5e95b

Change-Id: I60efa39b81e3f54f6e3e9c37f45c751dbb48966c
2017-05-10 03:02:21 +00:00
TreeHugger Robot
8ff8b5e95b Merge "Update setting icon paddings to align with actionbar title" into oc-dev 2017-05-10 02:57:19 +00:00
Doris Ling
ce5e0c3dc6 Merge "Fix crash when silencing condition." into oc-dev
am: ba2f3ee3ba

Change-Id: Iee2ce7c27469008142862ab866bf53e9e02d74e1
2017-05-10 01:45:17 +00:00
TreeHugger Robot
ba2f3ee3ba Merge "Fix crash when silencing condition." into oc-dev 2017-05-10 01:40:35 +00:00
Fan Zhang
031c838162 Update setting icon paddings to align with actionbar title
Change-Id: I2aaf37c61ee6098329a9dd5695c516f3db970ada
Fix: 38011653
Test: visual
2017-05-10 00:48:24 +00:00
Matthew Fritze
ec6cfe32fd Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev
am: 120ec5d1eb

Change-Id: Ic9bf5fc2aaa99592c362a3159aea0b11cb7ec950
2017-05-09 21:41:39 +00:00
Bill Yi
6d75c92f32 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 4a0abee70e  -s ours

Change-Id: Ifc6b44fa916a03435be579d49c56362d4b71f576
2017-05-09 21:34:01 +00:00
TreeHugger Robot
120ec5d1eb Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev 2017-05-09 19:59:58 +00:00
TreeHugger Robot
4a0abee70e Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-09 18:25:53 +00:00