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

18395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
43b675e01e Import translations. DO NOT MERGE 
Change-Id: I802b868cb89763e3a0ee655415b08303a467c9bb
Auto-generated-cl: translation import
 2014-10-30 11:46:41 -07:00
Sanket Padawe
197976e6d1 resolve merge conflicts of 4e4a3f8 to master. 
Change-Id: Idab7b34c8c3f4a833686fb104e1869438b2df51d
 2014-10-30 11:05:55 -07:00
Przemyslaw Szczepaniak
abe1ad74a1 Merge "Fix typo in TTS Language option description." 2014-10-30 12:45:54 +00:00
Przemyslaw Szczepaniak
9f153fedd9 Fix typo in TTS Language option description. 
Bug: 18098410
Change-Id: Icf3736cc2f28c240d40d06b33d4f81012314cbb1
 2014-10-30 11:53:26 +00:00
PauloftheWest
9d5a324279 am 109ca52c: am 22f257b0: am 93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev 
* commit '109ca52c67c90d15c98cd3634035d0526f906e5b':
  Added IMEI status activity.
 2014-10-30 11:06:53 +00:00
Sanket Padawe
4e4a3f8963 am 4a1c5486: am 917aaf9e: Merge "Add sim color selection in settings" into lmp-mr1-dev 
* commit '4a1c5486b8d187ceb012954dc528bc8417c7cb3e':
  Add sim color selection in settings
 2014-10-30 11:03:43 +00:00
PauloftheWest
109ca52c67 am 22f257b0: am 93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev 
* commit '22f257b091a444b0749e66faa4dc79fd24adacbf':
  Added IMEI status activity.
 2014-10-30 11:03:29 +00:00
Paul Lawrence
7d0b95f4c9 am 870de3ee: am be492644: am 00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev 
* commit '870de3eeb9ebcf097ca48c63fd67a864829b6acf':
  Make emergency button right size
 2014-10-30 10:26:05 +00:00
Paul Lawrence
870de3eeb9 am be492644: am 00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev 
* commit 'be492644102083557fa47cde3ee9110826677079':
  Make emergency button right size
 2014-10-30 10:18:26 +00:00
Geoff Mendal
7eb595bd75 am 6f5b23f3: (-s ours) am 4c79a9ec: (-s ours) Import translations. DO NOT MERGE 
* commit '6f5b23f3fc4855c1906fd64fd3bcb9d5f14a02a2':
  Import translations. DO NOT MERGE
 2014-10-29 22:55:00 +00:00
Geoff Mendal
1e637964be am 062afd59: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '062afd5964003e482ce6dfd2b2443413f594ee4e':
  Import translations. DO NOT MERGE
 2014-10-29 22:54:52 +00:00
PauloftheWest
ffc766e0db am 98523c8b: Added Cellular Data for Multi-Sim Data Usage 
* commit '98523c8b8b90d011604d3a7e83a6b708f7b5e5ce':
  Added Cellular Data for Multi-Sim Data Usage
 2014-10-29 22:54:20 +00:00
Geoff Mendal
6f5b23f3fc am 4c79a9ec: (-s ours) Import translations. DO NOT MERGE 
* commit '4c79a9ecc0124d85e66aa3041c6b65b8582f4c87':
  Import translations. DO NOT MERGE
 2014-10-29 20:56:00 +00:00
Geoff Mendal
71edf2ff0f Import translations. DO NOT MERGE 
Change-Id: I866b829582f1e866969f95c904e9135748fbb9a3
Auto-generated-cl: translation import
 2014-10-29 13:51:28 -07:00
Geoff Mendal
062afd5964 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-29 20:45:55 +00:00
Geoff Mendal
4c79a9ecc0 Import translations. DO NOT MERGE 
Change-Id: I61c6746c6591894d13cf5ee2f3fd70ab4fc2762e
Auto-generated-cl: translation import
 2014-10-29 13:38:11 -07:00
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