PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,225 Commits 1 Branch 0 Tags
7e3437c5d0fcf63e67ed0341604cd81c486527cc
Commit Graph

19225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
449c360cc5 am cc26e1dc: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev 
automerge: bcad54f

* commit 'bcad54f6474b264a04a4f59fb8ad6371861f1a62':
 2015-01-13 21:11:14 +00:00
Wink Saville
b91be0cfc7 am a908d819: am 718c4d9b: Rename reg/unreg OnSubscriptionsChangedListener. 
automerge: 1015f08

* commit '1015f08455da4c0823d98d5f74104e0fc3b7de33':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 21:11:07 +00:00
Geoff Mendal
18ce6a86b3 am 4fe6117c: (-s ours) am 26310772: (-s ours) Import translations. DO NOT MERGE 
automerge: 4d23238  -s ours

* commit '4d232386311f8dbaa5baaa3781b592d3e527660c':
  Import translations. DO NOT MERGE
 2015-01-13 20:16:32 +00: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
55f432991c am 04250824: (-s ours) Import translations. DO NOT MERGE 
automerge: 3f2ece6  -s ours

* commit '3f2ece6ceae3923dca0d54b2e65fa16e79e3752c':
  Import translations. DO NOT MERGE
 2015-01-12 23:45:01 +00: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
58f25796ca Import translations. DO NOT MERGE 
Change-Id: I434030eb3a517745ca132ec904e91b8f90dc47ed
Auto-generated-cl: translation import
 2015-01-12 07:14:04 -08: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
7a89dde862 am 058b0561: Merge "Display Voice nw type if Data nw is Unknown for Sprout." into lmp-mr1-dev automerge: 270af42 
automerge: dd0a5db

* commit 'dd0a5db0ddf16d49161053b1e0aafa7acf158a11':
  Display Voice nw type if Data nw is Unknown for Sprout.
 2015-01-09 19:23:23 +00: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
Adrian Roos
6b879f50f6 Remove usages of LPU.savedPatternExists 
The correct method to call is isLockPatternEnabled, which
also checks whether we've actually selected a pattern.

Also removes the code for the obsolete pattern enabled setting.

Bug: 18931518
Change-Id: I6f369eb60f8f6bb1e33384cd06534c713ab52e79
 2015-01-09 14:35:52 +01:00
Alexandra Gherghina
08309d2072 Merge "Fix width of app notifications detail screen" 2015-01-09 10:41:42 +00:00
Sanket Padawe
4e4860bbcb am 0c3b1371: am f5a4abc2: Merge "Fixed Cellular data toggling issue in settings for multisim" into lmp-mr1-dev 
automerge: c7e5b42

* commit 'c7e5b42ac493f7f06fd8d90f87a4e7eb23acc54c':
  Fixed Cellular data toggling issue in settings for multisim
 2015-01-08 23:25:19 +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
Fyodor Kupolov
dbbd4fca44 Show confirmation when turning on "Phone calls/sms" 
Added confirmation dialog, when turning on "Phone calls and sms" setting for
secondary users and guests.

Bug:15761405
Change-Id: I39b2181f0b5460db9a964c6883f053a6c6336622
 2015-01-08 11:21:26 -08:00
Marco Nelissen
2c47e6f823 Register USB receiver 
This makes USB mode selection work properly, and prevents developer
options from crashing on exit.

Change-Id: I4c822f2694b0d87438827ff0da0d974c93ddbcab
 2015-01-08 10:49:46 -08:00
Benjamin Franz
6a0cd973d8 am d8e53f27: Merge "Block BluetoothPermissionRequest notification on managed profiles." into lmp-mr1-dev automerge: ceee535 
automerge: cc18d73

* commit 'cc18d7393bfcd11a668623f6a322243dc733fdc8':
  Block BluetoothPermissionRequest notification on managed profiles.
 2015-01-08 17:54:29 +00: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
Alexandra Gherghina
fa7dacb157 Fix width of app notifications detail screen 
Bug: 17137945
Change-Id: I52056f6ff217b695a21b096145b13b6b687e124c
 2015-01-08 10:36:17 +00:00
Adrian Roos
f788718f21 Purge biometric weak from internal code 
Bug: 18931518
Change-Id: I5da41908b1d6895a69f981e139f2d268327fafcd
 2015-01-07 20:52:09 +01:00
Andres Morales
c2fb78627f am dfb448d2: am f58a646b: am f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev 
* commit 'dfb448d23ec666f9fdbb1ee44ccaef12ea98a80c':
  Don't display Write NFC option if no NFC
 2015-01-07 16:37:55 +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
3d0961c789 Merge "Import translations. DO NOT MERGE" 2015-01-07 14:41:00 +00:00
Geoff Mendal
2f45b7aba9 am 634b1706: (-s ours) am 0347196c: (-s ours) am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE 
* commit '634b17063b79167ae0c0459afa7b528d933c4011':
  Import translations. DO NOT MERGE
 2015-01-07 14:39:51 +00:00
Geoff Mendal
ab9a7e2bfe am 620a5bd0: (-s ours) am 51aedf86: (-s ours) Import translations. DO NOT MERGE 
* commit '620a5bd077c7077058f460af5025ad7d2cd94758':
  Import translations. DO NOT MERGE
 2015-01-07 14:34:44 +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
50dc4aaba9 Import translations. DO NOT MERGE 
Change-Id: I1e314926eb51781537d45825f1b2ec7178a73969
Auto-generated-cl: translation import
 2015-01-07 06:32:58 -08:00