Doris Ling
b4a122b227
Merge "Add static preview images to gesture settings." into nyc-mr1-dev am: ec5314f2f5
...
am: 1a674eef53
2016-10-17 20:24:34 +00:00
Doris Ling
fccee6adae
Add static preview images to gesture settings. am: 12e4bebabf
...
am: df7b815980
2016-10-17 20:24:26 +00:00
Bill Yi
ccde0787b8
Import translations. DO NOT MERGE
...
Change-Id: I85609bede92b4ae044f1f98a101576447f93367f
Auto-generated-cl: translation import
2016-10-17 13:21:09 -07:00
Doris Ling
1a674eef53
Merge "Add static preview images to gesture settings." into nyc-mr1-dev
...
am: ec5314f2f5
2016-10-17 20:18:33 +00:00
Doris Ling
df7b815980
Add static preview images to gesture settings.
...
am: 12e4bebabf
2016-10-17 20:18:30 +00:00
Doris Ling
ec5314f2f5
Merge "Add static preview images to gesture settings." into nyc-mr1-dev
2016-10-17 20:11:31 +00:00
Bill Yi
2943a2d942
Import translations. DO NOT MERGE
...
Change-Id: Ibfa2cefd09d0e3d59ce49b2e35bb5555caea32c0
Auto-generated-cl: translation import
2016-10-17 13:10:39 -07:00
Sanket Padawe
1aa65f3b92
Fix build failure.
...
+ Merge commit 'a049c988e75a0bb496b587ade60930c4d40e4aaf' into
manual_merge_a049c98
Test: Fixing merge conflict
Change-Id: I4eebc1352ec7274811118a71f8cf97c864771145
2016-10-17 11:39:03 -07:00
Sanket Padawe
a049c988e7
Fix multi-sim popup issue in data usage. am: 8591f26fa3
...
am: d8fc77122b
2016-10-17 17:25:04 +00:00
Sanket Padawe
d8fc77122b
Fix multi-sim popup issue in data usage.
...
am: 8591f26fa3
2016-10-17 17:18:34 +00:00
Fan Zhang
be2ac27b67
Draw preference divider based on preference group.
...
Bug: 32179750
Test: RunSettingsRoboTests
Change-Id: I3ea1cd662c5baec825fae615883b94b26e648409
2016-10-17 10:16:04 -07:00
TreeHugger Robot
23665b0766
Merge "Fix a bug in navup button."
2016-10-15 00:27:57 +00:00
jackqdyulei
b182ef3c77
Set stay awake while wireless charging.
...
Now if you select "stay awake" in Developer options, the screen
will keep on when wireless charging.
Bug:31696030
Test: make SettingsTests
Change-Id: If88bf559519c19654822c70d7684be583d907e00
2016-10-14 15:50:42 -07:00
Fan Zhang
9cf5cfb03d
Fix a bug in navup button.
...
When launching internal setting activity from dynamic tiles and hit back
button, it goes back to settings homepage. Instead it should just go
back to the UI where startActivity is called.
This is caused by various activity flags set in manifest. Instead of
using startActivity, internal settings screen will just be launched
using SubSetting, which doesn't have this problem.
For external settings, still use startActivityForResult to maintain
backstack.
Test: manual
Change-Id: I07aa6ed932b9048375629d6ffd6ad1adfaba3fd3
2016-10-14 15:42:28 -07:00
Sanket Padawe
8591f26fa3
Fix multi-sim popup issue in data usage.
...
+ Avoid sending popup dialog when data is enabled on currently active
data sim.
Bug: 31736014
Change-Id: I60e9e049f546cb176283bc4c4e20cb2d3e7ac386
2016-10-14 15:41:52 -07:00
Fan Zhang
8da6f88a9b
Add security to top level settings.
...
Bug: 31801373
Test: manual
Change-Id: I7bac30c07f2d811fa465f92f836c2c672a39d2e3
2016-10-14 14:02:03 -07:00
TreeHugger Robot
542fe0c0c3
Merge "Add summary provider for system tile."
2016-10-14 19:56:35 +00:00
Jerry Zhang
dc7ac74869
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"
2016-10-14 18:24:36 +00:00
Fan Zhang
e0c253fccb
Add summary provider for system tile.
...
Refactored getLocaleNames() into a FeatureProvider interface so it's
reusable and testable.
Bug: 31801428
Test: RunSettingsRoboTests
Change-Id: I2d31a66a4b32cfa7a364a4cfef1f6eea87084577
2016-10-14 11:08:51 -07:00
TreeHugger Robot
352c55594f
Merge "Show a disclaimer about enabling vpn lockdown"
2016-10-14 12:46:15 +00:00
Bill Yi
39219ecb44
Import translations. DO NOT MERGE am: 43920d3ba5 -s ours am: 1146d6375c -s ours am: 11d7cba3b2 -s ours
...
am: 680138830a
2016-10-14 09:32:55 +00:00
Bill Yi
004708b846
Import translations. DO NOT MERGE am: 18a64f201b -s ours am: fceb2818d6 -s ours
...
am: 77f8f43e79
2016-10-14 09:32:38 +00:00
Bill Yi
680138830a
Import translations. DO NOT MERGE am: 43920d3ba5 -s ours am: 1146d6375c -s ours
...
am: 11d7cba3b2
2016-10-14 09:29:39 +00:00
Bill Yi
77f8f43e79
Import translations. DO NOT MERGE am: 18a64f201b -s ours
...
am: fceb2818d6
2016-10-14 09:29:25 +00:00
Bill Yi
11d7cba3b2
Import translations. DO NOT MERGE am: 43920d3ba5 -s ours
...
am: 1146d6375c
2016-10-14 09:22:56 +00:00
Bill Yi
1146d6375c
Import translations. DO NOT MERGE
...
am: 43920d3ba5
2016-10-14 09:21:26 +00:00
Bill Yi
fceb2818d6
Import translations. DO NOT MERGE
...
am: 18a64f201b
2016-10-14 09:20:40 +00:00
TreeHugger Robot
1fb947bfee
Merge "Import translations. DO NOT MERGE"
2016-10-14 09:11:30 +00:00
TreeHugger Robot
edbf7ba8ec
Merge "Show back button for non-toplevel settings in new IA."
2016-10-14 02:24:23 +00:00
TreeHugger Robot
436815da94
Merge "Add nfc preference controller."
2016-10-14 02:04:08 +00:00
TreeHugger Robot
533bfa6bd7
Merge "Use a ConcurrentSet to keep track of preferences in logger."
2016-10-14 00:51:32 +00:00
Jerry Zhang
5d36a177d9
Refactor setCurrentFunction and setUsbDataUnlocked into one method
...
This allows us to get rid of an extraneous config switch and
simplify some code.
Test: Manually change usb configuration
Change-Id: Id78da530ff485ecd7a915056832eec1dd8c91954
2016-10-13 17:32:22 -07:00
Doris Ling
e214570abf
Add nfc preference controller.
...
Update connected devices and wireless setting to use the nfc
preference controller for displaying the nfc and bean settings.
Test: RunSettingsRoboTests
Bug: 31800290
Change-Id: I06eee6b7bfe1d8b767216198bd37f1c79e53d992
2016-10-13 17:19:35 -07:00
TreeHugger Robot
2b03a7d092
Merge "Add more preference controllers to network page."
2016-10-14 00:00:01 +00:00
Fan Zhang
60f0107b3a
Show back button for non-toplevel settings in new IA.
...
Bug: 32159368
Test: RunSettingsRoboTests
Change-Id: I627a6e456ece8ecb1fc337fcd4dd1e9598dab554
2016-10-13 16:53:41 -07:00
Bill Yi
43920d3ba5
Import translations. DO NOT MERGE
...
Change-Id: Ia1b89602b4538d719cf4b4c2285290598a9d60f6
Auto-generated-cl: translation import
2016-10-13 15:35:00 -07:00
Bill Yi
18a64f201b
Import translations. DO NOT MERGE
...
Change-Id: If676bfdcdc338204bedc7a678042d214d0cbc0a3
Auto-generated-cl: translation import
2016-10-13 15:30:06 -07:00
Fan Zhang
eb0c8711c6
Use a ConcurrentSet to keep track of preferences in logger.
...
The preference set can be modified across different threads, apparently.
Change-Id: I4506066d86f7f7d5570c24511db20471d12b0b4a
Fixes: 32156066
Test: manual
2016-10-13 15:24:01 -07:00
Bill Yi
e6fe46d880
Import translations. DO NOT MERGE
...
Change-Id: Ia650e465c441fbb127038ad378fe01d8ef86583c
Auto-generated-cl: translation import
2016-10-13 15:22:07 -07:00
Fan Zhang
f1acdd3a51
Add more preference controllers to network page.
...
- To support Mobile plan preference controller, extended
LifecycleObserver pattern to also observe onCreate and onSaveInstance.
Bug: 31799836
Test: RunSettingsRoboTests
Change-Id: Ie98db7efa91f0a8b4c8a06a784d3351237e59fe0
2016-10-13 15:01:18 -07:00
TreeHugger Robot
3bada0d272
Merge "Check for FingerprintManager before using."
2016-10-13 20:44:24 +00:00
Jeff Sharkey
8d8bb6ee1d
Check for FingerprintManager before using.
...
Test: built
Bug: 32096112
Change-Id: I2d2ad86c7bf9a4aa16f26e90eb3fca86a6b4b2fb
2016-10-13 12:59:17 -06:00
Jaewoong Jung
e8d5c8fda1
Changes event handling phases for DeviceListPreferenceFragment.
...
Bug: 31273140
Test: Manual inspection.
Change-Id: If4622b8d367813eb86a54a45f2e8fa4a55ca38b1
2016-10-13 11:22:54 -07:00
TreeHugger Robot
fdca235dc5
Merge "Add PreferenceControllers to Network page."
2016-10-13 04:00:45 +00:00
TreeHugger Robot
5db5b02b40
Merge "Add connected devices dashboard category for new IA."
2016-10-13 02:17:36 +00:00
Qi Ding
55cdee2738
Merge "Fix searched item isn't highlighted" am: 363c529dc6 am: 1d07de566d am: 85768b3723
...
am: 051c1b298d
2016-10-13 01:40:53 +00:00
Qi Ding
051c1b298d
Merge "Fix searched item isn't highlighted" am: 363c529dc6 am: 1d07de566d
...
am: 85768b3723
2016-10-13 01:34:08 +00:00
Qi Ding
85768b3723
Merge "Fix searched item isn't highlighted" am: 363c529dc6
...
am: 1d07de566d
2016-10-13 01:28:00 +00:00
Qi Ding
1d07de566d
Merge "Fix searched item isn't highlighted"
...
am: 363c529dc6
2016-10-13 01:19:49 +00:00
Treehugger Robot
363c529dc6
Merge "Fix searched item isn't highlighted"
2016-10-13 01:13:41 +00:00
