PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,779 Commits 1 Branch 0 Tags
2ad430e74288be0af1db2c7623beebd76e5af20c
Commit Graph

18779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
d831733fab am 651474d0: am 4d7a6248: Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev 
* commit '651474d0275f9d7cd10cdd6e0afb7dd107e66335':
  Fixed a Settings crash when entering SIM status
 2014-12-05 19:12:44 +00:00
Adrian Roos
f39a0988ef am 5df6e030: Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev 
* commit '5df6e0302c242b801eee73a513ba04a79f508c2e':
  Fix race leading to spuriously disabled trust agents
 2014-12-05 18:32:02 +00:00
Adrian Roos
5df6e0302c Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev 2014-12-05 18:25:59 +00:00
Jeff Davidson
5ead6b92fd Final platform settings UX for ephemeral networks. 
Show "Connected via Wi-Fi assistant" instead of just "Connected" when
a Wi-Fi connection is ephemeral. Otherwise, treat ephemeral
connections just like saved ones - show (read-only) connection stats
when you click the network, and offer the ability to "forget" the
network, which prevents further ephemeral connections.

Bug: 18525241
Change-Id: I0d2146ab47b82d32c50b2ef883f176a6b6066713
 2014-12-05 10:14:41 -08:00
Adrian Roos
16809b1ad7 Fix race leading to spuriously disabled trust agents 
If TrustManagerService is able to refresh the trust agents before
the Settings activity gets a chance to reenable the lock pattern,
the TrustManagerService won't see a secure credential and won't
load any agents. This was introduced when we switched to isSecure
instead of getKeyguardStoredPasswordQuality. The latter ignored
the lockPatternEnabled flag.

Bug: 18596036
Change-Id: I2734899f7684916fc84bc3a07edca29310887103
 2014-12-05 18:47:20 +01:00
Sanket Padawe
9a73365ed7 am 76fd9d62: am 669d4e4f: am 91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev 
* commit '76fd9d62facb2c683b69c2e4280534abdb2281bd':
  Removed unnecessary heading in Sim settings
 2014-12-05 16:26:39 +00:00
Sanket Padawe
76fd9d62fa am 669d4e4f: am 91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev 
* commit '669d4e4fce68d3f8e6391fab5d4e60e358234767':
  Removed unnecessary heading in Sim settings
 2014-12-05 15:52:03 +00:00
Maurice Lam
ecf2f401e9 am 2c0c9837: Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev 
* commit '2c0c983755903bf9c0a5cb276c64ed7cf4557464':
  [FRP] Use setup wizard nav bar buttons
 2014-12-05 03:27:17 +00:00
Maurice Lam
2c0c983755 Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev 2014-12-05 03:21:53 +00:00
Justin Harrison
9704e3d6ba am 03cceb32: Merge "Removed the application SIM Cards from application list" into lmp-mr1-dev 
* commit '03cceb329366796a64cfb86b03fe0c08b06f852b':
  Removed the application SIM Cards from application list
 2014-12-05 02:25:42 +00:00
Justin Harrison
03cceb3293 Merge "Removed the application SIM Cards from application list" into lmp-mr1-dev 2014-12-05 02:17:24 +00:00
Maurice Lam
40a252ce49 am dfaf4c92: Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev 
* commit 'dfaf4c92c19356116267cf9c61168414d817b9a7':
  [FRP] Add illustration to lock screen setup
 2014-12-05 00:32:53 +00:00
Maurice Lam
dfaf4c92c1 Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev 2014-12-05 00:23:00 +00:00
Geoff Mendal
94eb04617f am eb5b7721: (-s ours) am e2182449: (-s ours) am 3f5fd1fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'eb5b7721df47a601d3707a7bcbf32d61efe09c5b':
  Import translations. DO NOT MERGE
 2014-12-05 00:14:20 +00:00
Amith Yamasani
0c8a2d63be am a7ddb536: am 53e8940b: am 6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-dev 
* commit 'a7ddb536fd9ed69f8436f1f786ca576fd34effa3':
  Fix padding in user type selection dialog
 2014-12-05 00:14:14 +00:00
Maurice Lam
7b6801af7c am 73a68c07: am 45f44ad7: am a3dff74e: Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev 
* commit '73a68c0727fbc2caa85109eea17e2b583c5905c1':
  [FRP] Transitions for lock screen setup
 2014-12-05 00:14:13 +00:00
Wink Saville
05e3147192 am 527c7dbc: am 0d8027ce: am 98a35726: Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev 
* commit '527c7dbcc74a79b18c0c82a9778da49ba894e56d':
  Change initMobileTabTag to use subInfoList
 2014-12-05 00:14:11 +00:00
PauloftheWest
2b2019255e am 753a00e0: am 06ddf97c: am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev 
* commit '753a00e057201ad319bf85487beb1c6329bf1a05':
  Add SIM notification pop-ups.
 2014-12-05 00:14:10 +00:00
Maurice Lam
b6f5e003a9 am 13989d6d: Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev 
* commit '13989d6d9f25a5d09d68dfc98b31595e8e6b8425':
  [FRP] Give pattern lock colors
 2014-12-04 23:13:50 +00:00
Sanket Padawe
3c72c817f8 Change default sim selection text in sim settings ui. 
Bug: 18611090
Change-Id: Ifd2c26e02f1051536c4113b4351cefa51c2d5210
 2014-12-04 23:08:00 +00:00
Maurice Lam
13989d6d9f Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev 2014-12-04 23:04:37 +00:00
Maurice Lam
67f105bc98 [FRP] Give pattern lock colors 
Bug: 18482708
Change-Id: Id471ee66902742b34fdd6ae3312d37d34094d493
 2014-12-04 14:30:52 -08:00
Geoff Mendal
eb5b7721df am e2182449: (-s ours) am 3f5fd1fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'e21824491ee47ecc35376b9fd909a07416276f29':
  Import translations. DO NOT MERGE
 2014-12-04 21:47:16 +00:00
Amith Yamasani
a7ddb536fd am 53e8940b: am 6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-dev 
* commit '53e8940b94a7b508659b84fd9037f922f1d4a50f':
  Fix padding in user type selection dialog
 2014-12-04 21:47:15 +00:00
Maurice Lam
73a68c0727 am 45f44ad7: am a3dff74e: Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev 
* commit '45f44ad7e31b3ef8f4e3f4b5bd43cc215e712b9f':
  [FRP] Transitions for lock screen setup
 2014-12-04 21:47:14 +00:00
Wink Saville
527c7dbcc7 am 0d8027ce: am 98a35726: Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev 
* commit '0d8027cedcea809d925af5a19590388e8b4945d0':
  Change initMobileTabTag to use subInfoList
 2014-12-04 21:47:13 +00:00
PauloftheWest
753a00e057 am 06ddf97c: am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev 
* commit '06ddf97c4da204e62a5427c8e22643c267c1d9ed':
  Add SIM notification pop-ups.
 2014-12-04 21:47:11 +00:00
Geoff Mendal
1324cb3561 am b8fcb473: (-s ours) am a37526a6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'b8fcb473e499ed160ee24cccdba73002a73977e3':
  Import translations. DO NOT MERGE
 2014-12-04 20:46:08 +00:00
PauloftheWest
62297eac1d Removed the application SIM Cards from application list 
Bug: 18623155
Change-Id: Ic9ef449136fb6ef854727ad994976a5dc6d8ee8c
 2014-12-04 12:32:40 -08:00
Geoff Mendal
b8fcb473e4 am a37526a6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'a37526a6829c24abfac6fc21b41225f7ee11e756':
  Import translations. DO NOT MERGE
 2014-12-04 20:24:52 +00:00
Maurice Lam
af103b4eb4 [FRP] Use setup wizard nav bar buttons 
Use setup wizard nav bar buttons instead of custom button bar for
lock screen setup.

Bug: 18482708
Change-Id: I471f475ebe6bc7ba8cfbd179daddd854c1b6982a
 2014-12-04 12:20:47 -08:00
Sanket Padawe
232b0e4e67 Removing checks from EnableWifiTether which are done in SystemUI 
Bug: 18368949
Change-Id: Ib80e7b4adaf4d5fb6029bbee0f6fdf5a99e18018
 2014-12-04 12:10:15 -08:00
PauloftheWest
dbd0382130 SIM cards in Setting will only show on Multi-SIM devices 
Bug: 16808006
Change-Id: Iecba1a1dabecf20ac8fa8c137f4eef4555ddceaf
 2014-12-04 11:56:35 -08:00
PauloftheWest
651474d027 am 4d7a6248: Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev 
* commit '4d7a6248587500f336834dce6e2f11fe078bf106':
  Fixed a Settings crash when entering SIM status
 2014-12-04 18:30:26 +00:00
PauloftheWest
4d7a624858 Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev 2014-12-04 18:25:34 +00:00
Sanket Padawe
669d4e4fce am 91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev 
* commit '91a4deb5e9cc957918c2e27e509300f3015c72d6':
  Removed unnecessary heading in Sim settings
 2014-12-04 18:19:11 +00:00
Sanket Padawe
91a4deb5e9 Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev 2014-12-04 18:12:41 +00:00
PauloftheWest
7fa2415492 Fixed a Settings crash when entering SIM status 
Bug: 18596763
Change-Id: I699268345c342be05814bb531027dd53cba1c370
 2014-12-04 10:09:28 -08:00
David 'Digit' Turner
6a93406b33 am 5e883b3b: Merge "resolved conflicts for merge of e6af9327 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 
* commit '5e883b3b37e7203f712174ed46b7a04eb19ea3da':
  Fix Settings app crash for devices with no USB support.
 2014-12-04 16:17:39 +00:00
John Spurlock
39ccb47342 am 24f17f0b: am f29bc1df: am 45893e65: Settings: Don\'t lose the switch bar returning to saver settings. 
* commit '24f17f0b94341c84ca017598089bdb52e44e1f6a':
  Settings: Don't lose the switch bar returning to saver settings.
 2014-12-04 16:16:42 +00:00
Geoff Mendal
e21824491e am 3f5fd1fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '3f5fd1febae34976bdc3f03b44eaec99bbf9703b':
  Import translations. DO NOT MERGE
 2014-12-04 15:17:53 +00:00
Amith Yamasani
53e8940b94 am 6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-dev 
* commit '6ff07c418ff171296e763a6658fe4b7f49e12871':
  Fix padding in user type selection dialog
 2014-12-04 15:17:52 +00:00
Maurice Lam
45f44ad7e3 am a3dff74e: Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev 
* commit 'a3dff74e59b29fdff63810e55c27207a8354c935':
  [FRP] Transitions for lock screen setup
 2014-12-04 15:17:51 +00:00
Wink Saville
0d8027cedc am 98a35726: Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev 
* commit '98a35726522899efab19bafeff331b0f77553e89':
  Change initMobileTabTag to use subInfoList
 2014-12-04 15:17:50 +00:00
PauloftheWest
06ddf97c4d am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev 
* commit 'e8a868f26616f59206eba19c0b08ad4c99882b8c':
  Add SIM notification pop-ups.
 2014-12-04 15:17:48 +00:00
David 'Digit' Turner
5e883b3b37 Merge "resolved conflicts for merge of e6af9327 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 2014-12-04 09:13:41 +00:00
David 'Digit' Turner
111a62edab resolved conflicts for merge of e6af9327 to lmp-mr1-dev-plus-aosp 
Change-Id: I53d46554c11b4d67b84cc713b88a09a28a79db4c
 2014-12-04 10:12:29 +01:00
Geoff Mendal
63042047d4 Merge "Import translations. DO NOT MERGE" 2014-12-04 05:51:22 +00:00
Geoff Mendal
a37526a682 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-04 05:48:32 +00:00
Geoff Mendal
3f5fd1feba Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-04 05:46:51 +00:00