PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,482 Commits 1 Branch 0 Tags
fa7aa422e6bc2002a168ac0885f62cf5d615d489
Commit Graph

26482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
fa7aa422e6 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 196c7f7 -s ours 
am: e70198d  -s ours

* commit 'e70198d27822fd3d60216d535a164ef976fd5c8d':
  Import translations. DO NOT MERGE

Change-Id: Idf59d4afa4a8dfde76d6b0aa51ceffd0eeac7f84
 2016-04-05 03:34:22 +00:00
Bill Yi
e70198d278 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 196c7f7  -s ours

* commit '196c7f74dbb1a30bc3898e607f8a70a8233abc65':
  Import translations. DO NOT MERGE

Change-Id: I8b9ce1df4ddebca2b4fa9e66d65d80b280586f14
 2016-04-05 03:29:31 +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
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
Julia Reynolds
eeca411ed6 Merge "Show fewer filters on notifications page." into nyc-dev am: a003fa5 
am: 41317c6

* commit '41317c639ca45b3e9d49e7b68897a52ca5596a4b':
  Show fewer filters on notifications page.

Change-Id: I601b7ebab89437b9651fee3e5282890b203d844c
 2016-04-04 19:52:28 +00:00
Julia Reynolds
dce90a057f Merge "Fix ringtone persistance after device rotation." into nyc-dev am: cd37e59 
am: 6a165a1

* commit '6a165a1b9d4c2c5ffec0b53ceb4fcaa2a043d6eb':
  Fix ringtone persistance after device rotation.

Change-Id: I92643fbaec82df5d7c8fc8a0e777799440e965b3
 2016-04-04 19:52:28 +00:00
Julia Reynolds
41317c639c Merge "Show fewer filters on notifications page." into nyc-dev 
am: a003fa5

* commit 'a003fa583cc7ca1aa2b4b98d9a6c2a96d7943e5c':
  Show fewer filters on notifications page.

Change-Id: Ie5c4d7139702fcfd3c1b8f696d386c728645cbb1
 2016-04-04 19:48:39 +00:00
Julia Reynolds
6a165a1b9d Merge "Fix ringtone persistance after device rotation." into nyc-dev 
am: cd37e59

* commit 'cd37e59b9a1d54a5896dfb0491c32eedb4326939':
  Fix ringtone persistance after device rotation.

Change-Id: Ic2453dd647b2e86f7c0ef1177ed7af18f40bcc9a
 2016-04-04 19:48:39 +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
Julia Reynolds
a003fa583c Merge "Show fewer filters on notifications page." into nyc-dev 2016-04-04 19:39:26 +00:00
Julia Reynolds
cd37e59b9a Merge "Fix ringtone persistance after device rotation." into nyc-dev 2016-04-04 19:39:13 +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
Julia Reynolds
1e91f9f30e Show fewer filters on notifications page. 
Bug: 27834480
Change-Id: Ibdc9924a7ea1b1db7be089507485de5c4fd41b58
 2016-04-04 15:20:11 -04:00
Julia Reynolds
c736efcb61 Fix ringtone persistance after device rotation. 
Bug: 26122624
Change-Id: I187fe673dea250e93c6e9603239f01845ed378a3
 2016-04-04 15:20:11 -04:00
Maurice Lam
3709f86dcc Merge "Set LinkMovementMethod in LinkTextView" into nyc-dev am: f9db17e 
am: 4317f90

* commit '4317f907c4ec7549587d7b39781823ba1b14bac2':
  Set LinkMovementMethod in LinkTextView

Change-Id: I1c94868527a0c4ef9da1044fdfa296434efaf564
 2016-04-04 18:08:40 +00:00
Maurice Lam
4317f907c4 Merge "Set LinkMovementMethod in LinkTextView" into nyc-dev 
am: f9db17e

* commit 'f9db17e3ccca5ce4c2ce5504fd6410db4bf52371':
  Set LinkMovementMethod in LinkTextView

Change-Id: Ibb4733e2b3c854f57c8101ffa424a64cbb6e1d4e
 2016-04-04 18:04:12 +00:00
Maurice Lam
f9db17e3cc Merge "Set LinkMovementMethod in LinkTextView" into nyc-dev 2016-04-04 17:57:52 +00:00
Yohei Yukawa
86649db6d1 Merge "Fix PhysicalKeyboardFragment crash bug." into nyc-dev am: 19998fe 
am: 4ddc39e

* commit '4ddc39e17f6758cbf79a393f102dcb5f74910ca7':
  Fix PhysicalKeyboardFragment crash bug.

Change-Id: Id779cf9dfab7061045f22f56f249e13a9d5b0c6a
 2016-04-04 17:48:01 +00:00
Yohei Yukawa
4ddc39e17f Merge "Fix PhysicalKeyboardFragment crash bug." into nyc-dev 
am: 19998fe

* commit '19998fef793c175280440a407bf74567bfc41e50':
  Fix PhysicalKeyboardFragment crash bug.

Change-Id: I5e7559eb4b02dd809fbc34d9949ff2737bcc0476
 2016-04-04 17:43:22 +00:00
Yohei Yukawa
19998fef79 Merge "Fix PhysicalKeyboardFragment crash bug." into nyc-dev 2016-04-04 17:28:23 +00:00
Jason Monk
3676b931d9 Add moar dividers 
Bug: 27834471
Change-Id: I575040edcdf76124f21a667e64762acb86a65cb2
 2016-04-04 13:20:59 -04:00
Julia Reynolds
858e0d3dc6 Merge "Hide repeat callers instead of disabling." into nyc-dev am: 03a3a1e 
am: 7effca5

* commit '7effca50d49f635bdf5e575573af0321d7c0f80a':
  Hide repeat callers instead of disabling.

Change-Id: I73700f6f4242532934ac01c5297525d1ff52aa73
 2016-04-04 14:00:24 +00: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
7effca50d4 Merge "Hide repeat callers instead of disabling." into nyc-dev 
am: 03a3a1e

* commit '03a3a1efd56edbba65750be7a89085c78c64d8d3':
  Hide repeat callers instead of disabling.

Change-Id: I76c256e0204d6cb42c09a801005dc0583262e49c
 2016-04-04 13:56:54 +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
03a3a1efd5 Merge "Hide repeat callers instead of disabling." into nyc-dev 2016-04-04 13:52:36 +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
Yohei Yukawa
1cdd977c69 Merge "Revert "Fix no keyboard on N builds"" into nyc-dev am: 3ace856 
am: fb43d8d

* commit 'fb43d8d1002dce58ec7ed4dfe9f7dc62b3b29d2e':
  Revert "Fix no keyboard on N builds"

Change-Id: I6be5e343e3ce25fdcd8cb3e66b8e0f77e3265801
 2016-04-02 02:47:47 +00:00
Yohei Yukawa
fb43d8d100 Merge "Revert "Fix no keyboard on N builds"" into nyc-dev 
am: 3ace856

* commit '3ace856ed788349f1e8e343fc6fb4e3bc2a26033':
  Revert "Fix no keyboard on N builds"

Change-Id: I622451e204e0277d9190c6c3ab72b6595b47f6c6
 2016-04-02 02:42:59 +00:00
Yohei Yukawa
3ace856ed7 Merge "Revert "Fix no keyboard on N builds"" into nyc-dev 2016-04-02 02:35:14 +00:00
Yohei Yukawa
7bb0465687 Revert "Fix no keyboard on N builds" 
This reverts the previous commit [1] since the keyboard shows up without
such a workaround.  Presumably someone might have fixed something in
somewhere.

 [1]: Ifd588bf7db76f9ea5d6a90854f8e92f86f4c2910
      250faf9243.

Bug: 25942488
Bug: 26190615
Change-Id: Ie0e0ead960473a3504fc88a4f7d4d18108ef0e18
 2016-04-01 17:20:37 -07:00
Maurice Lam
ac6ab03515 Set LinkMovementMethod in LinkTextView 
With ag/899084 TextView no longer automatically sets the
LinkMovementMethod when setText is called with a ClickableSpan.
So in LinkTextView we do that manually instead.

Bug: 27973982
Change-Id: I86626bd71bf2ca41cb7e73d479ba764e809b0190
 2016-04-01 17:12:10 -07:00
Jim Miller
12e5dd53af Merge "Fix crash in ConfirmDeviceCredentials" into nyc-dev am: 4a92815 
am: 6bc0101

* commit '6bc01014a7861e0adf1980feb7e2575d6715aa0f':
  Fix crash in ConfirmDeviceCredentials

Change-Id: I0dfcff28cffe92871262344e90434038899b94d9
 2016-04-01 22:44:23 +00:00
Jim Miller
6bc01014a7 Merge "Fix crash in ConfirmDeviceCredentials" into nyc-dev 
am: 4a92815

* commit '4a92815acd6aad8a22b74fd7d22a5c83feff3266':
  Fix crash in ConfirmDeviceCredentials

Change-Id: I4770a45e4888909cc54d9c2aa334bc13e5726483
 2016-04-01 22:32:26 +00:00
Jim Miller
4a92815acd Merge "Fix crash in ConfirmDeviceCredentials" into nyc-dev 2016-04-01 22:14:45 +00:00
Wei Huang
e21aff765a Merge "MVNO value is not grayed out when MVNO type is none" into nyc-dev am: e652b7b 
am: ea4ca2e

* commit 'ea4ca2e09622610d3ee0cfbfc5405949e7d00e4d':
  MVNO value is not grayed out when MVNO type is none

Change-Id: I7f492f1cf5aea400ac0a6df719975be531e1b48d
 2016-04-01 19:17:51 +00:00
Wei Huang
ea4ca2e096 Merge "MVNO value is not grayed out when MVNO type is none" into nyc-dev 
am: e652b7b

* commit 'e652b7b0cade699a396f55602f5d7a282466c705':
  MVNO value is not grayed out when MVNO type is none

Change-Id: I12079a64d44b8578d258ef0afd4391b53016c709
 2016-04-01 19:13:19 +00:00