Daniel Nishi
cb66524cdf
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da
...
am: d7685ec8c8
Change-Id: I4686e307154220b5190262f97b2af97c115d9bbe
2017-07-05 20:44:43 +00:00
Daniel Nishi
d7685ec8c8
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
...
am: 37caf9c7da
Change-Id: Ib2f37664e42035e72c0980ac3dc209e47585f95f
2017-07-05 20:42:29 +00:00
Daniel Nishi
37caf9c7da
Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev
2017-07-05 20:40:41 +00:00
jackqdyulei
2a6abb5e80
Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev am: 3a9734261d
...
am: 593049c1d4
Change-Id: Idbdaad128672c06837730863ad2d71446b4642fa
2017-07-05 20:27:29 +00:00
jackqdyulei
593049c1d4
Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev
...
am: 3a9734261d
Change-Id: I03c108b9a4712205906125ea12114e4ed6659255
2017-07-05 20:24:58 +00:00
TreeHugger Robot
3a9734261d
Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev
2017-07-05 20:21:46 +00:00
TreeHugger Robot
aaeb09e6c7
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-01 16:06:05 +00:00
Bill Yi
7df73c0524
Import translations. DO NOT MERGE
...
Change-Id: I67181f9f767d7edccf78f901ad70e903b123649f
Auto-generated-cl: translation import
2017-06-30 18:02:00 -07:00
Fan Zhang
63b43c082d
Change permission preference to only 1 line summary am: 32a8568230
...
am: 33a91c5004
Change-Id: I2e32fe198008b05a779dbfc68fc5695fec10f8bb
2017-07-01 00:49:43 +00:00
Fan Zhang
33a91c5004
Change permission preference to only 1 line summary
...
am: 32a8568230
Change-Id: I5f4cb35694767adc62d5f094e481d1423a85c93b
2017-07-01 00:45:13 +00:00
TreeHugger Robot
25faa52b34
Merge "Move the placeholder in Account detail page above Account sync."
2017-06-30 23:00:19 +00:00
Fan Zhang
32a8568230
Change permission preference to only 1 line summary
...
Test: visual
Change-Id: I0e397c096eac19d312c5632cd7f0a1856c199b96
Fix: 36413664
2017-06-30 22:29:27 +00:00
Daniel Nishi
e6e3752dbf
Merge "Use normal layout for "Space Used" header." into oc-dr1-dev am: 7809c3d2f0
...
am: 0c48b5a29d
Change-Id: I5c8c53050506127697721c971ba18baca6e50487
2017-06-30 22:16:23 +00:00
Daniel Nishi
0c48b5a29d
Merge "Use normal layout for "Space Used" header." into oc-dr1-dev
...
am: 7809c3d2f0
Change-Id: I8eddca071d602cedcdcdbd5f65f5dd5265a084a8
2017-06-30 22:05:33 +00:00
Daniel Nishi
7809c3d2f0
Merge "Use normal layout for "Space Used" header." into oc-dr1-dev
2017-06-30 21:54:38 +00:00
Doris Ling
7ca92571b2
Move the placeholder in Account detail page above Account sync.
...
Change-Id: I812551f3cccf3b107d2a2532170ef0ef3157bee1
Fix: 62364991
Test: visual
2017-06-30 13:44:24 -07:00
jackqdyulei
a66363a787
Make items in Advanced battery page unclickable.
...
Because these items only display info and have no click action:
1. foreground time item
2. background time item
3. battery usage item
Bug: 62423725
Test: Build
Change-Id: I8d15be13953c73fce4d5f42711e186673673a036
2017-06-30 11:11:16 -07:00
Lei Yu
6f19d968bf
Merge "Update strings for anomaly dialog" into oc-dr1-dev am: 2354fae941
...
am: 34c96fff5c
Change-Id: I254eb9ccac2190030bc0f920c053f93570b6ef2b
2017-06-29 22:17:33 +00:00
Lei Yu
34c96fff5c
Merge "Update strings for anomaly dialog" into oc-dr1-dev
...
am: 2354fae941
Change-Id: Ief85db7f1134036ced0eac6f07c0d6a15603ee73
2017-06-29 22:13:36 +00:00
Lei Yu
2354fae941
Merge "Update strings for anomaly dialog" into oc-dr1-dev
2017-06-29 22:08:40 +00:00
Daniel Nishi
7aad345862
Use normal layout for "Space Used" header.
...
This fixes the issue where the indentation was wrong.
Change-Id: Ie16bcdec87aa8605d65ac33a05c12d7a26b89b55
Fixes: 62548754
Test: Manual
2017-06-29 12:37:23 -07:00
Doris Ling
cf57e17791
Merge "Add account sync summary." into oc-dr1-dev
...
am: 5243d5dd85
Change-Id: I00eb5bae671c4e4427c8af04abb541b0f1e74d60
2017-06-29 19:02:29 +00:00
Daniel Nishi
05d49497b9
Storage item preferences should be 72dp tall.
...
In changing the layout, this also centers the icon properly.
Change-Id: I8fa36e18cf4a0d5765ccbe65a7975fd71832a9ae
Fixes: 62548432
Bug: 62581475
Test: Manual
2017-06-29 12:01:59 -07:00
TreeHugger Robot
5243d5dd85
Merge "Add account sync summary." into oc-dr1-dev
2017-06-29 18:58:58 +00:00
TreeHugger Robot
b5ef73ebcb
Merge "Add ordering attribute to sound setting preferences."
2017-06-29 17:12:36 +00:00
jackqdyulei
d26dcbd95f
Update strings for anomaly dialog
...
1. Add message for new force stop dialog, which is used for wakeup alarm
anomaly
2. Change message for background usage dialog by adding the force stop
action
Bug: 63037765
Test: screenshots
Change-Id: I8ecbf9c517eee7e31ae39509c9112b53ef1225c6
2017-06-29 10:02:25 -07:00
Fan Zhang
2e72dda1aa
Add ordering attribute to sound setting preferences.
...
The ordering helps injected settings show up before work profile
settings.
Change-Id: Id840b721fc3ef82f53591a16b385965f7a719b67
Fix: 62997256
Test: visual
2017-06-28 18:14:18 -07:00
Doris Ling
5d66fa4c94
Merge "Change to use new suggestion/condition UI." into oc-dr1-dev
...
am: 9df70249b9
Change-Id: I4d245fa2b74d5e6967a522455584971b8c9fb711
2017-06-29 01:11:57 +00:00
TreeHugger Robot
2d6930b2df
Merge "Add account sync summary."
2017-06-29 01:11:43 +00:00
TreeHugger Robot
9df70249b9
Merge "Change to use new suggestion/condition UI." into oc-dr1-dev
2017-06-29 01:04:58 +00:00
TreeHugger Robot
b0eaab5738
Merge "Fix preference title typo in saved network screen"
2017-06-28 21:24:55 +00:00
Daniel Nishi
65a628751e
Merge "Put the donut on a diet." into oc-dr1-dev am: 2cbe278ad4
...
am: 7cc286bac7
Change-Id: I7ff03385d589e1fd147f05cd417fbaba144a3e3c
2017-06-28 21:07:26 +00:00
Daniel Nishi
7cc286bac7
Merge "Put the donut on a diet." into oc-dr1-dev
...
am: 2cbe278ad4
Change-Id: I156d0acacd4933247634d7915defa9fbe73a0ba0
2017-06-28 20:59:52 +00:00
Daniel Nishi
2cbe278ad4
Merge "Put the donut on a diet." into oc-dr1-dev
2017-06-28 20:54:57 +00:00
Doris Ling
e76550a66e
Add account sync summary.
...
- Check for the number of sync adapter that is enabled for the account and
update the summary text for the account sync preference accordingly.
- Add divider above the Remove Account button.
Merged-In: Ic333f62cce9aed0a72771324976ebe3d8e586287
Change-Id: I003d6dd0a070bf123f178b8d9ba7b6657466b905
Fix: 62862167
Test: make RunSettingsRoboTests
2017-06-28 13:37:17 -07:00
TreeHugger Robot
84872626cd
Merge "Change to use new suggestion/condition UI."
2017-06-28 20:27:27 +00:00
Doris Ling
771848dde0
Add account sync summary.
...
- Check for the number of sync adapter that is enabled for the account
and
update the summary text for the account sync preference accordingly.
- Add divider above the Remove Account button.
Bug: 62862167
Test: make RunSettingsRoboTests
Change-Id: Ic333f62cce9aed0a72771324976ebe3d8e586287
2017-06-28 13:18:56 -07:00
jackqdyulei
f1d0308ae7
Merge "Update the UI for battery header" into oc-dr1-dev am: 923f50fce6
...
am: 9d4a2806a8
Change-Id: I28f110fef49db0aca036eb06c5c3f4d1249522de
2017-06-28 19:48:24 +00:00
jackqdyulei
9d4a2806a8
Merge "Update the UI for battery header" into oc-dr1-dev
...
am: 923f50fce6
Change-Id: Iee54c0fa4ff744ecadefe8fa75e069920569cb9e
2017-06-28 19:44:55 +00:00
TreeHugger Robot
923f50fce6
Merge "Update the UI for battery header" into oc-dr1-dev
2017-06-28 19:37:40 +00:00
Doris Ling
b99af0e4a2
Change to use new suggestion/condition UI.
...
Change to always use the new UI that combines the suggestion and conditions,
and remove all codes relating to the old UI.
Fix: 37645754
Fix: 62621808
Test: make RunSettingsRoboTests
Merged-In: I3421a9e5182f6606843392d6fae8b9f07c5f2e46
Change-Id: I5ef169a563166520dad0ac44f6780da814e2f1f7
2017-06-28 12:22:34 -07:00
Fan Zhang
79d8fbb789
Fix preference title typo in saved network screen
...
Change-Id: If6df7d42379d8597fcdcd20f71c88376a972ee70
Fix: 33909403
Test: reindex search
2017-06-28 12:17:43 -07:00
Daniel Nishi
e55bffaf59
Put the donut on a diet.
...
Shrinks the donut from 6dp to 4dp to closer match the mocks.
Change-Id: Iaf455beb4f54e7673ff6adc6068e0410fac379b5
Fixes: 62548749
Test: Manual
2017-06-28 18:29:40 +00:00
Doris Ling
631893f582
Change to use new suggestion/condition UI.
...
Change to always use the new UI that combines the suggestion and conditions,
and remove all codes relating to the old UI.
Bug: 37645754
Bug: 62621808
Test: make RunSettingsRoboTests
Change-Id: I3421a9e5182f6606843392d6fae8b9f07c5f2e46
2017-06-28 11:22:44 -07:00
Lei Yu
db62b52119
Merge "Add location check action for bt anomaly" into oc-dr1-dev am: a6b24388fc
...
am: 91dbfc6ee9
Change-Id: Ib7f5560b4ef44cb14bcf5e3633b09d179816b221
2017-06-28 18:13:20 +00:00
Lei Yu
91dbfc6ee9
Merge "Add location check action for bt anomaly" into oc-dr1-dev
...
am: a6b24388fc
Change-Id: I2f1e1b65a5d7583ff76d77d3923df5ad7e1e652e
2017-06-28 18:05:34 +00:00
Lei Yu
a6b24388fc
Merge "Add location check action for bt anomaly" into oc-dr1-dev
2017-06-28 17:54:59 +00:00
Fan Zhang
8072ff4220
Merge "Update string: Gesture setting title" into oc-dr1-dev am: b365594242
...
am: 1d16eb3622
Change-Id: I08b48e4e3c6049ddb9e25a3733b7f19b012bb051
2017-06-28 17:47:45 +00:00
Fan Zhang
1d16eb3622
Merge "Update string: Gesture setting title" into oc-dr1-dev
...
am: b365594242
Change-Id: I86d464edb6c4cf00e8e5062ef42b2717947f747a
2017-06-28 17:44:16 +00:00
jackqdyulei
a8957e15cc
Update the UI for battery header
...
1. Make battery icon align to the end and make text layout
take all the other space.
2. Update the spec based on red line.
Bug: 63037934
Test: Screenshot
Change-Id: I1adbf5ce3e54712cbdc276db2357c7a24b48fe65
2017-06-28 10:29:01 -07:00