Garfield Tan
dbd039a6de
resolve merge conflicts of af840b5
to master
...
Change-Id: I8a31d08dae71d5cb71ae01c06ead4ebf32f89121
2016-09-29 18:08:25 -07:00
Garfield Tan
af840b584d
Launch other info in storage in correct user id. am: 493bf348b9
...
am: 1ab4f4b816
Change-Id: I93d5222647efd84eb6c1d159c053455fbb382c13
2016-09-29 23:29:21 +00:00
Garfield Tan
1ab4f4b816
Launch other info in storage in correct user id.
...
am: 493bf348b9
Change-Id: Iced863d798194b66b549e4213b5f813c2773ac1b
2016-09-29 23:23:50 +00:00
Garfield Tan
493bf348b9
Launch other info in storage in correct user id.
...
Bug: 31592290
Change-Id: I816668c7ff9d1b443d4b49e17bdcfa39ef335aee
2016-09-29 14:45:50 -07:00
TreeHugger Robot
96fa06ebf7
Merge "Use DashboardFeatureProvider to load homepage tiles."
2016-09-29 21:19:34 +00:00
Jaewoong Jung
4a42f2422b
Merge "Reduces top space in lock password screen in sw600dp-land."
2016-09-29 20:38:21 +00:00
TreeHugger Robot
4fac4648b3
Merge "Maintain focus on switch for a11y"
2016-09-29 20:03:48 +00:00
Fan Zhang
a96a2d8d60
Use DashboardFeatureProvider to load homepage tiles.
...
Adding support to homepage category.
Test: SettingsRoboTests for regression. Will write tests for new feature
soon once we are set on the data structure.
Bug: 31781480
Change-Id: I25fa367fecb643f17e23f0182df7585bf1fcdd02
2016-09-29 12:31:10 -07:00
TreeHugger Robot
b08297b514
Merge "Import translations. DO NOT MERGE"
2016-09-29 18:54:18 +00:00
TreeHugger Robot
0231d64190
Merge "Settings timeout for suggestions"
2016-09-29 18:44:24 +00:00
Salvador Martinez
d969a5f53d
Settings timeout for suggestions
...
If loading suggestions takes too long (750ms)
settings will display just the categories
so the user does not get confused.
Test: Forthcoming
Bug: 31203004
Change-Id: Ic9866a5ccdcef965908db8c4592435a5d252f7b0
2016-09-29 18:39:47 +00:00
Jaewoong Jung
ac8c07518c
Reduces top space in lock password screen in sw600dp-land.
...
Bug: 31448445
Test: Manual inspection.
Change-Id: Iee780b8755d125c0d00adcd004fc374fe3ac2176
2016-09-29 11:30:49 -07:00
Salvador Martinez
8807594800
Maintain focus on switch for a11y
...
Modified subsetting where user can toggle
if an app should be able to modify system
settings so that talkback announces state
change properly.
Test: Accessibility Scanner, Manual Verification
Bug: 31755538
Change-Id: I54ad016b5edb0937b77cfdeef0cfcae24a78e2a2
2016-09-29 18:02:38 +00:00
Lei Yu
f4c5904863
Merge "Add classloader for RtlCompatibleViewPager"
2016-09-29 16:52:37 +00:00
Narayan Kamath
6fd19a1d70
WifiCallingSettings: Fix build.
...
Test: make
Change-Id: Ic22e32c960380fd6c2a6fa959d613941d13d815b
2016-09-29 15:10:17 +01:00
Bill Yi
fe2ab6e435
Import translations. DO NOT MERGE am: dccfc04a3e
-s ours am: ae35fa061e
-s ours am: a69e26abbf
-s ours
...
am: 58fb70211c
-s ours
Change-Id: I485c9bae825e7babd507e7ad0b7f33f070993c09
2016-09-29 08:07:18 +00:00
Bill Yi
be08ed16e9
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345
-s ours am: c53fb015d9
-s ours
...
am: 1ed1b99ad0
-s ours
Change-Id: If291c9d8e93d276a683a0f389ee497a7b7801eed
2016-09-29 08:07:04 +00:00
Bill Yi
a53a20eb4b
Import translations. DO NOT MERGE am: 4ae03656ac
-s ours am: ae3ec3984d
-s ours
...
am: d44a01ba45
-s ours
Change-Id: I103cc64e34aaac7afe85d8b750a903c181cd6c82
2016-09-29 08:06:50 +00:00
Bill Yi
58fb70211c
Import translations. DO NOT MERGE am: dccfc04a3e
-s ours am: ae35fa061e
-s ours
...
am: a69e26abbf
-s ours
Change-Id: If22270482cf8caffc0baa84e6205903e73f1f7fc
2016-09-29 08:01:47 +00:00
Bill Yi
1ed1b99ad0
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345
-s ours
...
am: c53fb015d9
-s ours
Change-Id: I86a1e1bd6a7ef84d41b743d1ac1b0827183ff94f
2016-09-29 07:57:41 +00:00
Bill Yi
d44a01ba45
Import translations. DO NOT MERGE am: 4ae03656ac
-s ours
...
am: ae3ec3984d
-s ours
Change-Id: I43fbba4e5f8c55a438233ac120f0af00300b8a25
2016-09-29 07:57:26 +00:00
Bill Yi
a69e26abbf
Import translations. DO NOT MERGE am: dccfc04a3e
-s ours
...
am: ae35fa061e
-s ours
Change-Id: Iefe3d69297ef0f4cb04ede83b2b93b523678c3ff
2016-09-29 07:57:16 +00:00
Bill Yi
ae35fa061e
Import translations. DO NOT MERGE
...
am: dccfc04a3e
-s ours
Change-Id: Ia00dff846fc9174b6f5f4284e3d42f1ad9869ec7
2016-09-29 07:53:15 +00:00
Bill Yi
c53fb015d9
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: f497c48345
-s ours
Change-Id: Ie7d6c6f9bbe4af3ca3709c1557dde5e52eeb91bc
2016-09-29 07:48:48 +00:00
Bill Yi
ae3ec3984d
Import translations. DO NOT MERGE
...
am: 4ae03656ac
-s ours
Change-Id: I69bfb0033fd813af6242dead9e30d4a1bfcd3cd6
2016-09-29 07:48:46 +00:00
TreeHugger Robot
f497c48345
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-09-29 07:40:48 +00:00
Bill Yi
dccfc04a3e
Import translations. DO NOT MERGE
...
Change-Id: I0cd1cb776f4dda8b02f683d92cda3efedff989bb
Auto-generated-cl: translation import
2016-09-28 23:25:18 -07:00
Bill Yi
4ae03656ac
Import translations. DO NOT MERGE
...
Change-Id: I4a6114d77d04143e22aa02f591cc6f7b75444d46
Auto-generated-cl: translation import
2016-09-28 23:20:25 -07:00
Bill Yi
adcc0faa67
Import translations. DO NOT MERGE
...
Change-Id: Ib44c99bf43ed44000c527199fe735adc51dc869a
Auto-generated-cl: translation import
2016-09-28 23:12:29 -07:00
Hugo Benichi
6641cd8db0
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev am: c81e1141cc
am: 9bd60dd8ac
...
am: f153b4bfc8
Change-Id: I8d577e0bf2edc97bcf0c3a6b39bb29a27db75a6b
2016-09-29 05:59:54 +00:00
Hugo Benichi
3d1b901e40
Update text of wifi to cell autoswitch toggle am: 1968fb1fd4
am: b00a9135ba
...
am: 55e04b82af
Change-Id: I5d3f8e6f7e8b158ade94cd757940d3134e6f1d81
2016-09-29 05:59:38 +00:00
Matthew Fritze
a3a6442996
Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev am: 6cafff3b2c
am: 493350dcf7
...
am: 7d79557c56
Change-Id: I0f5cb93802bea6f7f5af9e586a65d7e6a6a42d8c
2016-09-29 05:59:22 +00:00
Matthew Fritze
202193109b
Tablet Settings Layout is no longer stretched am: c4a9b18121
am: a936610ae2
...
am: fa7aa9663e
Change-Id: I7865b06593fc99cabe78dac7bb4a3574dea79404
2016-09-29 05:59:08 +00:00
Meng Wang
b21e35f98e
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev am: 2f6eef699d
am: 2c545d5bfa
...
am: 82812ff668
Change-Id: Ida62a975931cd05e2af01f66d337df8f0702fffc
2016-09-29 05:58:51 +00:00
Meng Wang
c59b12a4fc
WiFiCallingSettings: show roaming preferrence am: fe3749dd0b
am: 335b3488f9
...
am: 9f0d5f7e5d
Change-Id: Ie899eba9566d12534dd9bf524542c1a5f00cb38b
2016-09-29 05:55:00 +00:00
Hugo Benichi
f153b4bfc8
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev am: c81e1141cc
...
am: 9bd60dd8ac
Change-Id: I0abb48f432879b686ee179069c366753ada31161
2016-09-29 03:50:16 +00:00
Hugo Benichi
55e04b82af
Update text of wifi to cell autoswitch toggle am: 1968fb1fd4
...
am: b00a9135ba
Change-Id: Icb2059fe884e7020ad843158db1af444b2641d61
2016-09-29 03:50:01 +00:00
Hugo Benichi
9bd60dd8ac
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev
...
am: c81e1141cc
Change-Id: Idf215a22923b96129462579816e170655f99d4e8
2016-09-29 03:46:11 +00:00
Hugo Benichi
b00a9135ba
Update text of wifi to cell autoswitch toggle
...
am: 1968fb1fd4
Change-Id: I58f87f2befc0dbcb1fa0ea43dc9255a7849984f6
2016-09-29 03:46:10 +00:00
TreeHugger Robot
c81e1141cc
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev
2016-09-29 03:38:46 +00:00
Hugo Benichi
1968fb1fd4
Update text of wifi to cell autoswitch toggle
...
Bug: 31807564
Change-Id: I3332a93bca855e3d3c8d63306a116dbe7f829ae0
2016-09-29 11:13:32 +09:00
jackqdyulei
0bfee2799d
Add classloader for RtlCompatibleViewPager
...
To avoid BadParcelableException when reload the activity after it
is killed by OS.
Bug: 31707097
Test: make SettingsTests && adb install -r \
${OUT}/data/app/SettingsTests/SettingsTests.apk && \
adb shell am instrument -w \
'com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner'
Change-Id: Ic8f20d9e2d236f0bea96071a88fbc6e7ba856f54
2016-09-28 17:56:04 -07:00
Matthew Fritze
7d79557c56
Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev am: 6cafff3b2c
...
am: 493350dcf7
Change-Id: I9b1e216adddaa1e995ef0d80280fc47d7a02bad8
2016-09-29 00:36:18 +00:00
Matthew Fritze
fa7aa9663e
Tablet Settings Layout is no longer stretched am: c4a9b18121
...
am: a936610ae2
Change-Id: Ib6d604f753d3424d67396c9e051829cad43d6d76
2016-09-29 00:36:04 +00:00
Meng Wang
82812ff668
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev am: 2f6eef699d
...
am: 2c545d5bfa
Change-Id: I06bdabaabc3baec3faa82182cf8e0d0e208e252b
2016-09-29 00:35:49 +00:00
Meng Wang
9f0d5f7e5d
WiFiCallingSettings: show roaming preferrence am: fe3749dd0b
...
am: 335b3488f9
Change-Id: I9a6d86727a29991056f452b74bcc5632bb8750a9
2016-09-29 00:30:54 +00:00
Matthew Fritze
493350dcf7
Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev
...
am: 6cafff3b2c
Change-Id: I8cc65986d6b5788ccbc8919e0788cf2db4b7fade
2016-09-29 00:27:18 +00:00
Matthew Fritze
a936610ae2
Tablet Settings Layout is no longer stretched
...
am: c4a9b18121
Change-Id: Ie103fd6248bd206e517c5f7de880b76862b831ba
2016-09-29 00:27:17 +00:00
Meng Wang
2c545d5bfa
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev
...
am: 2f6eef699d
Change-Id: Id6d84cd51171da42f21894617ec26fb48e45cfa9
2016-09-29 00:26:56 +00:00
Meng Wang
335b3488f9
WiFiCallingSettings: show roaming preferrence
...
am: fe3749dd0b
Change-Id: I10a1a2e443e3c678db3fa892d4c1331339e8df85
2016-09-29 00:22:18 +00:00