PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,876 Commits 1 Branch 0 Tags
591a09131162a32ad5923dc3553a464a5da1d39c
Commit Graph

17876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
3b08bdec94 Import translations. DO NOT MERGE 
Change-Id: I58cb836de181e6a7b4de701941e3a13bea7378cb
Auto-generated-cl: translation import
 2014-12-17 06:18:00 -08:00
Jason Monk
c0ecaeefe8 am 5aaa4b63: am b0c8c393: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev 
* commit '5aaa4b63bd6ee0639ee067e3287e5d97b692a444':
  Add a periodic check of the tethering provisioning
 2014-12-16 17:05:14 +00:00
Jason Monk
5aaa4b63bd am b0c8c393: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev 
* commit 'b0c8c3935d5842cfefbe96d958d537fb80d4a33e':
  Add a periodic check of the tethering provisioning
 2014-12-16 16:59:47 +00:00
Jason Monk
b0c8c3935d Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev 2014-12-16 15:44:27 +00:00
Sanket Padawe
ccb9fcfa1f am 996724ea: am 7131f1a9: Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev 
* commit '996724ea6d121bf5aa75f1779fc7337b0fa3f0c9':
  Prevent sim notify popup after upgrade from k to LMR1.
 2014-12-16 03:00:41 +00:00
Sanket Padawe
622fe17483 am b92f3368: am d0591276: Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev 
* commit 'b92f336886f34358f122ed101c082ccca7a44c79':
  Exiting activity on clicking outside dialog acitivity.
 2014-12-16 03:00:39 +00:00
Sanket Padawe
996724ea6d am 7131f1a9: Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev 
* commit '7131f1a99cd87d452a1ab915333d7b1dbdfb9114':
  Prevent sim notify popup after upgrade from k to LMR1.
 2014-12-16 02:49:36 +00:00
Sanket Padawe
b92f336886 am d0591276: Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev 
* commit 'd059127659048d9f26a79e22728068c709e2d831':
  Exiting activity on clicking outside dialog acitivity.
 2014-12-16 02:49:35 +00:00
Sanket Padawe
7131f1a99c Merge "Prevent sim notify popup after upgrade from k to LMR1." into lmp-mr1-dev 2014-12-16 02:42:29 +00:00
Sanket Padawe
d059127659 Merge "Exiting activity on clicking outside dialog acitivity." into lmp-mr1-dev 2014-12-16 02:42:17 +00:00
PauloftheWest
7741dff861 am 4fe583d4: Merge "Made the WPS icon visisble." into lmp-mr1-dev 
automerge: 3df1fe0

* commit '3df1fe080f27ef46f1f3b03125391f0166af8664':
  Made the WPS icon visisble.
 2014-12-16 01:41:58 +00:00
PauloftheWest
5200f61ede am c6f5c924: Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev 
automerge: 735e93e

* commit '735e93e52c59e13a27f24170c5e41ca22d5e4e6a':
  Fixed then icons of SIMs in the call dialog.
 2014-12-16 01:41:48 +00:00
PauloftheWest
3df1fe080f am 4fe583d4: Merge "Made the WPS icon visisble." into lmp-mr1-dev 
* commit '4fe583d4cf2e2f3ba86f80e8695b104234d714eb':
  Made the WPS icon visisble.
 2014-12-16 00:54:21 +00:00
PauloftheWest
735e93e52c am c6f5c924: Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev 
* commit 'c6f5c924d8a796da1a3c2e6bd5e44c755a532771':
  Fixed then icons of SIMs in the call dialog.
 2014-12-16 00:54:20 +00:00
PauloftheWest
4fe583d4cf Merge "Made the WPS icon visisble." into lmp-mr1-dev 2014-12-15 22:49:24 +00:00
PauloftheWest
c6f5c924d8 Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev 2014-12-15 22:46:58 +00:00
Wink Saville
6ac0cef01b am 870a2a8e: am e04fd76f: Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev 
* commit '870a2a8ea85670dafdcd9d8617e0c99862f0604d':
  Use getLIn1NumberForSubscriber to get phone number.
 2014-12-15 22:41:53 +00:00
Stuart Scott
e84524efc8 am 56db3f35: am b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev 
* commit '56db3f35eba2dae6463ac981822d8fe80fc6d189':
  Show toast when cellular data option is changing.
 2014-12-15 22:41:52 +00:00
Wink Saville
870a2a8ea8 am e04fd76f: Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev 
* commit 'e04fd76f1c1a345a47673d460a04372670bad6c0':
  Use getLIn1NumberForSubscriber to get phone number.
 2014-12-15 22:35:58 +00:00
Stuart Scott
56db3f35eb am b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev 
* commit 'b62bfe715552fb86330958755f0e12ab0ffe7cad':
  Show toast when cellular data option is changing.
 2014-12-15 22:35:57 +00:00
PauloftheWest
d939683577 am 29db97d1: am 682b7ed3: Merge "IMEI information will show without a SIM." into lmp-mr1-dev 
* commit '29db97d1189a885324d950ecb3a2e80d1eabaece':
  IMEI information will show without a SIM.
 2014-12-15 21:45:37 +00:00
Sanket Padawe
9b566a0924 Prevent sim notify popup after upgrade from k to LMR1. 
Bug: 18705619
Change-Id: I6de4d20172c69358c1853e6a00c68fc353c7dad7
 2014-12-15 13:26:27 -08:00
Wink Saville
e04fd76f1c Merge "Use getLIn1NumberForSubscriber to get phone number." into lmp-mr1-dev 2014-12-15 20:45:00 +00:00
Wink Saville
c47f8db374 Use getLIn1NumberForSubscriber to get phone number. 
Bug: 18721557
Change-Id: I255627638efe21362315286a659ac59b46e1fa30
Signed-off-by: Wink Saville <wink@google.com>
 2014-12-15 12:04:29 -08:00
Stuart Scott
b62bfe7155 Merge "Show toast when cellular data option is changing." into lmp-mr1-dev 2014-12-15 19:43:19 +00:00
PauloftheWest
29db97d118 am 682b7ed3: Merge "IMEI information will show without a SIM." into lmp-mr1-dev 
* commit '682b7ed34c01ea65edfe034afe52180052b9e2fc':
  IMEI information will show without a SIM.
 2014-12-15 19:34:31 +00:00
PauloftheWest
682b7ed34c Merge "IMEI information will show without a SIM." into lmp-mr1-dev 2014-12-15 19:28:48 +00:00
PauloftheWest
592545bf7d Made the WPS icon visisble. 
Bug: 18335660
Change-Id: I62fd0be70680f74d7898dcf806ebbe41e5eb7342
 2014-12-15 10:55:28 -08:00
PauloftheWest
c8bcf2985a IMEI information will show without a SIM. 
Bug: 18701340
Change-Id: I1e92bd1af4d68849f194d30b5b894cfb144900e5
 2014-12-15 10:29:54 -08:00
Maurice Lam
befc1267a5 am 4e8a7219: am 8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev 
* commit '4e8a7219c866030b5870c9d8e0fa930423761048':
  [FRP] Open the lock setup screens in same task
 2014-12-15 17:56:32 +00:00
Maurice Lam
4e8a7219c8 am 8e0929a3: Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev 
* commit '8e0929a32ed60b95a34416a5362df93f5a329b5f':
  [FRP] Open the lock setup screens in same task
 2014-12-15 17:49:49 +00:00
Maurice Lam
8e0929a32e Merge "[FRP] Open the lock setup screens in same task" into lmp-mr1-dev 2014-12-15 17:44:53 +00:00
Narayan Kamath
62d35b65f2 resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp 
Change-Id: Iaf57dd96ab10c3f03a964fed593571895ea7be3a
 2014-12-15 16:27:39 +00:00
Geoff Mendal
755005bddf am d9df577d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'd9df577d94828775e20f20ab1efa02d8a7a5bbac':
  Import translations. DO NOT MERGE
 2014-12-15 15:08:45 +00:00
Geoff Mendal
d9df577d94 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-15 15:04:33 +00:00
Geoff Mendal
43826e6696 am d33d2127: (-s ours) am d3affe47: (-s ours) Import translations. DO NOT MERGE 
* commit 'd33d2127f739083c2f23a99eecd6bc3f21b53b83':
  Import translations. DO NOT MERGE
 2014-12-15 14:43:37 +00:00
Geoff Mendal
7e5cd2830f Import translations. DO NOT MERGE 
Change-Id: I1cd9781471c0c3c1c74fc429e9013e9e8dfeef41
Auto-generated-cl: translation import
 2014-12-15 06:42:32 -08:00
Geoff Mendal
d33d2127f7 am d3affe47: (-s ours) Import translations. DO NOT MERGE 
* commit 'd3affe47eedcdc6aa2bfd829f55fce8ed2be7e72':
  Import translations. DO NOT MERGE
 2014-12-15 14:36:51 +00:00
Geoff Mendal
d3affe47ee Import translations. DO NOT MERGE 
Change-Id: I07a9426156ec5f40cded12af58aca05723a55005
Auto-generated-cl: translation import
 2014-12-15 06:26:44 -08:00
Narayan Kamath
fa89388641 Merge "Stop using apache-http in settings." 2014-12-15 14:23:47 +00:00
Lucky Zhang
a6f6e5a35b am 03f336d0: am 5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev 
* commit '03f336d07c055b6870dd18ab0096f9e5b085ff51':
  [FRP] Notification screen slides in wrong direction
 2014-12-13 00:29:43 +00:00
Lucky Zhang
03f336d07c am 5f17119f: Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev 
* commit '5f17119f4683617ed5444c088b0439bb005a3514':
  [FRP] Notification screen slides in wrong direction
 2014-12-13 00:24:20 +00:00
Lucky Zhang
5f17119f46 Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev 2014-12-13 00:15:32 +00:00
PauloftheWest
a886d69f9d Fixed then icons of SIMs in the call dialog. 
Bug: 18672758
Change-Id: I812e79a48b048f8449cc07fdcccab57a114cdd24
 2014-12-12 12:21:17 -08:00
John Spurlock
3eaa35064a am e964060b: am b4805e3a: Settings: Allow more lines of saver feature description text. 
* commit 'e964060b5de4b534431b58c2ac4fae9fdd6baedc':
  Settings: Allow more lines of saver feature description text.
 2014-12-12 19:08:46 +00:00
John Spurlock
e964060b5d am b4805e3a: Settings: Allow more lines of saver feature description text. 
* commit 'b4805e3a3481196a0e945d397bef0950a843f5a3':
  Settings: Allow more lines of saver feature description text.
 2014-12-12 19:04:24 +00:00
John Spurlock
b4805e3a34 Settings: Allow more lines of saver feature description text. 
Bug: 18706906
Change-Id: I27bfd5e70c3e20c17fcad691cfb3c9f74d7d0390
 2014-12-12 12:54:48 -05:00
Narayan Kamath
f25627c0c9 Stop using apache-http in settings. 
Most of this usage is from crufty "test" code, and is trivially
replacable.

bug: 18027885

Change-Id: If4441a5e76405eba068479a4dcaa6012b5a74cbf
 2014-12-12 14:22:06 +00:00
Wink Saville
f5d6dd6a11 am 8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 
automerge: fc748fe

* commit 'fc748fe9da449e427887c6d2381f9bd4462de56f':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:42:28 +00:00
Wink Saville
fc748fe9da am 8a21ab00: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 
* commit '8a21ab00e5ec5141e4bd745ab9e7f161db98cb1a':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:37:35 +00:00