Juan Flores
4efb05a92b
Merge "Fix crash while searching in Settings" am: 176c0c5d98
am: d705a333ca
am: 16455893d7
...
am: 8510f57509
Change-Id: I58f746d72597db65456a4d09308c82a422fd318b
2016-11-02 16:50:04 +00:00
Juan Flores
8510f57509
Merge "Fix crash while searching in Settings" am: 176c0c5d98
am: d705a333ca
...
am: 16455893d7
Change-Id: Ic41c29b7d3ba2c90e4c375c843ea8532b236f4a4
2016-11-02 16:47:33 +00:00
Juan Flores
16455893d7
Merge "Fix crash while searching in Settings" am: 176c0c5d98
...
am: d705a333ca
Change-Id: I31732b822a80caa52cb97c43ea093dea8c0b19cb
2016-11-02 16:45:03 +00:00
Juan Flores
d705a333ca
Merge "Fix crash while searching in Settings"
...
am: 176c0c5d98
Change-Id: Iaaf4de39939728e9b2645e119437a9142473a5b1
2016-11-02 16:42:03 +00:00
Treehugger Robot
176c0c5d98
Merge "Fix crash while searching in Settings"
2016-11-02 16:37:08 +00:00
Fan Zhang
c5148207ef
Merge "Clarify string and description for app defaults."
2016-11-02 15:56:09 +00:00
Jorim Jaggi
7ec0eb1262
Merge "The big keyguard transition refactor (1.1/n)"
2016-11-02 02:14:16 +00:00
Julia Reynolds
69cb293a51
Merge "Channel updates from users lock fields from interference."
2016-11-02 01:20:23 +00:00
Fan Zhang
1c4f19f453
Clarify string and description for app defaults.
...
Change-Id: Idc93c89491696f6fae01c89a4649ca9f52169b7c
Fixes: 32393018
Test: compiles
2016-11-01 15:29:01 -07:00
TreeHugger Robot
b430df4007
Merge "Add subtypes to tron logging for Wifi toggles."
2016-11-01 21:58:03 +00:00
Jorim Jaggi
a3b50cc1ba
The big keyguard transition refactor (1.1/n)
...
Make sure to dismiss FALLBACK_HOME after we are fully unlocked, or
else AM will be waiting for the actual home to be visible before
unlocking.
Change-Id: I2f47ba1ff8f07e871be0d7187714aae5b81e9334
2016-11-01 14:07:40 -07:00
Stephen Chen
d9e2c946af
Add subtypes to tron logging for Wifi toggles.
...
For ACTION_WIFI_CONNECT, added subtype to specify whether user is
connecting to saved network.
For ACTION_WIFI_OFF, added subtype to specify whether user was connected
to a network at the time.
Bug: 32371451
Change-Id: I1d4445bda2fbeb062831e6f858ccc711bff65105
Fixes: 32371451
Test: Verify logs by running:
adb logcat -b events | egrep '(sysui_|notification_)'
2016-11-01 13:18:55 -07:00
Doris Ling
0d148c4b62
Merge "Add Auto sync account data to account dashboard."
2016-11-01 20:09:51 +00:00
Doris Ling
86e1df9bd9
Add Auto sync account data to account dashboard.
...
Add auto sync to User & accounts dashboard, and update
UserSettings to use the emergency info and add user when locked
controllers.
Test: RunSettingsRoboTests
Bug: 31801423
Change-Id: Ibf5a886276a9aa8f53c548036aecfd6c4d759ae3
2016-11-01 11:28:36 -07:00
Fan Zhang
d7359a8385
Fix crash when opening account sync detail for external app am: c9cdc25f41
am: f3e86ca481
am: ce01f167e1
...
am: 1398c4b367
Change-Id: I18560c8269449a3cdcee0468c4b96364d3f1fb87
2016-11-01 17:28:30 +00:00
Fan Zhang
1398c4b367
Fix crash when opening account sync detail for external app am: c9cdc25f41
am: f3e86ca481
...
am: ce01f167e1
Change-Id: I36a67f2241b1a4e2fc8787adb84af31209084ede
2016-11-01 17:25:38 +00:00
Fan Zhang
ce01f167e1
Fix crash when opening account sync detail for external app am: c9cdc25f41
...
am: f3e86ca481
Change-Id: I3ca70edada88ee6d7c4dde2ba7e5972233357add
2016-11-01 17:23:38 +00:00
Fan Zhang
f3e86ca481
Fix crash when opening account sync detail for external app
...
am: c9cdc25f41
Change-Id: Ic8016695966d64c02c4e2fbe37703db8c771930e
2016-11-01 17:21:36 +00:00
TreeHugger Robot
aa12b4d269
Merge "Import translations. DO NOT MERGE"
2016-11-01 08:06:35 +00:00
Bill Yi
a9cb8cd9d3
Import translations. DO NOT MERGE
...
Change-Id: I807a444483f1f320b29fc0880ae2b7b3d57d936a
Auto-generated-cl: translation import
2016-10-31 23:29:35 -07:00
TreeHugger Robot
c561603a7a
Merge "Show select user dialog if setting tile supports multi-user"
2016-11-01 01:39:17 +00:00
Fan Zhang
601fbec8e8
Show select user dialog if setting tile supports multi-user
...
Bug: 32470791
Test: RunSettingsRoboTests
Change-Id: I07a14c32a1b898467b03df09430038ac4a1a2aed
2016-10-31 16:55:12 -07:00
TreeHugger Robot
bbae3e89aa
Merge "Remove DashboardTilePreference."
2016-10-31 23:25:17 +00:00
Fan Zhang
c9cdc25f41
Fix crash when opening account sync detail for external app
...
Bug: 32426306
Test: Manual, and added unit test
Change-Id: I8703c9a13a60e57d7dd2bab2ae3cf6be362e351a
(cherry picked from commit e3ad2b56c3
)
2016-10-31 21:57:36 +00:00
TreeHugger Robot
ec8daec2cb
Merge changes from topic '3p_app_account_sync_detail_crash'
...
* changes:
Add test for LocalClassLoaderContextThemeWrapper.
Fix crash when opening account sync detail for external app
2016-10-31 21:49:45 +00:00
Fan Zhang
8b30f5310e
Remove DashboardTilePreference.
...
It's not needed for now.
Bug: 32554506
Test: RunSettingsRoboTests
Change-Id: I325a07896e88db97c9d3a461c8cb4c42a6c44737
2016-10-31 14:40:15 -07:00
Maurice Lam
06ca3ecc7b
Merge "Clean up DatetimeSettingsSetupWizard"
2016-10-31 20:30:25 +00:00
Fan Zhang
c71f6eec3f
Add test for LocalClassLoaderContextThemeWrapper.
...
Bug: 32426306
Test: make RunSettingsRoboTests
Change-Id: I0b46f8ca69c50c86626bae717bac334b1bb7addf
2016-10-31 13:03:49 -07:00
Fan Zhang
e3ad2b56c3
Fix crash when opening account sync detail for external app
...
Bug: 32426306
Test: Manual, and added unit test
Change-Id: I8703c9a13a60e57d7dd2bab2ae3cf6be362e351a
2016-10-31 13:03:37 -07:00
Julia Reynolds
ec767cc440
Channel updates from users lock fields from interference.
...
Also some apis have changed.
Test: manual, modify settings and check policy xml.
Change-Id: I967cb1fb30d8d400bdc0f3aa92fa07b4c87ddcf5
2016-10-31 15:16:28 -04:00
Nick Desaulniers
a393a4f614
DeviceInfoSettingsTest: test parsing llvm kernel
...
Adds unit test for DeviceInfoUtils.formatKernelVersion to see if it can
parse a /proc/version string from a kernel compiled with Clang/LLVM.
Bug: 32455817
Change-Id: I25123bf44f67e038e01d8c76d6eab18d5616c7c2
2016-10-31 11:13:10 -07:00
Fan Zhang
80d1ec7dee
Tweak UI for action buttons under app header.
...
- Make a transparent button with border style
Bug: 1584976
Test: manual
Change-Id: Ide53d71963afd4587834357999b40df81bb93500
2016-10-29 15:22:55 -07:00
TreeHugger Robot
5f6bb20e7c
Merge "Use new app header in more screens."
2016-10-29 02:00:40 +00:00
Maurice Lam
5ed50af025
Clean up DatetimeSettingsSetupWizard
...
Test: Clean up. Existing tests pass
Bug: 32516406
Change-Id: Id7361f6eee26a30d179277c1d425b2f61a99d07d
2016-10-28 17:57:23 -07:00
Fan Zhang
fdb833873a
Use new app header in more screens.
...
- This covers app data usage settings, power usage details
- Addded helper method on AppHeaderController to build the header as
Preference because every fragment needs to do this anyway.
Bug: 32442716
Test: RunSettingsRoboTests
Change-Id: I6d38321b867154f8fb5194b993d118bcdbbfedc9
2016-10-28 17:16:39 -07:00
Doris Ling
c62f8809c7
Fix test failure for EmergencyInfoTestController.
...
Make sure that the test preference has the correct key.
Change-Id: Icbf18d3f8854bc43ef486ae56f0b5fc8f035bf41
Fix: 32508237
Test: RunSettingsRoboTests
2016-10-28 16:37:01 -07:00
Fan Zhang
5abaef7dd1
Use new app header in more screens.
...
- This covers all subclasses of AppInfoWithHeader: app launch settings,
app storage settings, draw over settings, write setting details,
usage access settings.
Bug: 32442716
Test: RunSettingsRoboTests
Change-Id: I8e5831a4fcce5f98c3a6cc6b0fd66bc4a53d1330
2016-10-28 14:50:36 -07:00
Paul Stewart
31b0da66a6
Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c
am: 27c5edb968
am: dab924f04d
...
am: 09797c330c
Change-Id: I12cc021a1abead960ec28354e9d6e94ea8090c88
2016-10-28 21:20:19 +00:00
Paul Stewart
09797c330c
Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c
am: 27c5edb968
...
am: dab924f04d
Change-Id: I06bad134648c70f432194e163a8e0a5829f514f0
2016-10-28 21:14:38 +00:00
Paul Stewart
dab924f04d
Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c
...
am: 27c5edb968
Change-Id: I427261d397f0003f1e4eecd55d431441303e4b4c
2016-10-28 21:09:38 +00:00
Paul Stewart
27c5edb968
Merge "Don't display an invalid Wi-Fi MAC address"
...
am: 917b7b863c
Change-Id: I61b50ff7a50551e12a218d73bcf95f0c24e64430
2016-10-28 21:04:40 +00:00
Treehugger Robot
917b7b863c
Merge "Don't display an invalid Wi-Fi MAC address"
2016-10-28 20:56:35 +00:00
TreeHugger Robot
0cbb338ecc
Merge "Add payload for condition card to reuse the viewholder"
2016-10-28 20:25:35 +00:00
TreeHugger Robot
dbac5f1b14
Merge "Temporary commenting out EmergencyInfoPreferenceControllerTest#handlePreferenceTreeClick_shouldStartActivity as it is failing a local checked build when trying to add Clockwork projects to master."
2016-10-28 20:25:29 +00:00
jackqdyulei
022d4476c7
Add payload for condition card to reuse the viewholder
...
Bug: 30319913
Test: make RunSettingsRoboTests
Change-Id: Ib08a301203f4075f0553386f7db1a68d69bde436
2016-10-28 11:23:56 -07:00
Ariel Gertzenstein
91e91337e6
Temporary commenting out EmergencyInfoPreferenceControllerTest#handlePreferenceTreeClick_shouldStartActivity
...
as it is failing a local checked build when trying to add Clockwork projects to master.
Build command:
make -j64 PRODUCT-angler-userdebug dist DIST_DIR=out/dist checkbuild tests
Change-Id: I4f19c9d132a8c47a005ce40af74e7c9ebdba796d
2016-10-28 14:23:11 -04:00
Lei Yu
a6189e0be3
Merge "Add scroll view for choose_lock_pattern in land mode"
2016-10-28 17:02:32 +00:00
Fan Zhang
21a0712d93
Merge "Modify AppHeaderController to provide UI for notif settings"
2016-10-28 15:59:36 +00:00
Marie Janssen
83f1d4198b
Merge "Add Bluetooth toggle prompts - settings" am: de037d5491
-s ours am: ce2a10b743
am: 6e8a67c008
...
am: cd9d948d7e
Change-Id: Ife5f94841073fb9c0af202b2470f50bab165e398
2016-10-28 03:22:57 +00:00
Marie Janssen
cd9d948d7e
Merge "Add Bluetooth toggle prompts - settings" am: de037d5491
-s ours am: ce2a10b743
...
am: 6e8a67c008
Change-Id: I0fc40f9a3f3a8488e696727d08084f2d2b9d2d75
2016-10-28 02:57:06 +00:00