Paul Stewart
31b0da66a6
Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c am: 27c5edb968 am: dab924f04d
...
am: 09797c330c
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
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
2016-10-28 21:09:38 +00:00
Paul Stewart
27c5edb968
Merge "Don't display an invalid Wi-Fi MAC address"
...
am: 917b7b863c
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
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
2016-10-28 02:57:06 +00:00
Marie Janssen
6e8a67c008
Merge "Add Bluetooth toggle prompts - settings" am: de037d5491 -s ours
...
am: ce2a10b743
2016-10-28 02:52:12 +00:00
Marie Janssen
ce2a10b743
Merge "Add Bluetooth toggle prompts - settings"
...
am: de037d5491
2016-10-28 02:45:39 +00:00
TreeHugger Robot
91ca01ec42
Merge "Add Emergency info and Add user when locked to account dashboard."
2016-10-28 00:44:54 +00:00
Fan Zhang
1ff25ba7e6
Modify AppHeaderController to provide UI for notif settings
...
- The AppHeaderController is no longer a singleton. Each time appheader
should be updated we will create a new controller. It acts as a
builder/mutator, user provides customizable inputs, and the controller
will bind everything to UI when calling done().
Bug: 32442716
Test: RunSettingsRoboTests
Change-Id: Icfc5bcd8bc170a02b57432d864eaddf71db0d5b4
2016-10-27 17:23:33 -07:00
Marie Janssen
de037d5491
Merge "Add Bluetooth toggle prompts - settings"
2016-10-27 23:07:31 +00:00
Doris Ling
c7e2ed8e79
Add Emergency info and Add user when locked to account dashboard.
...
Add two items to User & accounts dashboard, and refractor
UserCapabilities so that it can be accessed in the new controller.
Test: RunSettingsRoboTests
Bug: 31801423
Change-Id: Ib446ad6c99d4cc6405a17cf82d2d86e044870b73
2016-10-27 15:48:52 -07:00
TreeHugger Robot
6e3b964cf4
Merge "UI Refresh: a new app info header for app/notification."
2016-10-27 22:43:52 +00:00
Sudheer Shanka
c52914f564
Merge "Update usage of IMountService constants."
2016-10-27 22:38:34 +00:00
Fan Zhang
c9536b8e41
UI Refresh: a new app info header for app/notification.
...
- moved force stop and uninstall button to bottom of page (as footer)
- Forked appheader layout file, and created AppHeaderController to
contain all binding logic for header.
Bug: 32442716
Test: RunSettingsRoboTests
Change-Id: Id4eb365ca25e035c043c068867f5cbc3a202b201
2016-10-27 13:48:13 -07:00
Paul Stewart
1aeb383d73
Don't display an invalid Wi-Fi MAC address
...
Only display the WifiInfo MAC address if it is a valid address.
Otherwise, display "Unavailable". The underlying WifiInfo class
now has a default value, and a method that can be used to test
whether or not the contained address is valid. This change uses
this test and avoids having the confusing default address displayed.
Bug: 32478606
Test: Manual: Turn off WiFi and reboot -- make sure "Unavailable"
is displayed as the Wi-Fi MAC Address as opposed to "02:00:00:00:00:00"
Change-Id: I912804eb65735375e0ca3c4618a6399543f33b57
2016-10-27 13:34:10 -07:00
TreeHugger Robot
700949d8ad
Merge "Hide gear icon in actionbar if new IA is enabled."
2016-10-27 17:29:09 +00:00
TreeHugger Robot
1637a5f480
Merge "Import translations. DO NOT MERGE"
2016-10-27 05:47:07 +00:00
Bill Yi
9a2775a8ab
Import translations. DO NOT MERGE am: bb6af9902d -s ours am: 061b294714 -s ours am: 4666b50754 -s ours am: 69e4232f8d -s ours
...
am: 10d6c409d4
2016-10-27 05:40:51 +00:00
Bill Yi
200cf26692
Import translations. DO NOT MERGE am: e7f9b0b30b -s ours am: f8b4927683 -s ours am: f55f67e409 -s ours
...
am: 65d4378a8f
2016-10-27 05:40:36 +00:00
Bill Yi
10d6c409d4
Import translations. DO NOT MERGE am: bb6af9902d -s ours am: 061b294714 -s ours am: 4666b50754 -s ours
...
am: 69e4232f8d
2016-10-27 05:36:09 +00:00
Bill Yi
65d4378a8f
Import translations. DO NOT MERGE am: e7f9b0b30b -s ours am: f8b4927683 -s ours
...
am: f55f67e409
2016-10-27 05:35:55 +00:00
Bill Yi
69e4232f8d
Import translations. DO NOT MERGE am: bb6af9902d -s ours am: 061b294714 -s ours
...
am: 4666b50754
2016-10-27 05:31:37 +00:00
Bill Yi
f55f67e409
Import translations. DO NOT MERGE am: e7f9b0b30b -s ours
...
am: f8b4927683
2016-10-27 05:31:24 +00:00
Bill Yi
4666b50754
Import translations. DO NOT MERGE am: bb6af9902d -s ours
...
am: 061b294714
2016-10-27 05:27:37 +00:00
Bill Yi
f8b4927683
Import translations. DO NOT MERGE
...
am: e7f9b0b30b
2016-10-27 05:27:22 +00:00
Bill Yi
061b294714
Import translations. DO NOT MERGE
...
am: bb6af9902d
2016-10-27 05:22:55 +00:00
Bill Yi
b3baf5f912
Import translations. DO NOT MERGE am: 06f30f99c0 -s ours
...
am: bcbb9ca8c7
2016-10-27 05:06:33 +00:00
Bill Yi
bcbb9ca8c7
Import translations. DO NOT MERGE
...
am: 06f30f99c0
2016-10-27 04:56:50 +00:00
Bill Yi
bb6af9902d
Import translations. DO NOT MERGE
...
Change-Id: Ie7733c16a2d1b8502a2b33e10fe0c4fa0e6d9138
Auto-generated-cl: translation import
2016-10-26 21:04:20 -07:00
Bill Yi
06f30f99c0
Import translations. DO NOT MERGE
...
Change-Id: I51115d580c3d823482a01f078fd23b2690f3899b
Auto-generated-cl: translation import
2016-10-26 20:59:24 -07:00
Bill Yi
e7f9b0b30b
Import translations. DO NOT MERGE
...
Change-Id: I593dba1b6fda93a08279272c8e4061c464899afc
Auto-generated-cl: translation import
2016-10-26 20:51:47 -07:00
Bill Yi
03a8613f4d
Import translations. DO NOT MERGE
...
Change-Id: I658e02621f2bc1f8322f928a8f45578c7ff9359e
Auto-generated-cl: translation import
2016-10-26 20:43:58 -07:00
Lei Yu
8b3159f064
Merge "Remove animateChange in ConditionAdapterUtils"
2016-10-26 23:30:25 +00:00
Lei Yu
71b589f2a5
Merge "Use layout weight attr and scrollview in lock pattern screen."
2016-10-26 23:29:37 +00:00
Fan Zhang
606c74404b
Hide gear icon in actionbar if new IA is enabled.
...
- The page that gear icon opens is moved to other places in new IA.
Bug: 31799948
Test: manual
Change-Id: I637d725425109d364951ac1c7515cc8bcd061cc5
2016-10-26 15:55:53 -07:00
Svetoslav Ganov
13088cac84
Add Bluetooth toggle prompts - settings
...
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
bug:28715749
Change-Id: I5ae0c532c92b2c05a91f0d769ca6744002747fca
(cherry picked from commit b06766f129
2016-10-26 13:30:38 -07:00
jackqdyulei
8e5f66ce39
Remove animateChange in ConditionAdapterUtils
...
Bug: 30319913
Test: make RunSettingsRoboTests
Change-Id: Iea3fa574c4f0f80e70a6360b5b4a5f748a80a899
2016-10-26 13:09:38 -07:00
Fan Zhang
301fe80fa7
Add location to security settings.
...
Bug: 32437756
Test: RunSettingsRoboTests
Change-Id: I999669963801684eb2399f5e642159970727b3c4
2016-10-26 11:23:20 -07:00
Fan Zhang
9895344be6
Fix build
...
Bug: 24107771
Test: compiles
Change-Id: I287cbe05a86de24d0817bd84e7db5b1893ef7d9b
2016-10-26 10:02:48 -07:00
TreeHugger Robot
85edd578e2
Merge "Refactor Build number preference control into a controller."
2016-10-26 16:01:21 +00:00
TreeHugger Robot
a2c7f4277b
Merge "Modified settings tests to use custom test runner"
2016-10-26 03:12:08 +00:00
TreeHugger Robot
d847d424b4
Merge "Fix logging spam in DashboardFragment."
2016-10-26 01:46:27 +00:00
