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

26906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roozbeh Pournader
aacca81c31 Merge "Show only up to two locales in Settings" into nyc-dev 
am: a260cf8931

* commit 'a260cf8931bb51e2a8879deb8461c9444595b786':
  Show only up to two locales in Settings

Change-Id: I34fae4ef523d9719ce09cc62cd556c56b232b003
 2016-05-31 01:14:42 +00:00
Roozbeh Pournader
a260cf8931 Merge "Show only up to two locales in Settings" into nyc-dev 2016-05-31 01:02:41 +00:00
Jason Monk
6ed9be1352 Merge "Fix pref availability for search" into nyc-dev 
am: 8eaa3de931

* commit '8eaa3de9317eb21855db43ed276b90ca48ad1d28':
  Fix pref availability for search

Change-Id: If1baba85d5d2897f5a360a75aad96ac72bfe1bd7
 2016-05-27 17:08:54 +00:00
Jason Monk
3b8dd1eeae Merge "Don\'t allow restricted data usage of system" into nyc-dev 
am: da52f08b0a

* commit 'da52f08b0a86182cef1f0949f0ef45d5efa092cc':
  Don't allow restricted data usage of system

Change-Id: Id5ad8e2b5ab03f397e0340f83b97e3598a308403
 2016-05-27 17:08:54 +00:00
Jason Monk
8eaa3de931 Merge "Fix pref availability for search" into nyc-dev 2016-05-27 17:07:23 +00:00
Jason Monk
be9412107d Fix pref availability for search 
Change-Id: Ic080e131c6c751456b22d370aade77748d912b6b
Fixes: 28987828
 2016-05-27 12:58:53 -04:00
Jason Monk
da52f08b0a Merge "Don't allow restricted data usage of system" into nyc-dev 2016-05-27 16:51:59 +00:00
Paul Stewart
aa5afb18fe Merge "Display connect button in the wifi connection menu" am: 9126cfba19 
am: ace9f52725

* commit 'ace9f527253a5464308f8dd3aa97f841d5d2d996':
  Display connect button in the wifi connection menu

Change-Id: Ia72d92c7e50cfb316772609e561b34d0b8c62333
 2016-05-27 15:06:06 +00:00
Damien Vagner
ace9f52725 Merge "Display connect button in the wifi connection menu" 
am: 9126cfba19

* commit '9126cfba19c92d9fbce928ddd0caf7b098b94d3b':
  Display connect button in the wifi connection menu

Change-Id: I92ec007a194f6717ec3bea22107c97c555bca09c
 2016-05-27 14:59:10 +00:00
Jason Monk
9b926c0bc6 Don't allow restricted data usage of system 
Cause it will just crash

Change-Id: I4ee43633eb3fa488816b1d2767073cbe404c2c33
Fixes: 28979013
 2016-05-27 10:57:10 -04:00
Paul Stewart
9126cfba19 Merge "Display connect button in the wifi connection menu" 2016-05-27 14:50:10 +00:00
Roozbeh Pournader
217b1d1581 Show only up to two locales in Settings 
The list could otherwise grow very long, spamming the screen.

Bug: 28872122
Change-Id: I8c4dbe659e1c088eba8b5ba1b2905b5eb8bc0229
 2016-05-26 19:01:06 -07:00
Roozbeh Pournader
49d704c228 Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev 
am: 24aa3b01af

* commit '24aa3b01af017c0d020a4e31ff88203f20140ce3':
  Force dashboard summary to single-line and ellipsize it

Change-Id: If6a43255eb932c479031826caef353138bd35525
 2016-05-27 00:20:42 +00:00
Roozbeh Pournader
24aa3b01af Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev 2016-05-27 00:11:47 +00:00
Maurice Lam
2ddf85b94b Merge "Add activity label to encryption interstitial" into nyc-dev 
am: 19c0046422

* commit '19c0046422e0cf5586e37323157a27331db45572':
  Add activity label to encryption interstitial

Change-Id: I6aef221cd49b0bab4ae7da332f388865effb4e20
 2016-05-26 23:58:26 +00:00
Roozbeh Pournader
5272b1cfd6 Force dashboard summary to single-line and ellipsize it 
Previously, the summary could become multiline. In rare combinations
of text and screen width, to indicate to the user that the text is
cut, we now ellipsize it too. Finally, since the ellipsis can get
too close to the end of the line, we add a padding equal to the left
margin of the icon.

Bug: 28872122
Change-Id: I27226e5de7781cf096508ddbef4f9095961ce028
 2016-05-26 16:48:12 -07:00
Maurice Lam
19c0046422 Merge "Add activity label to encryption interstitial" into nyc-dev 2016-05-26 23:46:07 +00:00
Bill Yi
1c6e3e571f Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: d5f7c20a26  -s ours

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

Change-Id: Iec4e72b5683fb0cd6292d586e798b16bbe962e5e
 2016-05-26 17:42:02 +00:00
Julia Reynolds
fe77548afc Merge "Importance slider updates." into nyc-dev 
am: 7c2c025e4f

* commit '7c2c025e4ff6b91ab3ab1e78e278a12a8051c542':
  Importance slider updates.

Change-Id: Ief2d1785b756e6dad315e286a28115b044174daf
 2016-05-26 17:37:02 +00:00
Jason Monk
031faa05e0 Merge "Fix crash from battery saver switch" into nyc-dev 
am: 371aec1e92

* commit '371aec1e92aa4b5cf6e4ed2b5f39faf180c17d1f':
  Fix crash from battery saver switch

Change-Id: If0c08614030b97453fb7bd7fe756738e288864ae
 2016-05-26 17:37:00 +00:00
TreeHugger Robot
d5f7c20a26 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-26 17:07:21 +00:00
Julia Reynolds
7c2c025e4f Merge "Importance slider updates." into nyc-dev 2016-05-26 16:50:57 +00:00
Jason Monk
371aec1e92 Merge "Fix crash from battery saver switch" into nyc-dev 2016-05-26 16:46:51 +00:00
Julia Reynolds
373a9e2fcf Importance slider updates. 
Icon & tint.

Bug: 28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d
 2016-05-26 11:08:16 -04:00
Jason Monk
e4d0ed502d Fix crash from battery saver switch 
Turns out most things expect the conditions to be loaded immediately
so if the dashboard hasn't been hit, they crash.  Instead load
immediately for everything but the dashboard.

Change-Id: Iaa1114c88b3766e2ac513acb417ef2a55a0f4e7f
Fixes: 28952354
 2016-05-26 11:07:53 -04:00
Ricky Wai
fed850c9b6 Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev 
am: fec38d0699

* commit 'fec38d06991b0c49750d02e27e6d8a452a1bca29':
  Use LockPatternUtils.resetKeyStore() to clear keystore

Change-Id: I72265dbbcd34c30c7399ab9c7782763459a19a57
 2016-05-26 14:04:25 +00:00
Ricky Wai
fec38d0699 Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev 2016-05-26 13:46:25 +00:00
Victor Chang
195330a9c2 Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev 
am: eb02435cbf

* commit 'eb02435cbf06335dc641a20a9c244323f7567710':
  Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation

Change-Id: I37e0fd839f1daaa8c639fdd22f45329dbf91e689
 2016-05-26 11:13:39 +00:00
Victor Chang
eb02435cbf Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev 2016-05-26 10:55:26 +00:00
Derek Tan
a12ac3c683 Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev 
am: 08e24d43b6

* commit '08e24d43b6f1021b4eb6cd71543f16226d43bded':
  Use getConfigForSubId instead of getConfig(int).

Change-Id: I21c3a65f2c6000ca207c0ca8bceb5316325c5e22
 2016-05-25 23:51:58 +00:00
Derek Tan
08e24d43b6 Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev 2016-05-25 23:41:20 +00:00
Sudheer Shanka
68a4e6c104 Merge "Guard against IllegalArgumentException" into nyc-dev 
am: 96305a2b34

* commit '96305a2b34b9b22d815200372c7636d28175b8fd':
  Guard against IllegalArgumentException

Change-Id: I8589c4c63d355d51ff0be27cd1ae6bd98eb2c0d9
 2016-05-25 23:10:43 +00:00
Bill Yi
5b8dafec31 Import translations. DO NOT MERGE 
Change-Id: I62ad1f9b258253eda03814f9a7bd93986c85f902
Auto-generated-cl: translation import
 2016-05-25 16:07:25 -07:00
TreeHugger Robot
96305a2b34 Merge "Guard against IllegalArgumentException" into nyc-dev 2016-05-25 23:07:01 +00:00
Derek Tan
d1151c19d8 Use getConfigForSubId instead of getConfig(int). 
Per API review, we want to revert getConfig(int) to
getConfigForSubId(int) (ag/1075011). This CL changes all
callers to use getConfigForSubId(int).

Bug: 28295813
Change-Id: I0e44a5e758aed34ce26740632270700bde66cff6
 2016-05-25 15:00:27 -07:00
Robin Lee
cb5c925432 Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev 
am: a6269236a2

* commit 'a6269236a24e00947efd3471f2901783413d56e5':
  Don't crash trying to disable lockdown VPN

Change-Id: Ic83af8894c66947586d84ebdbfa667a6b1d2a93c
 2016-05-25 21:20:48 +00:00
Robin Lee
a6269236a2 Merge "Don't crash trying to disable lockdown VPN" into nyc-dev 2016-05-25 21:05:54 +00:00
Sudheer Shanka
1fa37f3bb3 Guard against IllegalArgumentException 
Bug: 28742227
Change-Id: If436ec3f743ca11ea40dce2033b7b993cb6ad170
 2016-05-25 13:17:12 -07:00
Jeff Sharkey
a592e55e5f Merge "Skip indexing content while user is locked." into nyc-dev 
am: c416433a9e

* commit 'c416433a9ee55e2ac44fdb8e6c6d6ca4ed4cde62':
  Skip indexing content while user is locked.

Change-Id: I6ab94e16a26186490ce4f43bca4a96445e114b36
 2016-05-25 18:42:40 +00:00
Jason Monk
25f821c3c2 Don\'t update conditions on background threads 
am: 6cb280d146

* commit '6cb280d14641327b32378504544d125bbc3bcaf3':
  Don't update conditions on background threads

Change-Id: I617f17f7e4839566bd6996a31c0d4b6bdfc0b8e4
 2016-05-25 18:42:38 +00:00
TreeHugger Robot
c416433a9e Merge "Skip indexing content while user is locked." into nyc-dev 2016-05-25 18:27:29 +00:00
Jason Monk
6cb280d146 Don't update conditions on background threads 
Instead build a list and set it on the main thread to avoid
concurrent modification crashes.

Change-Id: I936fbeb70359583e55ae8ddcb0ea46b5753cb3b0
Fixes: 28794277
 2016-05-25 12:53:34 -04:00
Jeff Sharkey
c4eac99223 Skip indexing content while user is locked. 
Otherwise we try touching printing services which throw.

Bug: 28912897
Change-Id: I25638794b35fd383fbe67604ac921d16743628ad
 2016-05-25 10:52:34 -06:00
Ricky Wai
7a2eb4d3a9 Hide work profile key in user credentials screen 
am: 9579274cda

* commit '9579274cda38c552b43febe0980f0ec6bd07277d':
  Hide work profile key in user credentials screen

Change-Id: I1db0e7538f4e6e8cfddac9a4f94ee2d050c4d433
 2016-05-25 13:21:01 +00:00
Ricky Wai
9579274cda Hide work profile key in user credentials screen 
Bug: 28878708
Change-Id: Ic9733ea973e1cc37028cb5f740969b5e24fb5aef
 2016-05-25 13:11:24 +00:00
Maurice Lam
46a194bf3b Add activity label to encryption interstitial 
So that TalkBack refers to the screen by this more specific name.

Bug: 28868846
Change-Id: I93139959dcdbd156d57f01699283e01b178305b8
 2016-05-24 20:03:08 -07:00
Adrian Roos
aea945a821 Merge "Remove option to configure emergency app" into nyc-dev 
am: 06b7d7cdf9

* commit '06b7d7cdf954902dad8fde766fe54ea315a463b3':
  Remove option to configure emergency app

Change-Id: I4643f4cae85c6e70d82a8a25f34c2f17305b240d
 2016-05-25 00:23:29 +00:00
TreeHugger Robot
06b7d7cdf9 Merge "Remove option to configure emergency app" into nyc-dev 2016-05-25 00:17:20 +00:00
Victor Chang
27ca104ece Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation 
ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED has been abused.
We should not set onfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED
for work challenge and most other cases.

It's temp fix for the rotation bug. Because it's inconsistent the activity is shown
on top of keyguard with/without rotation (or any config change). In long term,
SHOW_WHEN_LOCKED should be set only if it's truly on purpose, and remove
isKeyguardLocked checking.

Bug: 28878075
Change-Id: I19db913f5bcaf2644c8c46c25e9584103d7fee8a
 2016-05-24 15:57:23 +01:00
Victor Chang
8cc4630521 Merge "Trust the certificate after unlocking screenlock" into nyc-dev 
am: 32e17d0862

* commit '32e17d08629e745cb21ba381f752ec84d2ed591e':
  Trust the certificate after unlocking screenlock

Change-Id: Id0f6da39fc3af71a85ebde93f854d2752c7422b5
 2016-05-24 14:20:02 +00:00