Commit Graph

15007 Commits

Author SHA1 Message Date
TreeHugger Robot
14c2050330 Merge "Misc fix on network & internet screen for developer preview" 2017-02-07 21:34:17 +00:00
TreeHugger Robot
89e1721115 Merge "Re-add the break statement that was accidentally removed." 2017-02-07 20:34:53 +00:00
Stephen Chen
aa0baffe32 Merge "Change number of showing tiles in ConfigureWifiSettings." 2017-02-07 20:23:01 +00:00
Stephen Chen
9f13c02e2d Change number of showing tiles in ConfigureWifiSettings.
Test: manual inspection.
Change-Id: Ieecbff4416c69e902b9f0c5b4e4fc91907420b17
2017-02-07 12:21:01 -08:00
TreeHugger Robot
b692056232 Merge "Add Adaptive brightness as an inline result in Search" 2017-02-07 20:12:37 +00:00
TreeHugger Robot
47124e30ec Merge "Installed App loader only matches on prefixes" 2017-02-07 19:13:59 +00:00
Daniel Nishi
3dfbc46c0e Re-add the break statement that was accidentally removed.
This fixes the problem where the game fragment starts at the same
time as external sources.

Bug: 35056002
Test: b/34768986
Change-Id: Ie35decc627dc6bec493a8c1f1976dc11d460f5fe
2017-02-07 09:40:54 -08:00
Tadashi G. Takaoka
4246ac6f96 Merge "Fix BroadcastReceiver leakage" 2017-02-07 06:21:32 +00:00
Pavlin Radoslavov
4905888be4 Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am: ad62fd52c9 am: 14eb8cfe57 am: 8e81cf1310
am: 2a70967e41

Change-Id: Icc13b2847d8a7b6f0800bd067ac3fe3e01c478ec
2017-02-07 06:20:51 +00:00
Pavlin Radoslavov
2a70967e41 Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am: ad62fd52c9 am: 14eb8cfe57
am: 8e81cf1310

Change-Id: I513fdf69abc617944f5e0ce8195d16a451f61590
2017-02-07 04:55:47 +00:00
Pavlin Radoslavov
8e81cf1310 Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am: ad62fd52c9
am: 14eb8cfe57

Change-Id: Ie5f7b5157a6034ec7a206758b19cd51e3713fc12
2017-02-07 04:52:47 +00:00
Pavlin Radoslavov
14eb8cfe57 Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info"
am: ad62fd52c9

Change-Id: I790c24917705ed7488ddfa467cb6c09241b34142
2017-02-07 04:50:15 +00:00
TreeHugger Robot
df60a9e990 Merge "Create a new PreferenceCategory for the current AP." 2017-02-07 02:45:16 +00:00
TreeHugger Robot
cce2b22743 Merge "Add a missing @Override annotation" 2017-02-07 02:14:43 +00:00
Fan Zhang
56199e9487 Misc fix on network & internet screen for developer preview
- Move wifi calling into wifi preference screen
- Update tethering setting title
- Ripple for master swtich preference only apply on the left half.
- Move network reset to action bar overflow menu

Fix: 34974598
Fix: 34976385
Test: RunSettingsRoboTests
Change-Id: I0e11843efc52a0042784a4da46b7ac81fcf16138
2017-02-06 18:14:14 -08:00
Soroosh Mariooryad
634b4eb315 Merge "Adding the dismiss logic for setting smart suggestions." 2017-02-07 02:12:59 +00:00
Doris Ling
e5d0eca799 Merge "Combine Language & region and Input & gestures in System settings." 2017-02-07 01:51:20 +00:00
Matthew Fritze
516b0f1b83 Add Adaptive brightness as an inline result in Search
Bug: 34740449
Test: make RunSettingsRoboTests
Change-Id: I71acdcc04780a76263171a9d312d88a1eb61624a
2017-02-06 17:49:34 -08:00
Pavlin Radoslavov
a4efdf5195 Catch IllegalStateException when updating Bluetooth A2DP codec info
Add an explicit check when calling getResources() inside
updateBluetoothA2dpConfigurationValues().
This fixes a potential race condition - the latter could be called
in background when processing intent update.

Bug: 35021206
Test: Manual UI testing
Change-Id: I38117c5b1e08f4b2ecfd7637bb3e34920aa0d296
2017-02-06 15:37:01 -08:00
Antony Sargent
c475c8be5e Add a missing @Override annotation
Test: none (no functional changes)

Change-Id: Ia91a15d9ca52d953c657278ea02ce0d1586ce0a0
2017-02-06 15:28:26 -08:00
Soroosh Mariooryad
81adc530d9 Adding the dismiss logic for setting smart suggestions.
Test: make RunSettingsLibRoboTests
Fixes: 35059823
Change-Id: I48a71ff525f6dded6f0b505280f5678a554f7183
2017-02-06 15:25:35 -08:00
Sundeep Ghuman
f200005086 Create a new PreferenceCategory for the current AP.
This highlights the currently connected ap in it's own category.

Bug: 34714183
Test: Manual inspection with connected AP, APs available but not
connected, and Wifi off.

Change-Id: I100bcf5b0bdc7b4f725f2ff630aa885dbca90332
2017-02-06 14:38:06 -08:00
Christine Franks
5ac6ed8f9c Merge "Allow factory reset in carrier demo mode" 2017-02-06 22:27:11 +00:00
TreeHugger Robot
c2ff3b972c Merge "Make picker icons scale larger." 2017-02-06 21:18:09 +00:00
Doris Ling
34cfd2e24f Combine Language & region and Input & gestures in System settings.
Merge preferences into one page, and update test.

Bug: 34976047
Test: make RunSettingsRoboTests
Change-Id: I5f15192e42f6054c02d4c8ffa9f25db3075da409
2017-02-06 11:46:48 -08:00
Christine Franks
1478222cd2 Allow factory reset in carrier demo mode
Bug: 34341567
Test: manual - in carrier demo mode, go to Settings > Backup and
Reset > Factory data reset > Reset phone > Erase everything and
this entire path is viewable.

Change-Id: Ia5491765241adad97ecdb0a5bfd86a8371b8e4fe
2017-02-06 11:42:54 -08:00
TreeHugger Robot
44572c4325 Merge "Refactoring of auto fill - lifecycle, auth, improvements - Settings" 2017-02-06 05:47:49 +00:00
Stephen Chen
773a9a1272 Merge "Change number of preferences showing in ConfigureWifiSettings." 2017-02-04 00:27:43 +00:00
Stephen Chen
30c3878194 Change number of preferences showing in ConfigureWifiSettings.
Test: manual inspection.
Change-Id: If6a9f8ada05ef56f2db4d394903ccf839a184e98
2017-02-03 16:24:48 -08:00
Stephen Chen
ac9f4af5e2 Make picker icons scale larger.
Bug: 34775322
Test: manual inspection.
Change-Id: Iaaa859874ec25a50677cb00bd963fc869c5b9649
2017-02-03 15:40:56 -08:00
Anton Philippov
845d1503d0 Merge "Enable the backup settings activity before launching" 2017-02-03 21:01:24 +00:00
Anton Philippov
18dd11f54c Enable the backup settings activity before launching
Bug: 34925593
Test: Manual
Change-Id: Ib27efa2138f56af37fe83376496a0d4c7a494e5b
2017-02-03 19:01:26 +00:00
Svet Ganov
3ac757ee2e Refactoring of auto fill - lifecycle, auth, improvements - Settings
Test: manual

Change-Id: Ie425bfe1c71640cebe129cc0a2d5d09b731c57de
2017-02-03 02:43:14 -08:00
Alexey Polyudov
f689441eed fix the build breakage caused by merge resolution
commit 5d409ace19 broke the build

Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
(cherry picked from commit 8c041f7862)
2017-02-02 21:58:36 +00:00
Alexey Polyudov
0d8e3e9405 Merge "fix the build breakage cuased by merge resolution" 2017-02-02 21:01:50 +00:00
Matthew Fritze
43f7fb1b8f Installed App loader only matches on prefixes
Change-Id: Iefc6d681a1b616acf3c1354ff4d0f6c2c268895e
Fixes:34688403
Test: make RunSettingsRoboTests
2017-02-02 13:00:31 -08:00
Alexey Polyudov
8c041f7862 fix the build breakage cuased by merge resolution
commit 5d409ace19 broke the build

Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
2017-02-02 12:59:50 -08:00
Daniel Nishi
23eb4378d6 Merge "Use the fast track calculation for apps." 2017-02-02 20:48:00 +00:00
Alexey Polyudov
d872a51339 resolve merge conflicts of 81758edffa to nyc-mr2-dev-plus-aosp
am: 5d409ace19

Change-Id: I90f8afee357fa453e337b657976a1619383a58a5
2017-02-02 19:31:06 +00:00
Alexey Polyudov
5d409ace19 resolve merge conflicts of 81758edffa to nyc-mr2-dev-plus-aosp
Change-Id: Ie5f768b3986b1a2847503ed0871dc1dc79007d88
2017-02-02 11:11:29 -08:00
TreeHugger Robot
00537955f2 Merge "Hide ConfigureWifiPreference tiles behind Advanced" 2017-02-02 18:08:47 +00:00
Mihai Niță
421c7d9832 Merge "Fix for Developer-Force RTL removing the locale list" 2017-02-02 17:13:07 +00:00
Pavlin Radoslavov
6e5f93c57a Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc am: 0356b740f2 am: 33b4688634
am: 068780c052

Change-Id: I77cd63033413eadb4385d844bb2b83ef9dbef320
2017-02-02 16:55:48 +00:00
Pavlin Radoslavov
068780c052 Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc am: 0356b740f2
am: 33b4688634

Change-Id: I40314d5a74c7c8ede98666d708723f4b6df46165
2017-02-02 04:38:17 +00:00
Pavlin Radoslavov
33b4688634 Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc
am: 0356b740f2

Change-Id: I359020a85c6bc8a5201018f31f5f9fd274b2b94d
2017-02-02 04:35:49 +00:00
Pavlin Radoslavov
0356b740f2 Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"
am: 78115c0abc

Change-Id: I6e29cc46fb4577973b8e9d6b48a2c8ad48d5531a
2017-02-02 04:32:48 +00:00
Stephen Chen
a7b27b22b9 Hide ConfigureWifiPreference tiles behind Advanced
Also reordered the preferences.

Bug: 34889722
Test: manual inspection.
Change-Id: Ica2fda91e6fe98edae49bca687ebb2da83251770
2017-02-01 17:57:22 -08:00
Pavlin Radoslavov
789d21d475 Add missing null pointer check for Bluetooth A2DP Codec Settings
Bug: 34885602
Test: Code compilation
Change-Id: I13443390e7c6ffa34b5957a588fc0cefdf5b80f5
2017-02-01 17:43:23 -08:00
Daniel Nishi
58543f1dd4 Don't crash in Music Storage Settings.
This crash occurs because the music files entry is active, but does
not have an AppEntry (because it is not an app.) ManageApplications
assumes all active elements have an AppEntry, which causes an NPE.

By adding in a null check, we can avoid this.

Bug: 34888282
Test: Manual -- because ManageApplications needs refactoring badly.
Change-Id: Ief0c202f6176d90e492e62e5930b940e5a28b95c
2017-02-01 14:19:28 -08:00
Daniel Nishi
0905600b7a Use the fast track calculation for apps.
This replaces the calculation of the apps category
and add in a calculation for the games category using
the faster GID calculation. This should result in app
sizes loading roughly 10 times after.

Bug: 34204877
Test: Settings unit & robo tests
Change-Id: I78044a8d50f695f8c0a7e04183030232a9719260
2017-02-01 14:02:03 -08:00