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
Geoff Mendal
d4aa6dd89d Import translations. DO NOT MERGE 
Change-Id: I79579c3aa684edf09b0bc85941dea8a70a4c12fc
Auto-generated-cl: translation import
 2014-10-29 13:31:24 -07:00
Geoff Mendal
15d1b346cf Import translations. DO NOT MERGE 
Change-Id: I2b2810ffec88c69ab46b6672df00d381ce2429b2
Auto-generated-cl: translation import
 2014-10-29 13:28:44 -07:00
PauloftheWest
98523c8b8b Added Cellular Data for Multi-Sim Data Usage 
+ Bug Fix: SimSettings would crash if a SIM was not in the first slot.

Change-Id: Iee75ea78dde72dc7d2d588caff1ddd451347a8f5
 2014-10-29 12:48:39 -07:00
Sanket Padawe
4a1c5486b8 am 917aaf9e: Merge "Add sim color selection in settings" into lmp-mr1-dev 
* commit '917aaf9ebd2893b9d0cebc2b08c4f7d814fa53c7':
  Add sim color selection in settings
 2014-10-28 22:53:07 +00:00
Sanket Padawe
917aaf9ebd Merge "Add sim color selection in settings" into lmp-mr1-dev 2014-10-28 22:48:33 +00:00
PauloftheWest
22f257b091 am 93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev 
* commit '93c10334c8380b997554a02f6071b3bc620e7705':
  Added IMEI status activity.
 2014-10-28 22:48:29 +00:00
PauloftheWest
93c10334c8 Merge "Added IMEI status activity." into lmp-mr1-dev 2014-10-28 22:45:34 +00:00
Sanket Padawe
abc505aac3 Add sim color selection in settings 
Adding a dropdown list to select sim color from sim settings UI.

Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
 2014-10-28 14:01:50 -07:00
Paul Lawrence
be49264410 am 00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev 
* commit '00abeba2c08b656db924d967a0733aa76aea40a7':
  Make emergency button right size
 2014-10-28 20:14:31 +00:00
Paul Lawrence
00abeba2c0 Merge "Make emergency button right size" into lmp-mr1-dev 2014-10-28 20:08:33 +00:00
PauloftheWest
f41aaa249b Added IMEI status activity. 
+ Added IMEI support from MTK with formatting changes.  Now extra SIM
  IMEI information is displayed in a seperate activity.

Bug: 17935115
Change-Id: I48942d77650bef2a1778996db3b1ec3a9d87492c
 2014-10-28 13:00:11 -07:00
Jason Monk
d920bd0819 am ca063736: Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev automerge: 496b3f6 automerge: 3caba72 
* commit 'ca063736e98decbf14d876dd90689d02cb18eaa2':
  Allow QS to launch adding network dialog
 2014-10-28 19:44:28 +00:00
vandwalle
5e62773362 am 64186866: Merge "prettify debug informations" into lmp-mr1-dev automerge: 10a4cac automerge: 1260451 
* commit '64186866c4fffa670543118c2e0fd95df4954362':
  prettify debug informations
 2014-10-28 19:44:27 +00:00
Jason Monk
ca063736e9 Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev automerge: 496b3f6 
automerge: 3caba72

* commit '3caba72aa11c32daf3ad8ef0b8ba6a7e503c4b80':
  Allow QS to launch adding network dialog
 2014-10-28 19:41:15 +00:00
vandwalle
64186866c4 Merge "prettify debug informations" into lmp-mr1-dev automerge: 10a4cac 
automerge: 1260451

* commit '12604519aac0b99733dc40c712d129f6c3f680d4':
  prettify debug informations
 2014-10-28 19:41:09 +00:00
John Spurlock
bcfc830491 am 89ad2939: am 90674e53: Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev automerge: 22a466a 
* commit '89ad293983574615dcc2af9a46000feed363ca15':
  Settings: Follow update to common conditions call.
 2014-10-28 19:18:19 +00:00
Jason Monk
3caba72aa1 Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev 
automerge: 496b3f6

* commit '496b3f647186866703af1081d26a987069a468a8':
  Allow QS to launch adding network dialog
 2014-10-28 19:16:38 +00:00
vandwalle
12604519aa Merge "prettify debug informations" into lmp-mr1-dev 
automerge: 10a4cac

* commit '10a4cacc0f51a8d0e0f62be9375a3ca638b0ac4a':
  prettify debug informations
 2014-10-28 19:16:31 +00:00
Paul Lawrence
59717ad3a7 Make emergency button right size 
Bug: 18123894
Bug: 17394128
Change-Id: I248890b82f62146e1814172fd8b67e9a39661997
 2014-10-28 19:01:18 +00:00
Jason Monk
496b3f6471 Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev 2014-10-28 18:45:24 +00:00
vandwalle
10a4cacc0f Merge "prettify debug informations" into lmp-mr1-dev 2014-10-28 18:34:33 +00:00
Alexandra Gherghina
9102c3485c am 4da8a5c4: am 9f0bab9b: Merge "Close account settings if there\'s no account to show" into lmp-mr1-dev automerge: ffae7de 
* commit '4da8a5c4ad6bbbe6236832a2f76b05c231e1c446':
  Close account settings if there's no account to show
 2014-10-28 18:10:55 +00:00
John Spurlock
89ad293983 am 90674e53: Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev 
automerge: 22a466a

* commit '22a466a82ebce42ae0b75c80226b10ab97f89321':
  Settings: Follow update to common conditions call.
 2014-10-28 18:07:57 +00:00
Alexandra Gherghina
4da8a5c4ad am 9f0bab9b: Merge "Close account settings if there\'s no account to show" into lmp-mr1-dev 
automerge: ffae7de

* commit 'ffae7de1ea79d147fcb30b54d23f4973d330a19b':
  Close account settings if there's no account to show
 2014-10-28 18:02:14 +00:00
Jason Monk
36760c108b Allow QS to launch adding network dialog 
This allows QS to set an extra that will launch the adding network
dialog directly for a specified ssid.  It will be used to take users
straight from QS to the password entry, when a secure network is
selected.

Bug: 17722817
Change-Id: I570596af906de005c505678b539f915c06e6fd14
 2014-10-28 13:21:12 -04:00
John Spurlock
22a466a82e am 90674e53: Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev 
* commit '90674e53fc1fbac31f112fd6f11a5365cf66ec42':
  Settings: Follow update to common conditions call.
 2014-10-28 17:12:57 +00:00
John Spurlock
90674e53fc Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev 2014-10-28 17:08:51 +00:00
John Spurlock
24791abae1 Settings: Follow update to common conditions call. 
Bug: 16824863
Change-Id: I4a4e455b99e1c68a65c63bfd3a9972e57555825f
 2014-10-28 12:33:30 -04:00
Alexandra Gherghina
ffae7de1ea am 9f0bab9b: Merge "Close account settings if there\'s no account to show" into lmp-mr1-dev 
* commit '9f0bab9bcb756607da99758971207ad833c4608b':
  Close account settings if there's no account to show
 2014-10-28 15:35:36 +00:00
Alexandra Gherghina
9f0bab9bcb Merge "Close account settings if there's no account to show" into lmp-mr1-dev 2014-10-28 15:29:38 +00:00
Wink Saville
d7f427b597 am bca457c6: am 4aab7ecb: Merge "Change subId to int from long" into lmp-mr1-dev automerge: cb02b97 
* commit 'bca457c60fd2dcd8d59ba4c16d23dfebe6e53a3d':
  Change subId to int from long
 2014-10-28 07:17:41 +00:00
Geoff Mendal
d01083d193 am 2ef9983d: (-s ours) am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c -s ours automerge: 967c000 -s ours 
* commit '2ef9983d4eff175364fd963db7df8a8392b5bd4e':
  Import translations. DO NOT MERGE
 2014-10-28 07:17:40 +00:00
Geoff Mendal
0f68e1c31c am 134ed71c: (-s ours) am 40f84ca0: (-s ours) Import translations. DO NOT MERGE automerge: 9ab85cf -s ours 
* commit '134ed71ceddbc43ffdbfdf59f889af09629c71e1':
  Import translations. DO NOT MERGE
 2014-10-28 07:17:39 +00:00
Wink Saville
bca457c60f am 4aab7ecb: Merge "Change subId to int from long" into lmp-mr1-dev 
automerge: cb02b97

* commit 'cb02b97f8dc972e0438492b1cadaa21b34a301b6':
  Change subId to int from long
 2014-10-27 21:36:17 +00:00
Geoff Mendal
2ef9983d4e am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c -s ours 
automerge: 967c000  -s ours

* commit '967c000603e40704008a094cce3f3348acab7cf8':
  Import translations. DO NOT MERGE
 2014-10-27 21:36:10 +00:00
Geoff Mendal
134ed71ced am 40f84ca0: (-s ours) Import translations. DO NOT MERGE 
automerge: 9ab85cf  -s ours

* commit '9ab85cf0e01e2a96637c8a786a8df5fc5e0ccc65':
  Import translations. DO NOT MERGE
 2014-10-27 21:35:59 +00:00
Geoff Mendal
8ceb0c97b0 am 1dc92b37: (-s ours) am bf9175c0: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE 
* commit '1dc92b37337d4ce956c530fd8bec3c324a356d8b':
 2014-10-27 20:39:17 +00:00
Baligh Uddin
bc2e9d95f2 am 6e05caac: (-s ours) am 5b3f6a3a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGE 
* commit '6e05caac2cd01479a284d5953658ef7f897715a7':
 2014-10-27 20:39:16 +00:00
Jim Miller
4e3fd4fecd am d4072bce: am cd8971a9: am aa037675: Fix bad string in EncryptionInterstitial 
* commit 'd4072bce628f2f1ab5a370cb2d55507990c0fbeb':
 2014-10-27 20:39:15 +00:00
Jim Miller
65bca9cc85 am d57be02a: am 7b13fe8f: am 47adff0a: Show warning dialog when Accessibility is enabled 
* commit 'd57be02ad5170b563ca98b48deeec4eb94154080':
 2014-10-27 20:39:14 +00:00
Jim Miller
42516e391c am df99f650: am b72f97c0: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev 
* commit 'df99f650bd768da5a5d1be2068dbd740d038b7f3':
 2014-10-27 20:39:13 +00:00
Svetoslav
1bdba9928a am 58d6b511: am fec94660: am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev 
* commit '58d6b511313d5c628ea685eab9a0c1dac8a4c1c1':
 2014-10-27 20:39:12 +00:00
Amith Yamasani
9d7c9e751b am 64aedae1: am 2ae9f8ab: am e52c159c: Fix some strings for the encryption stuff. 
* commit '64aedae130f47bbc331fcab1652eef4ab747826e':
 2014-10-27 20:39:11 +00:00
Jim Miller
52486884e0 am 7c618504: am 9a7f7a34: am 4f903c3e: Add strings for upcoming change. 
* commit '7c6185041e1cef563dfd32d3df1228be71fa62ce':
 2014-10-27 20:39:10 +00:00
Svetoslav
d46588ea62 am b1766368: am c8a1bb5a: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption. 
* commit 'b1766368538cf428d69f20dd3b00e3efe2b54c8e':
 2014-10-27 20:39:09 +00:00
Geoff Mendal
8b29391220 am 4402b047: (-s ours) am d33f7d6a: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4402b04767b3ae014cbf930d4b7520490a4acfa1':
 2014-10-27 20:39:07 +00:00
Jim Miller
d1d823cc03 am c65633eb: am 9afd56e0: am 46c7f6d6: Add a checkbox option to \'require password to decrypt\' 
* commit 'c65633eb27e16010e366b09289e33df31855e374':
 2014-10-27 20:39:06 +00:00
Fabrice Di Meglio
e959b4f7ad am c4ea2969: am 84ff9901: am 94dce761: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev 
* commit 'c4ea2969f62073a14eecab1bafb1306ffce2edd7':
 2014-10-27 20:39:04 +00:00
Jason Monk
8bae1bb066 am ea9819f4: am 8b1fe3b8: am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev 
* commit 'ea9819f4ad685318c694c8b3152b4e9ce1382595':
 2014-10-27 20:39:03 +00:00
Andres Morales
149027e6bf am db4c54b6: am 4a9b3cf5: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev 
* commit 'db4c54b68f777438771cbf2887df03b3beab6e56':
 2014-10-27 20:39:02 +00:00