Commit Graph

8934 Commits

Author SHA1 Message Date
Anna Galusza
da0e4d3280 Merge "Add Tron Logging to portion of A11y SUW that lives in Settings. Bug: 27777706" into nyc-dev 2016-04-05 16:46:29 +00:00
Jason Monk
80058c6f3a Merge "Update data saver icon" into nyc-dev
am: 72304b5

* commit '72304b5edd62fa14d9f61265eb6dcda0d6aeea59':
  Update data saver icon

Change-Id: I44d5e08939a912123bce2d8e92530fc613851c9f
2016-04-05 16:45:56 +00:00
Jason Monk
4145fb96d4 Update data saver icon
Change-Id: I9ffd81224da2601a9c4618da04a058da1c08d38e
Fixes: 28004364
2016-04-05 12:36:24 -04:00
Qi Ding
519ca78639 Merge "Fix end padding of summary text for dialog is too narrow" am: dc07c29 am: 69960b8
am: cd79f40

* commit 'cd79f4058363a3e8e5366e1261aa8911f3846575':
  Fix end padding of summary text for dialog is too narrow

Change-Id: I6f112eb356cc3bf28bd9abff134e317c3cceced9
2016-04-05 14:41:44 +00:00
Jason Monk
cd79f40583 Merge "Fix end padding of summary text for dialog is too narrow" am: dc07c29
am: 69960b8

* commit '69960b8da7eec23fb2ee0b9199c2e2ea9e131a08':
  Fix end padding of summary text for dialog is too narrow

Change-Id: I987214f302cd56fd1301ebe7307f843c5da276a5
2016-04-05 14:38:54 +00:00
Bill Yi
196c7f74db Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 03:22:40 +00:00
Bill Yi
8dea99bb1e Merge "Import translations. DO NOT MERGE" 2016-04-05 03:22:02 +00:00
Qi Ding
e5d4a5db28 Fix end padding of summary text for dialog is too narrow
The end padding of summary text is too narrow,
so "dialogPreferredPadding" attribute should be used
as the end padding of the whole list item.

Change-Id: I348c1a0ac8da011b4971b4f38c7f5ee3e295146f
2016-04-05 11:31:36 +09:00
Bill Yi
30ea505237 Import translations. DO NOT MERGE
Change-Id: I38d52ee3540f9b1e593d482d2eccb180d7936212
Auto-generated-cl: translation import
2016-04-04 18:10:36 -07:00
Bill Yi
74e731f34e Import translations. DO NOT MERGE
Change-Id: I344146b41edaf6d5a98c0159ab4f07e717e077b6
Auto-generated-cl: translation import
2016-04-04 17:26:33 -07:00
Udam Saini
4105d0d436 Merge "Adds a multi line preference class." into nyc-dev am: 9a8f009
am: a837edb

* commit 'a837edb3c66014d1244a9e57be963c1f94b1676a':
  Adds a multi line preference class.

Change-Id: I4114b9206389d3dedfb288a5ee969461ab514d53
2016-04-04 20:18:16 +00:00
Udam Saini
a837edb3c6 Merge "Adds a multi line preference class." into nyc-dev
am: 9a8f009

* commit '9a8f0098805f225f84b5adbc11a76ffc7afe7a8b':
  Adds a multi line preference class.

Change-Id: Ibbea8a472b7c2514c32d451c597970470d9a8e17
2016-04-04 20:13:44 +00:00
Udam Saini
9a8f009880 Merge "Adds a multi line preference class." into nyc-dev 2016-04-04 20:06:30 +00:00
Jason Monk
9300f59223 Merge "Add moar dividers" into nyc-dev am: da6ae85
am: ed84c11

* commit 'ed84c11657da0f17176dca77ef1f349aac5baf22':
  Add moar dividers

Change-Id: Ia3ecd5c8ef3f35926684f878ecf94afea6f4f658
2016-04-04 19:41:05 +00:00
Jason Monk
ed84c11657 Merge "Add moar dividers" into nyc-dev
am: da6ae85

* commit 'da6ae856a9fc76f05553cc2d9a0d1bb09ae07b29':
  Add moar dividers

Change-Id: Ic418d2eac4c41dda4fc8efe9ace712d2a7587fbf
2016-04-04 19:36:44 +00:00
Jason Monk
da6ae856a9 Merge "Add moar dividers" into nyc-dev 2016-04-04 19:29:55 +00:00
Jason Monk
3676b931d9 Add moar dividers
Bug: 27834471
Change-Id: I575040edcdf76124f21a667e64762acb86a65cb2
2016-04-04 13:20:59 -04:00
Julia Reynolds
5360308d18 Merge "Lowercase s." into nyc-dev am: b24cfaf
am: cf61f2e

* commit 'cf61f2e160b8463474f6978e8a0bcf2b53bd8e13':
  Lowercase s.

Change-Id: I6e3efc44b140b2a5828bdb1dd0bdf2fd0af7f8e7
2016-04-04 14:00:23 +00:00
Julia Reynolds
cf61f2e160 Merge "Lowercase s." into nyc-dev
am: b24cfaf

* commit 'b24cfafd1dfbc95f85341ebd6f355e35d05f8b7e':
  Lowercase s.

Change-Id: I6606efd93f4d7550d3004af5be0ad809b4593614
2016-04-04 13:56:54 +00:00
Julia Reynolds
b24cfafd1d Merge "Lowercase s." into nyc-dev 2016-04-04 13:52:27 +00:00
Clara Bayarri
234f737610 Merge "Remove fullstop at end of phrases" into nyc-dev am: bd5eb13
am: 4b91148

* commit '4b91148b3d2d3126cb5463f4401d651af7f0206f':
  Remove fullstop at end of phrases

Change-Id: I22eb5096a610569007e09fe5b7f3e96fdfe5c2af
2016-04-04 12:28:06 +00:00
Clara Bayarri
4b91148b3d Merge "Remove fullstop at end of phrases" into nyc-dev
am: bd5eb13

* commit 'bd5eb1331ecc741bae84b1d1093c5102877f36b9':
  Remove fullstop at end of phrases

Change-Id: I79391dfad9814397dc6276ffb70042ba67a0543a
2016-04-04 12:24:46 +00:00
Clara Bayarri
bd5eb1331e Merge "Remove fullstop at end of phrases" into nyc-dev 2016-04-04 12:17:00 +00:00
Jeff Sharkey
a6ea5a4bdc Merge "Mark UI components for tests to find." into nyc-dev am: 9069181
am: 6cd645a

* commit '6cd645a4879c58fb19a1a9713088c31c652e7b35':
  Mark UI components for tests to find.

Change-Id: I8f0075afaccbcf7ec718bc09c847eb3e23860b27
2016-04-03 04:14:27 +00:00
Jeff Sharkey
6cd645a487 Merge "Mark UI components for tests to find." into nyc-dev
am: 9069181

* commit '9069181c847168896c6fac97e8869944c97f0f2e':
  Mark UI components for tests to find.

Change-Id: Ie822df10d4a0c64727f46a29fbb6e07e366de702
2016-04-03 04:09:00 +00:00
Jeff Sharkey
9069181c84 Merge "Mark UI components for tests to find." into nyc-dev 2016-04-03 03:59:21 +00:00
Jeff Sharkey
a77652fea9 Mark UI components for tests to find.
Bug: 26498834
Change-Id: Id8ade0b9230a946c7facf8ebaf9700c196b31ee3
2016-04-01 23:18:11 -06:00
Anna Galusza
16d58e78df Add Tron Logging to portion of A11y SUW that lives in Settings.
Bug: 27777706

Change-Id: I0c0f0f1c30ba5b1d40bc4e74faadacbdb93dbc51
2016-04-01 14:34:17 -07:00
Rachel Zhang
12b2261033 Merge "Add suggestion carousel view and dependencies to settings" 2016-04-01 17:35:47 +00:00
Alan Viverette
26753d7106 Use normal button style for Clear data / cache buttons
Bug: 27967106
Change-Id: I251edc122a74c69e8174b8467c36c28ca47aa853
2016-04-01 12:26:11 -04:00
Fan Zhang
e5287f10ce Merge "Add an empty status fragment for status and suggestions." 2016-04-01 16:08:48 +00:00
Fan Zhang
3feafd22ed Add an empty status fragment for status and suggestions.
Bug: 27927402

Also add a TabLayout to show title for these fragments, inspired by
http://goo.gl/aOt51Q

Change-Id: I40bab3075480670558ac9a896337109f10e8c90c
2016-04-01 09:07:31 -07:00
Tyler Gunn
746aa34f5a Merge "Adding "wifi only" option for wifi calling." into nyc-dev am: 00c334c
am: d5eb67f

* commit 'd5eb67f5662c615e92a9c78e2691a01c58166b6e':
  Adding "wifi only" option for wifi calling.

Change-Id: I7e9fa3ec4adf01ac8d237edfd904f05ef1ae9306
2016-04-01 16:03:27 +00:00
Tyler Gunn
d5eb67f566 Merge "Adding "wifi only" option for wifi calling." into nyc-dev
am: 00c334c

* commit '00c334ccba341761af448805ddfc842394f3dfbb':
  Adding "wifi only" option for wifi calling.

Change-Id: I7766c8b09b3713fa75c72838f7136bd8dc32b332
2016-04-01 15:58:41 +00:00
Tyler Gunn
00c334ccba Merge "Adding "wifi only" option for wifi calling." into nyc-dev 2016-04-01 15:43:08 +00:00
Tyler Gunn
2013ba8ed1 Adding "wifi only" option for wifi calling.
- Added "wifi-only" option to the list of wifi calling modes.
- Added code in settings initialization to check whether the carrier
supports including the wifi-only option.  If it does not, changes the
entries/values to a ser which does not include the wifi-only option.

Bug: 27858149
Change-Id: Ib02a97afcf6f2722c28b7a4d9c241774944c52d0
2016-04-01 08:41:18 -07:00
Julia Reynolds
96ddca3519 Lowercase s.
Bug: 27853578
Change-Id: I1c0b3a7fc00ba4f5e8330885213d641aec9518f7
2016-04-01 10:53:10 -04:00
Clara Bayarri
3cb2511166 Remove fullstop at end of phrases
Requested by UX

Bug: 27913794
Change-Id: Ieb6ace1236787128825e39c310331603f574a32b
2016-04-01 12:39:35 +01:00
Clara Bayarri
8505258c31 Merge "Change Work Challenge background image" into nyc-dev am: 63096e9
am: dfae146

* commit 'dfae1467ea6304da96f8505c683e9cc205c1e7dd':
  Change Work Challenge background image

Change-Id: Ibef0bc4a8164b0f496ee1e2b77b1307d23931701
2016-04-01 11:31:23 +00:00
Clara Bayarri
dfae1467ea Merge "Change Work Challenge background image" into nyc-dev
am: 63096e9

* commit '63096e965c1ff95b8b7eed53388aa00014500381':
  Change Work Challenge background image

Change-Id: Ib2b87c666fe73da24de6f375c74505f4b3498e21
2016-04-01 11:27:42 +00:00
Clara Bayarri
63096e965c Merge "Change Work Challenge background image" into nyc-dev 2016-04-01 11:18:24 +00:00
Rachel Zhang
0050ac0bb7 Add suggestion carousel view and dependencies to settings
Bug: 27752219
Change-Id: Idc14227990c902c04de5bfb6649efb6da64c9168
2016-03-31 14:12:26 -07:00
Robin Lee
a8bf579e34 Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev am: 4d29ab3
am: e79fed2

* commit 'e79fed2839bbb70c1df111947208e00833057154':
  DISALLOW_CONFIG_CREDENTIALS blocks user credentials

Change-Id: I53a5b108a62f679e731164a8ac21f121ad21cabf
2016-03-31 18:59:00 +00:00
Robin Lee
e79fed2839 Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev
am: 4d29ab3

* commit '4d29ab31455ae7c7eef91871230e34b3ecc452e1':
  DISALLOW_CONFIG_CREDENTIALS blocks user credentials

Change-Id: I20a82efa39f5116ba3919198418873e794fa5240
2016-03-31 18:55:32 +00:00
Robin Lee
4d29ab3145 Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev 2016-03-31 18:44:21 +00:00
Victor Chang
fc20972456 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev am: b1d7142
am: 5cffb81

* commit '5cffb81f567009e589e2bbc8ccd3dcae15147f13':
  Show notification when failing to turn on always-on vpn

Change-Id: I2446bb50b8981800e400faf4a04f291b416afd58
2016-03-31 17:46:38 +00:00
Robin Lee
c421db78f0 DISALLOW_CONFIG_CREDENTIALS blocks user credentials
All settings preferences related to credentials of any kind should be
stopped by this user restriction.

Bug: 26879958
Change-Id: I983c6e58081bd4022bb006942499cba4b74954e7
2016-03-31 18:45:43 +01:00
Victor Chang
5cffb81f56 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev
am: b1d7142

* commit 'b1d7142cb21de23ec9c1dddb824405bf252bffed':
  Show notification when failing to turn on always-on vpn

Change-Id: I76c5ad7c545294edfeb533148ba85cdcdc41dc58
2016-03-31 17:44:34 +00:00
Victor Chang
b1d7142cb2 Merge "Show notification when failing to turn on always-on vpn" into nyc-dev 2016-03-31 17:04:53 +00:00
Jason Monk
ae130a27c5 Merge "Fix categeries being read out on settings dashboard" into nyc-dev am: 69446e8
am: d09508b

* commit 'd09508b8fc2c6fd917ab2f69e1014fa96edf2e1d':
  Fix categeries being read out on settings dashboard

Change-Id: I3ffd285de257ed9171a5b0d9f11f61305f22f4bf
2016-03-31 15:50:46 +00:00