Commit Graph

36992 Commits

Author SHA1 Message Date
Daniel Nishi
838ec5d15b Merge "Make Storage settings title be "Storage"." into oc-dev am: c7299663e7
am: af1a66202f

Change-Id: I71309f8db92a72df913aa30e4664cabb69b2fcbb
2017-05-18 22:11:55 +00:00
Daniel Nishi
af1a66202f Merge "Make Storage settings title be "Storage"." into oc-dev
am: c7299663e7

Change-Id: I2873188fb073261695d79719c99617a355f17acc
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
jackqdyulei
5333ecd1fb Dupe BluetoothSettings and DeviceListPreferenceFragment
Create the obsolete version of the belowing fragments, so we could
flip between old page and new page.

BluetoothSettingsObsolete and DeviceListPreferenceObsoleteFragment
contains all the old logic but:
1. Logic about BluetoothPairingPreferenceController(ag/2239482),
since this preference shouldn't be checked in without the flag :(

This cl also adds logic in MasterSwitchPreferenceController to flip
these two pages.

Following cl will refactor these fragment to make it compatible
to new framework.

Bug: 35877041
Test: RunSettingsRoboTests
Change-Id: I1cc1bc2d49d8a3e11c3127e56f6409fbc84028d8
2017-05-18 14:12:02 -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

Change-Id: Ibf483af95630ca15d886e8ef83b96dbe1aefd55f
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

Change-Id: I9a7e0fa439344a44ddde299795d83d00dd83306d
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  -s ours

Change-Id: I6b474c120c59dffeb8b16e565eb47b4c1158fdf2
2017-05-18 20:18:16 +00:00
Bill Yi
d172f720d9 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 6253e0710b  -s ours

Change-Id: I2ba0f963274890e9c2c8ce5c9347b74ab3a9cce2
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

Change-Id: Ic54ae913ec5f9418f81ad15437fbaca8b96fad15
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

Change-Id: Iaca27db0a637de88c09a45d88f35db258783fa16
2017-05-18 19:35:27 +00:00
jackqdyulei
972763ee50 Merge "Show wifi and bluetooth item in battery settings" into oc-dev
am: 21d2403c67

Change-Id: I7ee542befa8e5287dbd73be242ec812a1a5d0c19
2017-05-18 19:26:20 +00:00
jackqdyulei
3ab2ca5cc9 Merge "Add screen usage string for battery settings" into oc-dev
am: 28cf04d994

Change-Id: Ie60e5de8164bfc16fa29ca16b63caa08812db52f
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
Daniel Nishi
12dbce00c1 Fix storage summary background colors.
This changes the donut background color to a lighter blue and changes
the overall background to be a grey. Both of these colors match the
Battery implementation.

Bug: 35245772
Test: Manual
Change-Id: I8e12afe4434a0e2428384fc496cab5c05dc998ee
2017-05-18 11:36:10 -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

Change-Id: I910bb7eeffe938f708c5d3df8a62790f92b83de1
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

Change-Id: I6f387cf748a9e916e4ffd3312016b0a82e126ee2
2017-05-18 17:18:30 +00:00
Lei Yu
9a4be81e5c Merge changes I573e4fb9,I8e7baadc into oc-dev am: 67e38774ce
am: d85bdebe0e

Change-Id: I865f41eae196aee32edd60169dacbc5dca772439
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

Change-Id: Id3a830eb46004a3febdb9c4bf96a39b8c4afaedd
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
Bill Yi
a57e6a0894 Import translations. DO NOT MERGE
Change-Id: I8a4be0cbaa913e1df9fb06b72bb4eefad5e17eab
Auto-generated-cl: translation import
2017-05-17 22:41:50 -07:00
Philip Quinn
2d6fef5e1c Increase the resolution of the assist gesture sensitivity slider.
Test: make RunSettingsRoboTests && manual
Change-Id: I47cdeba932afb4ab68b2283efa479a1e4725675c
2017-05-17 22:34:10 -07:00
Maurice Lam
5ed96dc264 Resize fingerprint added illustration to specs
Use FillContentLayout to make sure the illustration is according to
specs, between 124dp and 264dp, filling up the remaining size.

The landscape layout is also updated so that the illustration is
vertically centered instead of shifted downwards.

Test: Manual
Bug: 37668789
Change-Id: If17e509d4643d620c76ca4a5bc0120272c7c58bb
2017-05-17 19:55:23 -07:00
Fan Zhang
2ed0f99989 Rename app_details to entity_header
Bug: 37669238
Test: rerun robotests
Change-Id: Iab2cdf83d8b35ce3d45b0c413cad8614d44d5ed3
2017-05-17 18:17:20 -07:00
Fan Zhang
867c68e76c Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev am: 2b030aeb65
am: 60d26cfffa

Change-Id: I878bafe5a626e2f6fe9d8f4cfbb89dfeb763c7a0
2017-05-18 01:14:10 +00:00
jackqdyulei
7d7080ab64 Drop the misc and not smear it.
Bug: 38347725
Test: RunSettingsRoboTests
Change-Id: I573e4fb945bc212505c9211d9b92f77a6a9a2739
2017-05-17 18:12:03 -07:00
Fan Zhang
60d26cfffa Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev
am: 2b030aeb65

Change-Id: I4c13fb0ce652108fdabbaa8ca215a5799374c8f8
2017-05-18 01:11:00 +00:00
Fan Zhang
63c5b41f01 Merge "Fix robolectric test failure" into oc-dev am: 2545bcaa74
am: 3970916cf1

Change-Id: I7f63f5cee9a91c8f88711a0ada04a24a676692f1
2017-05-18 01:09:16 +00:00
jackqdyulei
2b923ce44f Smear screen power usage based on activity time.
Bug: 38328636
Test: RunSettingsRoboTests
Change-Id: I8e7baadcd88a8e9d674f5bc8d8e42e0f3953c98a
2017-05-17 18:06:47 -07:00
Fan Zhang
2b030aeb65 Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev 2017-05-18 01:05:39 +00:00
Fan Zhang
3970916cf1 Merge "Fix robolectric test failure" into oc-dev
am: 2545bcaa74

Change-Id: I632edffaced0b4ce7d391d525c4d9288e5ba97cc
2017-05-18 01:01:12 +00:00
Fan Zhang
2545bcaa74 Merge "Fix robolectric test failure" into oc-dev 2017-05-18 00:41:18 +00:00