Daniel Nishi
f9d4c3142e
Merge "Remove unnecessary build flag from Robotests make."
2016-08-22 21:05:35 +00:00
Fan Zhang
46788fbe13
Merge "When click conditional's title, expand/collapse content." into nyc-mr1-dev am: 95c097e835 am: 06b7346a8b
...
am: 672b84526f
Change-Id: I8bd0c6c6a270114e71acbfe7d7e082c6c2896ccf
2016-08-22 20:23:02 +00:00
Fan Zhang
6526f48816
When click conditional's title, expand/collapse content. am: 89d7bca166 am: c8b20343f0
...
am: 29e1c59f32
Change-Id: I4799fcfaa967e9bde4ca7533eb9e5ca7a1db8718
2016-08-22 20:23:02 +00:00
Fan Zhang
672b84526f
Merge "When click conditional's title, expand/collapse content." into nyc-mr1-dev am: 95c097e835
...
am: 06b7346a8b
Change-Id: I86b64a4394412567a14e3cdfdc8bc9b723f1146c
2016-08-22 20:18:30 +00:00
Fan Zhang
29e1c59f32
When click conditional's title, expand/collapse content. am: 89d7bca166
...
am: c8b20343f0
Change-Id: I416b3f87bc3d5bde0396dd5ddf6cb23c43b3d155
2016-08-22 20:18:29 +00:00
Fan Zhang
06b7346a8b
Merge "When click conditional's title, expand/collapse content." into nyc-mr1-dev
...
am: 95c097e835
Change-Id: I0449a66cb1ae894c6fdb8e478325ba222f84ff8d
2016-08-22 20:17:01 +00:00
Fan Zhang
c8b20343f0
When click conditional's title, expand/collapse content.
...
am: 89d7bca166
Change-Id: I7ee56f661cba9e9d79399b8f01fc05cf5a70b27a
2016-08-22 20:16:59 +00:00
Fan Zhang
a54135dd1c
Hide default phone preference when there is no phone app. am: dc1e04035b am: 0ae351771e
...
am: 7804d47be3
Change-Id: Ie73c4ac0584b2a1b0754f46dbbc83cb5a7918120
2016-08-22 20:10:31 +00:00
Fan Zhang
7804d47be3
Hide default phone preference when there is no phone app. am: dc1e04035b
...
am: 0ae351771e
Change-Id: I8751c22c53b66b69f1a8a4d20f4997bb40316764
2016-08-22 20:06:26 +00:00
Fan Zhang
0ae351771e
Hide default phone preference when there is no phone app.
...
am: dc1e04035b
Change-Id: I2b588c9a31f405f66c1603aacbe67798ac637dee
2016-08-22 20:05:30 +00:00
TreeHugger Robot
95c097e835
Merge "When click conditional's title, expand/collapse content." into nyc-mr1-dev
2016-08-22 20:01:17 +00:00
Daniel Nishi
b0528318e4
Remove unnecessary build flag from Robotests make.
...
Change-Id: Icd2a06ad7f5dbcf1913d16a5513765c6b2fdbf9f
2016-08-22 12:25:08 -07:00
Fan Zhang
89d7bca166
When click conditional's title, expand/collapse content.
...
Bug: 30200101
It used to lead user to detailed setting for that conditional. This
leaves some confusion about which click target goes to where.
Change-Id: Ic9525ace65ca488f4e709576fb1ec96a1cb99938
(cherry picked from commit a2db2ca8fa )
2016-08-22 18:30:16 +00:00
Fan Zhang
dc1e04035b
Hide default phone preference when there is no phone app.
...
Bug: 29859821
Change-Id: Ia6de0de04d74f4f947243f38ac2bd190ae586401
(cherry picked from commit bc6fc60683 )
2016-08-22 18:17:22 +00:00
Meng Wang
3ed14f789a
DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable am: 5ea4bb2f43 -s ours am: a928b294d9 -s ours am: 715564af48 -s ours
...
am: 951e558bdf -s ours
Change-Id: Ie3bdbe267a596a8c502ad0f50ded1ef556389130
2016-08-22 05:05:32 +00:00
Meng Wang
951e558bdf
DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable am: 5ea4bb2f43 -s ours am: a928b294d9 -s ours
...
am: 715564af48 -s ours
Change-Id: If0db222e5aff9c40dde2adf008d9ca56d3711dc7
2016-08-22 05:01:27 +00:00
Meng Wang
715564af48
DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable am: 5ea4bb2f43 -s ours
...
am: a928b294d9 -s ours
Change-Id: If964580319c45956d10626b57a6e769665bb75dd
2016-08-22 04:59:13 +00:00
Meng Wang
a928b294d9
DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable
...
am: 5ea4bb2f43 -s ours
Change-Id: Iba62c6b007ad0d68d528047896dfd88961a953cd
2016-08-22 04:46:46 +00:00
Meng Wang
5ea4bb2f43
DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable
...
Bug: 30947921
Change-Id: I80240fbd912afa9a40cee38070c4e77d5e9d6ae9
(cherry picked from commit 4436d6fe16 )
2016-08-20 22:47:08 +00:00
Felipe Leme
fd5233c51d
Merge "Fixed storage calculation when SD card is adopted as internal storage." into nyc-mr1-dev am: 4fd371d344 am: d4fb981f73
...
am: 226bb59c27
Change-Id: Ia6c4d8a00a4c01ab4adab5ae7ce2ba04e2fa76a2
2016-08-19 23:55:59 +00:00
Felipe Leme
403ceb2196
Fixed storage calculation when SD card is adopted as internal storage. am: 454d7fcca8 am: 15ebe1fcc3
...
am: 654312fa6a
Change-Id: I04a6da3cd4f3b4a37a19b5cfd21fdb63bfba099a
2016-08-19 23:55:57 +00:00
Roozbeh Pournader
a91564ffbd
Merge "Changing the languages drag handle as per the Material Design spec" into nyc-mr1-dev am: a87fa8c50a am: d6c91cbf16
...
am: c6f4da6974
Change-Id: I50ef400b3225d22643fa823a5b15f5138bd20b25
2016-08-19 23:55:56 +00:00
Mihai Nita
99ebdaf87e
Changing the languages drag handle as per the Material Design spec am: 30cf5f2615 am: 188ab9120e
...
am: 0a180b239e
Change-Id: I4c3a5bbc8d834f60499fe213ab722b2e6229f1a6
2016-08-19 23:55:55 +00:00
Felipe Leme
226bb59c27
Merge "Fixed storage calculation when SD card is adopted as internal storage." into nyc-mr1-dev am: 4fd371d344
...
am: d4fb981f73
Change-Id: I749aa6a5eaf2fdef194a3f626f9f884071186368
2016-08-19 23:25:20 +00:00
Felipe Leme
654312fa6a
Fixed storage calculation when SD card is adopted as internal storage. am: 454d7fcca8
...
am: 15ebe1fcc3
Change-Id: I67c38af3e0759501cf71e431375417388b9a2474
2016-08-19 23:25:19 +00:00
Roozbeh Pournader
c6f4da6974
Merge "Changing the languages drag handle as per the Material Design spec" into nyc-mr1-dev am: a87fa8c50a
...
am: d6c91cbf16
Change-Id: I0f0197f2da5ad0c8e2e07b2fa0f7b2fee0f13416
2016-08-19 23:25:18 +00:00
Mihai Nita
0a180b239e
Changing the languages drag handle as per the Material Design spec am: 30cf5f2615
...
am: 188ab9120e
Change-Id: Ic0024715605c79935bd175a89c84cd53ad602c7d
2016-08-19 23:25:18 +00:00
Felipe Leme
d4fb981f73
Merge "Fixed storage calculation when SD card is adopted as internal storage." into nyc-mr1-dev
...
am: 4fd371d344
Change-Id: Id95a997997b97006367c7180ca26cafb15435f42
2016-08-19 23:04:03 +00:00
Felipe Leme
15ebe1fcc3
Fixed storage calculation when SD card is adopted as internal storage.
...
am: 454d7fcca8
Change-Id: I4fa4a4c489b3f65c6aab2f012d0898442dda4c2a
2016-08-19 23:04:03 +00:00
TreeHugger Robot
4fd371d344
Merge "Fixed storage calculation when SD card is adopted as internal storage." into nyc-mr1-dev
2016-08-19 22:40:08 +00:00
Roozbeh Pournader
d6c91cbf16
Merge "Changing the languages drag handle as per the Material Design spec" into nyc-mr1-dev
...
am: a87fa8c50a
Change-Id: I21b1f122846b2c89d0df2d0bf0c74ce744ab5931
2016-08-19 22:33:41 +00:00
Mihai Nita
188ab9120e
Changing the languages drag handle as per the Material Design spec
...
am: 30cf5f2615
Change-Id: I2db85b361af48cc206bef0c958561d81369bdd35
2016-08-19 22:33:40 +00:00
Roozbeh Pournader
a87fa8c50a
Merge "Changing the languages drag handle as per the Material Design spec" into nyc-mr1-dev
2016-08-19 21:36:33 +00:00
Fan Zhang
e0e58e9dda
Extend conditional button width so it has more click area. am: e90777710c am: 0b17ff28d9
...
am: 55b93fdfcc
Change-Id: I2c3ef28f3740d472572991d1712436871fad0078
2016-08-19 20:06:11 +00:00
Fan Zhang
55b93fdfcc
Extend conditional button width so it has more click area. am: e90777710c
...
am: 0b17ff28d9
Change-Id: I6c592e623f22090852b78efa75b3579b57003787
2016-08-19 20:02:23 +00:00
Fan Zhang
0b17ff28d9
Extend conditional button width so it has more click area.
...
am: e90777710c
Change-Id: I1e8575bc3ffb2ce155877ad91251d1c0239dd216
2016-08-19 19:58:49 +00:00
André Lago
6ecc414e77
Merge "[Settings] Set different ringtones at work profile"
2016-08-19 17:02:03 +00:00
TreeHugger Robot
94789ffd77
Merge "Move SharedPreferenceLogger to instrumentation package."
2016-08-19 17:00:35 +00:00
Fan Zhang
e90777710c
Extend conditional button width so it has more click area.
...
Bug: 30822058
Change-Id: I88a88c7807309741113e4b5557686c08261eb5d0
(cherry picked from commit 40b56b4c15 )
2016-08-19 16:56:04 +00:00
Bill Yi
81df66e003
Import translations. DO NOT MERGE am: 1339fe799d -s ours am: 925c2bbcf6 -s ours
...
am: 9c6395a4f3 -s ours
Change-Id: Icf6a7fa1d8697f7acc023ea1be38add02f146852
2016-08-19 16:17:31 +00:00
Bill Yi
9c6395a4f3
Import translations. DO NOT MERGE am: 1339fe799d -s ours
...
am: 925c2bbcf6 -s ours
Change-Id: Id51ff59548ef9acd70ced2ad681f0b42524f53ac
2016-08-19 16:14:34 +00:00
Bill Yi
925c2bbcf6
Import translations. DO NOT MERGE
...
am: 1339fe799d -s ours
Change-Id: Ide032ff6bbdfdb0f73e045135f80a3d1f75f338e
2016-08-19 16:11:07 +00:00
Bill Yi
1339fe799d
Import translations. DO NOT MERGE
...
Change-Id: I0efafca736424685e687ac6f08884fdc5e69e88d
Auto-generated-cl: translation import
2016-08-19 07:39:53 -07:00
Bill Yi
b739123c2f
Import translations. DO NOT MERGE
...
Change-Id: Iab90b970b82abbf4bc2adf34d1c9ff75eaff41f4
Auto-generated-cl: translation import
2016-08-19 07:35:24 -07:00
Fan Zhang
5f79ae9677
Move SharedPreferenceLogger to instrumentation package.
...
Bug: 30914916
Test: SettingsUnitTests and RunSettingsRoboTests
- Added interface to abstract logger
- Added test for SharePrefLogger
- Moved Existing tests for instrumentation to robotests.
Change-Id: I2b431ea4b0fd09d0f11389d8b9181448f08a52c5
2016-08-18 17:38:25 -07:00
TreeHugger Robot
cbb2f5f498
Merge "Add scrollbar to Settings app."
2016-08-19 00:25:47 +00:00
TreeHugger Robot
e0bfd58a22
Merge "Delete some useless classes."
2016-08-19 00:14:55 +00:00
Todd Kennedy
46f16b357f
Merge "remove duplicate permissions"
2016-08-18 23:25:04 +00:00
Doris Ling
706071126a
Add scrollbar to Settings app.
...
Overlay PreferenceTheme to add scrollbar to the view, and also add
scrollbar to the dashboard.
Change-Id: I2273b0825b200048bd1914923b551a593aa1e16d
Fixes: 30204662
Test: manual - Launch Settings and different sub-settings, and verify
that scrollbar is shown for screen that can be scrolled.
2016-08-18 15:58:21 -07:00
Fan Zhang
061ebd2924
Delete some useless classes.
...
Change-Id: I219d8740f8d3c235630fa503f35a00986cba8ce3
Test: manual compile and launch app.
2016-08-18 15:54:03 -07:00