Maurice Lam
f7db59d03f
Merge "Align password requirement according to theme"
2017-05-19 18:26:49 +00:00
Lorenzo Colitti
991a273669
Merge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev am: 7d045387e0
...
am: c2bd388bb9
2017-05-19 03:14:38 +00:00
Lorenzo Colitti
c2bd388bb9
Merge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev
...
am: 7d045387e0
2017-05-19 03:10:14 +00:00
TreeHugger Robot
7d045387e0
Merge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev
2017-05-19 03:01:29 +00:00
Maurice Lam
27b762c963
Align password requirement according to theme
...
Test: Manual
Bug: 38180862
Change-Id: I60f58b35c057352dd352ad847f69b1eb999f2f08
2017-05-18 18:48:34 -07:00
TreeHugger Robot
7aac5c5791
Merge changes Iaf92730e,I54eb30f2,Ib80827ae
...
* changes:
Use entity header on AccountDetailDashboardFragment
Move entity header controller out of application package.
Clean up settings_entity_header layout.
2017-05-19 01:24:50 +00:00
TreeHugger Robot
5d20c1ab87
Merge "Fix bug where app list says "No app" in multi-window mode"
2017-05-19 01:04:06 +00:00
Matthew Fritze
87cb3c92bb
Merge "Remove Language and Input duplicates" into oc-dev am: 6f4a6a737d
...
am: 5569e3a33f
2017-05-19 00:56:39 +00:00
Matthew Fritze
5569e3a33f
Merge "Remove Language and Input duplicates" into oc-dev
...
am: 6f4a6a737d
2017-05-19 00:49:41 +00:00
TreeHugger Robot
6f4a6a737d
Merge "Remove Language and Input duplicates" into oc-dev
2017-05-19 00:41:04 +00:00
Fan Zhang
98289a887b
Use entity header on AccountDetailDashboardFragment
...
Bug: 37669238
Test: make RunSettingsRoboTests
Change-Id: Iaf92730e8c6b5c44cb8eca4525fc931487ce9630
2017-05-18 16:36:32 -07:00
Fan Zhang
d7414259d0
Move entity header controller out of application package.
...
Bug: 37669238
Test: rerun robotests
Change-Id: I54eb30f28fa0a88a6f0b97b53f9f1408320b5ce0
2017-05-18 16:36:32 -07:00
Fan Zhang
f5bd885a1d
Clean up settings_entity_header layout.
...
update layout view IDs, and controller variable names to be more
generic.
Fix: 36734470
Bug: 37669238
Test: make RunSettingsRoboTests
Change-Id: Ib80827ae3eae6d01a600068b4a8a44b239c32511
2017-05-18 16:35:27 -07:00
TreeHugger Robot
dd6483461f
Merge "Remove Language and Input duplicates"
2017-05-18 22:37:27 +00:00
Daniel Nishi
838ec5d15b
Merge "Make Storage settings title be "Storage"." into oc-dev am: c7299663e7
...
am: af1a66202f
2017-05-18 22:11:55 +00:00
Daniel Nishi
af1a66202f
Merge "Make Storage settings title be "Storage"." into oc-dev
...
am: c7299663e7
2017-05-18 22:07:24 +00:00
Daniel Nishi
c7299663e7
Merge "Make Storage settings title be "Storage"." into oc-dev
2017-05-18 21:57:22 +00:00
Fan Zhang
462d852808
Fix bug where app list says "No app" in multi-window mode
...
Move updateUi logic from onPause/onResume to onStop/onStart.
Change-Id: Iebe38d201d531058472cd033a0408239d36d32e4
Fix: 36305836
Test: instrumentation test
2017-05-18 14:37:09 -07:00
Matthew Fritze
742467ec9f
Remove Language and Input duplicates
...
Change the keys in the Language and Input screen for the
gesture and tts-output settings so they can be disabled
in search. Then change the preference controllers to take
a key as input to avoid crashes on the other screens with
these settings.
Merge for: ag/2098173/
Test: make RunSettingsRoboTests
Bug: 33701673
Change-Id: I8bc0776131fcac5a6edf7e8271bc53252c2fc719
2017-05-18 13:57:54 -07:00
Juan Lang
96c413b5f2
Merge "Update FooterPreference's classpath in preference files."
2017-05-18 20:52:56 +00:00
Fan Zhang
daf95ed1b3
Merge "Log preference change as count (in addition to action)" into oc-dev am: 13bcf501dd
...
am: a3202a9a36
2017-05-18 20:44:33 +00:00
Fan Zhang
a3202a9a36
Merge "Log preference change as count (in addition to action)" into oc-dev
...
am: 13bcf501dd
2017-05-18 20:34:47 +00:00
TreeHugger Robot
13bcf501dd
Merge "Log preference change as count (in addition to action)" into oc-dev
2017-05-18 20:29:12 +00:00
TreeHugger Robot
b287dc93d5
Merge "Skip cursor loader if not needed"
2017-05-18 20:28:52 +00:00
Bill Yi
29a1434435
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6253e0710b -s ours
...
am: d172f720d9
2017-05-18 20:18:16 +00:00
Bill Yi
d172f720d9
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 6253e0710b
2017-05-18 20:13:46 +00:00
TreeHugger Robot
6253e0710b
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-05-18 20:05:21 +00:00
jackqdyulei
803f0c96e8
Merge "Show wifi and bluetooth item in battery settings" into oc-dev am: 21d2403c67
...
am: 972763ee50
2017-05-18 19:35:56 +00:00
jackqdyulei
b5219ba29a
Merge "Add screen usage string for battery settings" into oc-dev am: 28cf04d994
...
am: 3ab2ca5cc9
2017-05-18 19:35:27 +00:00
jackqdyulei
972763ee50
Merge "Show wifi and bluetooth item in battery settings" into oc-dev
...
am: 21d2403c67
2017-05-18 19:26:20 +00:00
jackqdyulei
3ab2ca5cc9
Merge "Add screen usage string for battery settings" into oc-dev
...
am: 28cf04d994
2017-05-18 19:25:57 +00:00
TreeHugger Robot
21d2403c67
Merge "Show wifi and bluetooth item in battery settings" into oc-dev
2017-05-18 19:13:35 +00:00
TreeHugger Robot
28cf04d994
Merge "Add screen usage string for battery settings" into oc-dev
2017-05-18 19:10:16 +00:00
TreeHugger Robot
8311e26aba
Merge "Rename app_details to entity_header"
2017-05-18 19:04:12 +00:00
TreeHugger Robot
3f4056212f
Merge "Fix issue for new account not being shown in work profile."
2017-05-18 18:55:27 +00:00
TreeHugger Robot
f76dafea55
Merge "Dynamic summary text for network/connected device screen."
2017-05-18 18:54:48 +00:00
Juan Lang
330d685063
Update FooterPreference's classpath in preference files.
...
FooterPreference was moved to SettingsLib in ag/2237939, which should
have updated these files as well.
Test: Manually test the change fixes the crash.
Bug: 38371580
Change-Id: I66b6fe555c164f879a2545ab455c822c0de4536d
Fixes: 38371580
2017-05-18 11:49:37 -07:00
Salvador Martinez
44b9a4072c
Skip cursor loader if not needed
...
The cursor loader was being started when the battery prediction
feature was not enabled. This could lead to null pointers because
it was not possible to provide it with a valid URI which would
make the CursorLoader unhappy. This CL makes it so we just skip
the CursorLoader initialization entirely when we know the feature
is disabled so we don't have this issue. It also includes a test
to make sure this does not regress.
Test: Robotests
Bug: 38371686
Change-Id: I4f6f6278bbc16668bca0b51fcc7e30f27a9e216f
2017-05-18 11:10:18 -07:00
Daniel Nishi
0d03b88e91
Make Storage settings title be "Storage".
...
This more closely reflects the idea that the top level setting title
should match the actual screen title.
Change-Id: Ie7ab1756d799c182cad74041995768037bba710f
Fixes: 37923462
Test: Manual
2017-05-18 11:02:10 -07:00
Matthew Fritze
b97a1bffa8
Remove Language and Input duplicates
...
Change the keys in the Language and Input screen for the
gesture and tts-output settings so they can be disabled
in search. Then change the preference controllers to take
a key as input to avoid crashes on the other screens with
these settings.
Test: make RunSettingsRoboTests
Bug: 33701673
Change-Id: Ifeb2a2d34a3efded3f0a9ba02ac76fd6f8ffd087
Merged-In: I8bc0776131fcac5a6edf7e8271bc53252c2fc719
2017-05-18 17:36:59 +00:00
Matthew Fritze
cc7687c27c
Merge "Update no search results icon and move image to top of page" into oc-dev am: fc4db3bd80
...
am: 145c364479
2017-05-18 17:23:01 +00:00
Matthew Fritze
145c364479
Merge "Update no search results icon and move image to top of page" into oc-dev
...
am: fc4db3bd80
2017-05-18 17:18:30 +00:00
Lei Yu
9a4be81e5c
Merge changes I573e4fb9,I8e7baadc into oc-dev am: 67e38774ce
...
am: d85bdebe0e
2017-05-18 17:12:34 +00:00
TreeHugger Robot
fc4db3bd80
Merge "Update no search results icon and move image to top of page" into oc-dev
2017-05-18 17:11:29 +00:00
Lei Yu
d85bdebe0e
Merge changes I573e4fb9,I8e7baadc into oc-dev
...
am: 67e38774ce
2017-05-18 17:08:33 +00:00
Lei Yu
67e38774ce
Merge changes I573e4fb9,I8e7baadc into oc-dev
...
* changes:
Drop the misc and not smear it.
Smear screen power usage based on activity time.
2017-05-18 17:00:27 +00:00
Fan Zhang
7c3a87ebd3
Dynamic summary text for network/connected device screen.
...
Change-Id: I3254c63b7c241e2de9251b3c2d2a0106fb049ece
Fix: 36768218
Test: make RunSettingsRoboTests
2017-05-18 09:52:43 -07:00
Lorenzo Colitti
89b4ff5c1e
Raneme the wifi detail "Sign into network" button to "Sign in".
...
Bug: 36656914
Test: button looks reasonable in English, Italian, Japanese, Dutch
Change-Id: Icaba16a4ef1ddfc03fc45fd1d1c64bcca9913d7c
2017-05-19 00:13:18 +09:00
TreeHugger Robot
821c83e749
Merge "Default setup wizard to use PIN"
2017-05-18 08:43:24 +00:00
Bill Yi
63c87dabb6
Import translations. DO NOT MERGE
...
Change-Id: I79790dae43f96a35c56970f27acb47ba689f731e
Auto-generated-cl: translation import
2017-05-17 22:58:00 -07:00
