PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,940 Commits 1 Branch 0 Tags
ceee535c6533cd5ba047ede780ca9c089b84fb9f
Commit Graph

15940 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Franz
ceee535c65 Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev 2015-01-08 17:40:09 +00:00
Andres Morales
f11feccf99 Merge "Don't display Write NFC option if no NFC" into lmp-mr1-dev 2015-01-07 16:21:48 +00:00
Geoff Mendal
1dcc3e5ca9 Import translations. DO NOT MERGE 
Change-Id: I3fc38eff7245760c96eac6222d4afd53f4169718
Auto-generated-cl: translation import
 2015-01-07 06:14:40 -08:00
Mikhail Naganov
59f4d20b2e Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev 2015-01-07 12:33:30 +00:00
Zoltan Szatmary-Ban
15e2c54a2f Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev 2015-01-07 12:31:57 +00:00
Mikhail Naganov
71ef80eaf4 Add an item to "Legal information" screen for WebView license 
Similar to how it is done for other legal information items --
if there is an activity that serves android.settings.WEBVIEW_LICENSE
intent, the item is shown with the title set to the activity's title,
otherwise the item is hidden.

Bug: 18729447
Change-Id: Ic5bad40c91e35fa3c8235128628413929ef111d3
 2015-01-06 20:55:09 +00:00
Sanket Padawe
be3b0c4ec0 Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev 2015-01-06 20:46:17 +00:00
Sanket Padawe
4d902bcc8f Fixed crash caused by non-integer phoneAccountId in SimDialogActivity. 
Bug: 18834691
Change-Id: I75b5ba4d72523474fe91eaf80f8201d9a53a683a
 2015-01-06 10:54:55 -08:00
Andres Morales
64c7429ac8 Don't display Write NFC option if no NFC 
Bug: 18830151
Change-Id: Id5a06e6d98380f509307a6819494255524755ab1
 2015-01-06 09:38:53 -08:00
Amith Yamasani
10fb4f80ae Merge "Fix theme for empty activity" into lmp-mr1-dev 2015-01-05 20:54:04 +00:00
Zoltan Szatmary-Ban
fb1bdf0ffc Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials 
Remove the enable/disable button in certificate setting dialog if restriction
has been put on the respective profile. Also catch security exception just in
case.

Bug: 18899182
Change-Id: Ia247ab264c1b2d08b58456519bf471ba8c727745
 2015-01-05 16:49:53 +00:00
Geoff Mendal
7e669a0ae5 Import translations. DO NOT MERGE 
Change-Id: I657043d37bd3a3a13ef7b442c8ee6f86095bce15
Auto-generated-cl: translation import
 2015-01-05 06:15:47 -08:00
Benjamin Franz
0fe3ed5ab5 Block BluetoothPermissionRequest notification on managed profiles. 
This notification is triggered when a bluetooth device that supports
the PBAP protocol. On managed profiles this functionality is not yet
available and therefore the notification and resulting acvitivity
have no function.

Bug: 18782769
Change-Id: Iaea12eee8ec4727d9448f690861f8344e2296028
 2015-01-02 12:54:01 +00:00
Baligh Uddin
c3068f0788 Import translations. DO NOT MERGE 
Change-Id: Iecde29c95e3c603740f4ff7875a594083bb6b40e
Auto-generated-cl: translation import
 2014-12-29 14:59:54 -08:00
Prem Kumar
531127a5c2 Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev 2014-12-29 13:23:51 +00:00
Sanket Padawe
9b1383a46d Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev 2014-12-23 03:35:23 +00:00
Sanket Padawe
79d5da7bf6 Fixed settings crash issue while recovering from phone crash. 
Bug: 18816868
Change-Id: I2b3015f563aed2d997a3a5466ca8f0689fc53ddb
 2014-12-22 10:33:49 -08:00
Baligh Uddin
e957cb47a4 Import translations. DO NOT MERGE 
Change-Id: I95c46e36bef66944280675891951c487f43c622f
Auto-generated-cl: translation import
 2014-12-22 08:50:56 -08:00
Maurice Lam
9ab9d1ec82 Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev 2014-12-20 01:17:59 +00:00
PauloftheWest
3e864c0bda Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev 2014-12-19 22:53:03 +00:00
Maurice Lam
b413c523c0 [WifiSetup] Fix text colors in dark theme 
Use the attribute version of the material colors to avoid dark-on-
dark text in dark theme setup wizard.

Bug: 18810611
Change-Id: I740487e97a48016551f00c6a04876b0d4c71e0ab
 2014-12-19 11:52:52 -08:00
PauloftheWest
a68bdb6dbe Removed extraneous slot information on single SIM devices. 
Bug: 18803333
Change-Id: If18f898839a1b7927a8db3b225549d4e4e073fdc
 2014-12-18 15:02:39 -08:00
PauloftheWest
58f7eaf3d2 SIM Status now shows data connection instead of voice. 
Bug: 18714691
Change-Id: Ia2e9642d3331126a040ae1a059300df65d9551b9
 2014-12-18 13:59:04 -08:00
Sanket Padawe
19627ca215 Getting mcc/mnc from system prop instead of subInfoRecord. 
Bug: 18781129
Change-Id: Idb4c70c9b936a947460e6c6d03bd40dc2ae4279a
 2014-12-18 10:29:16 -08:00
Amith Yamasani
39fb062795 Fix theme for empty activity 
Avoids janky transition when confirmation of device credential
is requested.

Bug: 18637426

Change-Id: I3645e180e50f570d6d09d649978064fa5adf7755
 2014-12-18 10:22:02 -08:00
Sanket Padawe
c4cc07b2c7 Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev 2014-12-18 06:28:09 +00:00
Sanket Padawe
4be06d9c48 Revert "Getting mcc/mnc from system prop instead of subInfoRecord." 
This reverts commit 579b66f28d.

Change-Id: I0b142b40c697992b60bca9020673a0828ec44977
 2014-12-18 06:24:36 +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
3b08bdec94 Import translations. DO NOT MERGE 
Change-Id: I58cb836de181e6a7b4de701941e3a13bea7378cb
Auto-generated-cl: translation import
 2014-12-17 06:18:00 -08: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
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
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
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
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
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
d3affe47ee Import translations. DO NOT MERGE 
Change-Id: I07a9426156ec5f40cded12af58aca05723a55005
Auto-generated-cl: translation import
 2014-12-15 06:26:44 -08: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
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
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