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
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
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
2016-09-29 05:59:22 +00:00
Matthew Fritze
202193109b
Tablet Settings Layout is no longer stretched am: c4a9b18121 am: a936610ae2
...
am: fa7aa9663e
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
2016-09-29 05:58:51 +00:00
Meng Wang
c59b12a4fc
WiFiCallingSettings: show roaming preferrence am: fe3749dd0b am: 335b3488f9
...
am: 9f0d5f7e5d
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
2016-09-29 03:50:16 +00:00
Hugo Benichi
55e04b82af
Update text of wifi to cell autoswitch toggle am: 1968fb1fd4
...
am: b00a9135ba
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
2016-09-29 03:46:11 +00:00
Hugo Benichi
b00a9135ba
Update text of wifi to cell autoswitch toggle
...
am: 1968fb1fd4
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
Stephen Chen
fb9693d83b
Wrap layout content so that "Open by default" view does not scroll.
...
Bug: 29088583
Change-Id: I2f4d102b2997042bf06778f2094d8dcd0b5d15f7
Fixes: 29088583
Test: Visually verified
2016-09-28 18:46:51 -07: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
2016-09-29 00:36:18 +00:00
Matthew Fritze
fa7aa9663e
Tablet Settings Layout is no longer stretched am: c4a9b18121
...
am: a936610ae2
2016-09-29 00:36:04 +00:00
Meng Wang
82812ff668
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev am: 2f6eef699d
...
am: 2c545d5bfa
2016-09-29 00:35:49 +00:00
Meng Wang
9f0d5f7e5d
WiFiCallingSettings: show roaming preferrence am: fe3749dd0b
...
am: 335b3488f9
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
2016-09-29 00:27:18 +00:00
Matthew Fritze
a936610ae2
Tablet Settings Layout is no longer stretched
...
am: c4a9b18121
2016-09-29 00:27:17 +00:00
Meng Wang
2c545d5bfa
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev
...
am: 2f6eef699d
2016-09-29 00:26:56 +00:00
Meng Wang
335b3488f9
WiFiCallingSettings: show roaming preferrence
...
am: fe3749dd0b
2016-09-29 00:22:18 +00:00
TreeHugger Robot
6cafff3b2c
Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev
2016-09-29 00:16:24 +00:00
Meng Wang
2f6eef699d
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev
2016-09-29 00:13:53 +00:00
Matthew Fritze
72648f9ec5
Merge "Settings suggestions now describes expand and collapse in talkback" into nyc-mr1-dev am: fb0d4c8534 am: cdaddb365f
...
am: e8dd48370b
2016-09-28 23:22:07 +00:00
Matthew Fritze
f3b1d7b580
Settings suggestions now describes expand and collapse in talkback am: 62cf9efd9b am: d522eff9e5
...
am: a7b7f86f1e
2016-09-28 23:21:51 +00:00
Matthew Fritze
e8dd48370b
Merge "Settings suggestions now describes expand and collapse in talkback" into nyc-mr1-dev am: fb0d4c8534
...
am: cdaddb365f
2016-09-28 23:01:26 +00:00
Matthew Fritze
a7b7f86f1e
Settings suggestions now describes expand and collapse in talkback am: 62cf9efd9b
...
am: d522eff9e5
2016-09-28 23:01:12 +00:00
Jaewoong Jung
03ceac7636
Merge "Deligates some themes.xml attributes to dimens.xml."
2016-09-28 23:00:00 +00:00
Matthew Fritze
cdaddb365f
Merge "Settings suggestions now describes expand and collapse in talkback" into nyc-mr1-dev
...
am: fb0d4c8534
2016-09-28 22:58:11 +00:00
Matthew Fritze
d522eff9e5
Settings suggestions now describes expand and collapse in talkback
...
am: 62cf9efd9b
2016-09-28 22:58:10 +00:00
Jaewoong Jung
97e8c99172
Deligates some themes.xml attributes to dimens.xml.
...
Bug: 31448445
Test: Inspected manually.
Change-Id: Ifda3424287cde4474eb20be53c3ff3e54e6eba5e
2016-09-28 15:57:42 -07:00
Matthew Fritze
fb0d4c8534
Merge "Settings suggestions now describes expand and collapse in talkback" into nyc-mr1-dev
2016-09-28 22:52:26 +00:00
Matthew Fritze
c4a9b18121
Tablet Settings Layout is no longer stretched
...
Change-Id: If4a883077f41b859f4e8aaf92a4f397b94814137
Fixes: 31583422
Tests: Visual Inspection
2016-09-28 15:40:55 -07:00
Daniel Nishi
ec59822764
Merge "Add a warning message to the ASM toggle." into nyc-mr1-dev am: 24d63d17d6 am: 6ee68d167f
...
am: 6a7a181be4
2016-09-28 22:13:52 +00:00
Daniel Nishi
a2e0824b26
resolve merge conflicts of a4e3842 to master
...
Change-Id: Ia52171f3cfa0bcb73c6a4d23122ef8ad9025e807
2016-09-28 13:20:27 -07:00
Daniel Nishi
6a7a181be4
Merge "Add a warning message to the ASM toggle." into nyc-mr1-dev am: 24d63d17d6
...
am: 6ee68d167f
2016-09-28 18:41:40 +00:00
Daniel Nishi
a4e3842b1e
Add a warning message to the ASM toggle. am: 116b95666f
...
am: c409b02411
2016-09-28 18:41:24 +00:00
Daniel Nishi
6ee68d167f
Merge "Add a warning message to the ASM toggle." into nyc-mr1-dev
...
am: 24d63d17d6
2016-09-28 18:38:23 +00:00
Daniel Nishi
c409b02411
Add a warning message to the ASM toggle.
...
am: 116b95666f
2016-09-28 18:38:22 +00:00
TreeHugger Robot
24d63d17d6
Merge "Add a warning message to the ASM toggle." into nyc-mr1-dev
2016-09-28 18:34:30 +00:00
TreeHugger Robot
176478c282
Merge "Make icon size are the same in factory reset account list."
2016-09-28 17:51:30 +00:00
Steven Ng
5b4b9de3f3
Merge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into nyc-mr1-dev am: 2f5ab90e70 am: 27fc8ed383
...
am: a2fb0055aa
2016-09-28 17:07:20 +00:00
Steven Ng
76745fc7cb
DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent am: da738b2edc am: a2c32a3b91
...
am: 2d83e3a357
2016-09-28 17:07:14 +00:00
Steven Ng
a2fb0055aa
Merge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into nyc-mr1-dev am: 2f5ab90e70
...
am: 27fc8ed383
2016-09-28 17:04:04 +00:00
Steven Ng
2d83e3a357
DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent am: da738b2edc
...
am: a2c32a3b91
2016-09-28 17:03:57 +00:00
Steven Ng
27fc8ed383
Merge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into nyc-mr1-dev
...
am: 2f5ab90e70
2016-09-28 17:01:30 +00:00
Steven Ng
a2c32a3b91
DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent
...
am: da738b2edc
2016-09-28 17:01:26 +00:00
