PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,288 Commits 1 Branch 0 Tags
cff282f3fc81c401a873cdf87ff399b8be28f90b
Commit Graph

16288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sanket Padawe
cff282f3fc am 080674e6: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev 
* commit '080674e6da8e3db392a2a9e96a00cfc8e4635d00':
  Getting mcc/mnc from system prop instead of subInfoRecord.
 2014-12-18 04:58:46 +00:00
Sanket Padawe
080674e6da Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev 2014-12-18 04:53:34 +00:00
Sanket Padawe
579b66f28d Getting mcc/mnc from system prop instead of subInfoRecord. 
Bug: 18781129
Change-Id: Idefe2dfc26bef2bba2b5b1792bb5ac43a44aa6cc
 2014-12-17 19:31:30 -08:00
Geoff Mendal
3a92fb2693 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-17 14:33:27 +00:00
Geoff Mendal
181494318c Import translations. DO NOT MERGE 
Change-Id: I37ca51108f533323a830a9fcb550af4b94a2b2a3
Auto-generated-cl: translation import
 2014-12-17 06:28:32 -08:00
Geoff Mendal
b4ff026930 am 3b08bdec: (-s ours) Import translations. DO NOT MERGE 
* commit '3b08bdec9415a99190cf6f93837c41cea5e0c04a':
  Import translations. DO NOT MERGE
 2014-12-17 14:26:09 +00:00
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
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
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
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
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
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
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
Geoff Mendal
d9df577d94 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-15 15:04:33 +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
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
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
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
Wink Saville
8a21ab00e5 Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 2014-12-12 04:23:16 +00:00
Maurice Lam
56e6cf5565 [FRP] Open the lock setup screens in same task 
Set the taskAffinity of of the lock setup screens so that the
transitions behave correctly.

Bug: 18724458
Change-Id: Ibca7adfad1e5bd07c7e7d2e1beb279c5e57ac735
 2014-12-11 18:22:08 -08:00
Lucky Zhang
47811fe057 [FRP] Notification screen slides in wrong direction 
The method that launches notification screen from choose lock activity
finished the original activity before starting the new activity. This
made the system think it is a backward transition instead of a forward
one. Swapping the order to start new activity first and then finish
old activity fixed the problem.

This also changes the behavior in settings. However, it seems like this
is also the desired behavior for settings.

Bug: 18723199
Change-Id: I90538fa52e0d62a2274c8e0333682035849802c6
 2014-12-11 18:10:01 -08:00
Prem Kumar
f41c6c4577 am 96ca2cfd: Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev 
* commit '96ca2cfd087078e4042f9ab9678c77dea136eefe':
  Clearing junk layout for add wifi dialog in settings.
 2014-12-12 00:59:34 +00:00
Prem Kumar
96ca2cfd08 Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev 2014-12-12 00:52:32 +00:00
Sanket Padawe
9235e673f9 Clearing junk layout for add wifi dialog in settings. 
Bug: 18359901
Change-Id: I9957efd0a6740ee470ee36b09a7b6884a0d2c63a
 2014-12-11 15:48:45 -08:00
Sanket Padawe
75e0082ae8 Exiting activity on clicking outside dialog acitivity. 
Bug: 18705619
Change-Id: I50cb08884f1c97352f5ad3a3e7d218b42af1ada4
 2014-12-11 14:36:26 -08:00
Jason Monk
37832d661a Add a periodic check of the tethering provisioning 
Add a service that handles the check through broadcasts which are
defined through configs, similar to the previous configs for the
activity.

Depends on I1f6e2d954562c5a16a0de60dac625005ec3e5c50

Bug: 18453076
Change-Id: I515d72706e9ca37877e67c44427af1b75b146390
 2014-12-11 15:07:45 -05:00
Wink Saville
d72c062fa8 Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId. 
Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
 2014-12-11 10:10:05 -08:00
Zoltan Szatmary-Ban
d0831ae214 Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev 
automerge: 25a1181

* commit '25a1181f2a61d32481e7c66f96c2abf7aebd761e':
  Bring up correct app for Recent location list items
 2014-12-11 15:09:56 +00:00
PauloftheWest
13028d1d90 Merge "Disabled SIM notifications while provisioning." into lmp-mr1-dev 
automerge: 209c946

* commit '209c9465b3251c0a5e652214e402b1a54df234f9':
  Disabled SIM notifications while provisioning.
 2014-12-11 15:09:31 +00:00