Bill Yi
dc8af3b953
Import translations. DO NOT MERGE am: ccde0787b8 -s ours am: 4367ed325e -s ours
...
am: 3e664455dc
2016-10-18 06:02:50 +00:00
Bill Yi
79a4b3160d
Import translations. DO NOT MERGE am: 6515783df6 -s ours am: 37c5dd0fe3 -s ours
...
am: a95e430c93
2016-10-18 05:49:41 +00:00
Bill Yi
cda385e996
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ffabbe58b -s ours
...
am: 987866df87
2016-10-18 05:49:22 +00:00
Bill Yi
3e664455dc
Import translations. DO NOT MERGE am: ccde0787b8 -s ours
...
am: 4367ed325e
2016-10-18 05:49:02 +00:00
Bill Yi
a95e430c93
Import translations. DO NOT MERGE am: 6515783df6 -s ours
...
am: 37c5dd0fe3
2016-10-18 05:40:29 +00:00
Bill Yi
987866df87
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 5ffabbe58b
2016-10-18 05:40:02 +00:00
Bill Yi
4367ed325e
Import translations. DO NOT MERGE
...
am: ccde0787b8
2016-10-18 05:40:01 +00:00
Bill Yi
37c5dd0fe3
Import translations. DO NOT MERGE
...
am: 6515783df6
2016-10-18 05:37:33 +00:00
TreeHugger Robot
5ffabbe58b
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-18 05:30:53 +00:00
TreeHugger Robot
0bfea1fe1a
Merge "Import translations. DO NOT MERGE"
2016-10-18 05:30:34 +00:00
TreeHugger Robot
46017eff74
Merge "Add move settings to system page."
2016-10-18 00:47:28 +00:00
Salvador Martinez
d03dd83d2d
Updating colors as part of bluetooth refactoring
...
Dialogs for bluetooth pairing are being refactored.
This contains some trivial color changes that were
done at the same time.
Test: RoboTests
Bug: 32180625
Change-Id: I8807ab929faa95158ec6d7d336b2580a42bccf20
2016-10-17 16:10:03 -07:00
Fan Zhang
1fa096ad4e
Add move settings to system page.
...
Bug: 31801428
Test: manual
Change-Id: Ifc1f1190369a2f199e58700583bb3dfa251a1b4d
2016-10-17 15:58:28 -07:00
Fan Zhang
98cb0ace7f
Merge "Draw preference divider based on preference group."
2016-10-17 22:42:44 +00:00
jackqdyulei
a709e7546e
Layout change in support card and support dialog
...
1. Wrap the support_disclaimer_content by scrollview.
2. Change the layout in support_escalation_options using layout_weight.
3. Add styles in layout-sw300dp and layout-sw400dp
The target scope is between 300dp->400dp, so I add the default style
in sw400dp and changed style in sw300dp to cover it.
Bug: 31399419
Test: Visual
Change-Id: I117acb0c5b992bea2cded6cd48749c4ed7b04488
2016-10-17 15:12:37 -07:00
jackqdyulei
013da34209
Suspend action in security patch when browser is disabled
...
When queryIntentActivities(intent, flag) return empty, don't send out
that intent to stop crash. This is a special catch only in security
patch.
Bug: 32054067
Test: Manual, hard to mock the situation to disable all the apps for
a specific action.
Change-Id: Ibc96b814a4170926972cff8e0bc954ea57b33c10
2016-10-17 14:35:15 -07:00
Adrian Roos
82829ee0b1
Separate ambient display triggers
...
Allows configuring notification and sensor triggers
separately. Introduces a helper class that hosts the
logic for determining what kinds of triggers a device
supports.
Bug: 32073185
Change-Id: Ie7e8eb6b895dcc54e6f972e70642c7248b9e223a
Test: disable "ambient display", sensor triggers should still work
2016-10-17 14:05:53 -07:00
Doris Ling
0ca61afa3b
Merge "Add static preview images to gesture settings." into nyc-mr1-dev am: ec5314f2f5 am: 1a674eef53
...
am: b4a122b227
2016-10-17 20:31:57 +00:00
Doris Ling
99238ff174
Add static preview images to gesture settings. am: 12e4bebabf am: df7b815980
...
am: fccee6adae
2016-10-17 20:31:49 +00:00
Bill Yi
6515783df6
Import translations. DO NOT MERGE
...
Change-Id: Ib4de644f9065e553dfd28458421aaba309a41de5
Auto-generated-cl: translation import
2016-10-17 13:26:38 -07:00
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
