PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,894 Commits 1 Branch 0 Tags
942edf4ca6fb2e191d2ba1f5f2c2933c535516fd
Commit Graph

17894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
942edf4ca6 am 21824675: am 6491d51f: Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev 
* commit '21824675d5343f26fd0c4cda45d60be89d59c59b':
  Settings not showing print jobs for a managed profile.
 2015-01-15 05:04:51 +00:00
Svetoslav
21824675d5 am 6491d51f: Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev 
* commit '6491d51fdcc63a27c3e1f27c6ece5dc3af5877eb':
  Settings not showing print jobs for a managed profile.
 2015-01-15 04:53:20 +00:00
Svetoslav
6491d51fdc Merge "Settings not showing print jobs for a managed profile." into lmp-mr1-dev 2015-01-15 04:47:54 +00:00
Sanket Padawe
56b16015bc am 872ed290: am b57e1f29: Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev 
* commit '872ed290de26374bb1ce9a2e43b0f75c79125ee6':
  Fixed missing sim card lock setup in Security Settings.
 2015-01-15 00:42:24 +00:00
Sanket Padawe
2c19066e00 am 0f9db227: am e79b65d6: Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev 
* commit '0f9db227ec110e9344f9d4f96ff983780531eb76':
  Fixed data connection toggle UI issue due to local cache maintained.
 2015-01-15 00:42:23 +00:00
Sanket Padawe
872ed290de am b57e1f29: Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev 
* commit 'b57e1f29643e7454192973db738c13583b5c91a5':
  Fixed missing sim card lock setup in Security Settings.
 2015-01-14 23:50:44 +00:00
Sanket Padawe
0f9db227ec am e79b65d6: Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev 
* commit 'e79b65d6c6f6df7d6fd84a6f5c540bd99d71f152':
  Fixed data connection toggle UI issue due to local cache maintained.
 2015-01-14 23:50:43 +00:00
Sanket Padawe
b57e1f2964 Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev 2015-01-14 23:20:05 +00:00
Sanket Padawe
e79b65d6c6 Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev 2015-01-14 23:18:13 +00:00
Sanket Padawe
247842017e Fixed missing sim card lock setup in Security Settings. 
Bug: 19008335
Change-Id: I078169b5a0215a9219e24554e71df32753213ebe
 2015-01-14 14:48:27 -08:00
Geoff Mendal
1b1a08fdb8 am 9b07944c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '9b07944c5007460b8c6792321e5db1350ec3ff55':
  Import translations. DO NOT MERGE
 2015-01-14 19:24:21 +00:00
Geoff Mendal
7b62336f26 am 3d600a06: (-s ours) am c51cfe3d: (-s ours) Import translations. DO NOT MERGE 
* commit '3d600a06119f2c11ba2394d64a84348aa94fd520':
  Import translations. DO NOT MERGE
 2015-01-14 19:24:20 +00:00
Sanket Padawe
d819270f0f Fixed data connection toggle UI issue due to local cache maintained. 
+ Fixed the scenario wherein more than 1 sim cannot be "On" at the same time.

Bug: 18916033
Change-Id: Ia95b54c9ee29d360a1b4542f00a9f698615912bb
 2015-01-14 11:03:33 -08:00
Geoff Mendal
9b07944c50 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-14 14:24:51 +00:00
Geoff Mendal
3d600a0611 am c51cfe3d: (-s ours) Import translations. DO NOT MERGE 
* commit 'c51cfe3d8131084cebf674b06faa7360307b5425':
  Import translations. DO NOT MERGE
 2015-01-14 14:23:15 +00:00
Geoff Mendal
23fd634e2d Import translations. DO NOT MERGE 
Change-Id: Ifcd43881fe6a7f7cecd76278e10d99f1c01857c3
Auto-generated-cl: translation import
 2015-01-14 06:23:07 -08:00
Geoff Mendal
c51cfe3d81 Import translations. DO NOT MERGE 
Change-Id: Ic614419c04bbacc20f37c24902286fcaa11e79a9
Auto-generated-cl: translation import
 2015-01-14 06:16:00 -08:00
Lucky Zhang
591a091311 am 585b53e6: am 0325a858: Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev 
* commit '585b53e6d2ddc0725ce69f6f7208ad791e8d256e':
  [Settings] Wifi Setup responds to other connection state change
 2015-01-14 12:06:43 +00:00
Lucky Zhang
585b53e6d2 am 0325a858: Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev 
* commit '0325a85849ab7d08555e8ce1d95d6d239d41ef27':
  [Settings] Wifi Setup responds to other connection state change
 2015-01-14 11:59:54 +00:00
Svetoslav
6cfe799654 Settings not showing print jobs for a managed profile. 
The settings app is shared among the personal and work profiles.
When fetching print jobs it was not getting the ones for the work
profile, rather the ones for the current user which is the personal
profile.

bug:18867406

Change-Id: I99f8cf3a3e2b133a0a4d5a8915473d1190e205f4
 2015-01-13 18:48:33 -08:00
Lucky Zhang
0325a85849 Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev 2015-01-14 01:36:45 +00:00
Lucky Zhang
9fe89bbb2e [Settings] Wifi Setup responds to other connection state change 
Made use of the two new extras isNetworkRequired and ifWifiRequired in
deciding the ui state of the wifi setting. The CL that adds these
extras in setup wizard is here (http://ag/612291).

Added logic to update the next ("skip") button state accordingly:

(1) "Skip" button should be enabled if
    - wifi is not required and network is not required
    - or wifi is not required, but network is required, and we have a
      valid network connection

(2) "Skip" button should be disabled if
    - wifi is required
    - or wifi is not required, but network is required, and we have
      no valid network connection

Note that the newly added logic is only run if wifi is not connected. If
wifi is already connected, the next button will show "next" and be
enabled.

This fixes the bug where wifi settings in setup wizard does not respond
to mobile data connection change.

Bug: 18783746
Change-Id: I155dcb158f790dd96a71099339f64b64cc647da0
 2015-01-13 17:20:42 -08:00
Wink Saville
bcad54f647 am cc26e1dc: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev 
* commit 'cc26e1dc5c6f7437678dfe5c0b230bf59879d8f4':
 2015-01-13 19:16:06 +00:00
Wink Saville
1015f08455 am a908d819: am 718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener. 
* commit 'a908d8191acf3e4786933d67a1a4211543323a7d':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:16:05 +00:00
Wink Saville
cc26e1dc5c Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev 2015-01-13 19:10:40 +00:00
Wink Saville
28bb4cda83 Rename reg/unreg OnSubscriptionsChangedListener. 
automerge: 718c4d9

* commit '718c4d9b1939e3e970f29fb9622e8b6ab73d2b6b':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:09:54 +00:00
Wink Saville
a908d8191a am 718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener. 
* commit '718c4d9b1939e3e970f29fb9622e8b6ab73d2b6b':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:09:51 +00:00
Wink Saville
718c4d9b19 Rename reg/unreg OnSubscriptionsChangedListener. 
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
 2015-01-13 08:36:25 -08:00
Geoff Mendal
4d23238631 am 4fe6117c: (-s ours) am 26310772: (-s ours) Import translations. DO NOT MERGE 
* commit '4fe6117cc1ce411dbbcfc1b25dc1ef720901ad4b':
  Import translations. DO NOT MERGE
 2015-01-12 16:40:27 +00:00
Geoff Mendal
4fe6117cc1 am 26310772: (-s ours) Import translations. DO NOT MERGE 
* commit '26310772872b327029cad560fa7b3e797b7980e9':
  Import translations. DO NOT MERGE
 2015-01-12 16:14:28 +00:00
Geoff Mendal
3f2ece6cea am 04250824: (-s ours) Import translations. DO NOT MERGE 
* commit '04250824ff4d5231ee17a060a7ce77fcc02a6657':
  Import translations. DO NOT MERGE
 2015-01-12 16:14:25 +00:00
Geoff Mendal
04250824ff Import translations. DO NOT MERGE 
Change-Id: I3174bd9c344b8bf618340c4b21b0f739ba198095
Auto-generated-cl: translation import
 2015-01-12 07:03:11 -08:00
Geoff Mendal
2631077287 Import translations. DO NOT MERGE 
Change-Id: I58204e4d028fbdb98e1bb810de8d535974aeb130
Auto-generated-cl: translation import
 2015-01-12 06:55:33 -08:00
Sanket Padawe
dd0a5db0dd am 058b0561: Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev automerge: 270af42 
* commit '058b0561b3712f19aba28020dad3cd63762050f5':
  Display Voice nw type if Data nw is Unknown for Sprout.
 2015-01-09 19:17:18 +00:00
Sanket Padawe
058b0561b3 Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev 
automerge: 270af42

* commit '270af427cd509b002751d6e6243a02f6c199b1a0':
  Display Voice nw type if Data nw is Unknown for Sprout.
 2015-01-09 19:11:35 +00:00
Sanket Padawe
270af427cd Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev 2015-01-09 19:08:26 +00:00
Sanket Padawe
c7e5b42ac4 am 0c3b1371: am f5a4abc2: Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev 
* commit '0c3b13718defb18191120c578c1658c26c4d13e0':
  Fixed Cellular data toggling issue in settings for multisim
 2015-01-08 23:19:38 +00:00
Sanket Padawe
0c3b13718d am f5a4abc2: Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev 
* commit 'f5a4abc2057f1e2d242f95e5251e563cff7c9da4':
  Fixed Cellular data toggling issue in settings for multisim
 2015-01-08 23:15:10 +00:00
Sanket Padawe
f5a4abc205 Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev 2015-01-08 23:09:11 +00:00
Sanket Padawe
4201391899 Display Voice nw type if Data nw is Unknown for Sprout. 
For multisim device when default data connection is set to 1st sim,
getDataNetworkType() returns Unknown for 2nd sim. In that case use
getVoiceNetworkType() to display Cellular nw type in sim status.

Bug: 18922147
Change-Id: Id7c39f8717737b60bde988cbd1c85ce8f6768a6f
 2015-01-08 12:37:34 -08:00
Sanket Padawe
24f834d745 Fixed Cellular data toggling issue in settings for multisim 
Bug: 18916033
Bug: 18779784
Change-Id: Ifda57b5ae89268f921ee2b75b5b6d90d75514540
 2015-01-08 11:23:11 -08:00
Benjamin Franz
cc18d7393b am d8e53f27: Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev automerge: ceee535 
* commit 'd8e53f271f1aa90f92d239f48120ffc6c5b87055':
  Block BluetoothPermissionRequest notification on managed profiles.
 2015-01-08 17:49:11 +00:00
Benjamin Franz
d8e53f271f Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev 
automerge: ceee535

* commit 'ceee535c6533cd5ba047ede780ca9c089b84fb9f':
  Block BluetoothPermissionRequest notification on managed profiles.
 2015-01-08 17:43:02 +00:00
Benjamin Franz
ceee535c65 Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev 2015-01-08 17:40:09 +00:00
Andres Morales
dfb448d23e am f58a646b: am f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev 
* commit 'f58a646bc01cc8d416d5babae2d06dad5018cc6d':
  Don't display Write NFC option if no NFC
 2015-01-07 16:31:57 +00:00
Andres Morales
f58a646bc0 am f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev 
* commit 'f11feccf99948d166e6873315252fdaf416ae272':
  Don't display Write NFC option if no NFC
 2015-01-07 16:26:19 +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
634b17063b am 0347196c: (-s ours) am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE 
* commit '0347196c6992e490be74c2a4015bc6cd64504f15':
  Import translations. DO NOT MERGE
 2015-01-07 14:34:03 +00:00
Geoff Mendal
620a5bd077 am 51aedf86: (-s ours) Import translations. DO NOT MERGE 
* commit '51aedf86037f027898ec279befe869c80ef9730c':
  Import translations. DO NOT MERGE
 2015-01-07 14:29:23 +00:00
Geoff Mendal
0347196c69 am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE 
* commit '1dcc3e5ca900cb8f6d03d018ed2b78c70d057ba0':
  Import translations. DO NOT MERGE
 2015-01-07 14:28:07 +00:00