PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,008 Commits 1 Branch 0 Tags
f513ca2fa187ffdd099272b12df932f89be4824c
Commit Graph

18008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurice Lam
ff649c601d Merge "[WifiSetup] Don't pan the window for IME" into lmp-mr1-dev 2015-01-20 21:21:41 +00:00
Sanket Padawe
766ab606e3 Fixed data connection toggle crash in Settings. 
Bug: 19066882
Change-Id: Ib2c7b55d059ddda0543f11ded039ac82bc036850
 2015-01-20 10:36:15 -08:00
Geoff Mendal
f7282d213a am e7b79f16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'e7b79f16c1548ba2c40af4452167c64ba442566e':
  Import translations. DO NOT MERGE
 2015-01-19 15:20:49 +00:00
Geoff Mendal
8c302e3422 am 21df8221: (-s ours) am 69b87f79: (-s ours) Import translations. DO NOT MERGE 
* commit '21df822137b4750d1be2ccf7895876758255c8d0':
  Import translations. DO NOT MERGE
 2015-01-19 15:20:48 +00:00
Geoff Mendal
e7b79f16c1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-19 15:18:14 +00:00
Geoff Mendal
21df822137 am 69b87f79: (-s ours) Import translations. DO NOT MERGE 
* commit '69b87f79256a5edacb90ab7ccce069737ca59b3d':
  Import translations. DO NOT MERGE
 2015-01-19 15:14:52 +00:00
Geoff Mendal
e06ab11084 Import translations. DO NOT MERGE 
Change-Id: I33eb0003d296f51618451be42ed108d03e833fe7
Auto-generated-cl: translation import
 2015-01-19 07:14:45 -08:00
Geoff Mendal
69b87f7925 Import translations. DO NOT MERGE 
Change-Id: I5e8d466062fa0483aecaefdac20c34e219b43b3a
Auto-generated-cl: translation import
 2015-01-19 07:07:29 -08:00
Zoltan Szatmary-Ban
77c1d36de5 Show removed user's data usage under its correct item 
Users for which UserManager.getUserInfo returned null were shown as
unnamed users on Settings > Data Usage. This behavior has now changed
to show their data usage under the same item as UID_REMOVED.

Bug: 18174376
Change-Id: I8d172647edb51f7a277b4b714e9b7f3a0b5f3154
(cherry picked from commit cd9b1507fb)
 2015-01-19 10:53:45 +00:00
Andre Eisenbach
b1789780f7 am edf618c1: am 906fc417: Merge "Do not perform SDP during pairing" into lmp-mr1-dev 
* commit 'edf618c1b7ceb283146de1e26b85a56ab04b206f':
  Do not perform SDP during pairing
 2015-01-16 02:47:55 +00:00
Andre Eisenbach
edf618c1b7 am 906fc417: Merge "Do not perform SDP during pairing" into lmp-mr1-dev 
* commit '906fc4172466e7ddd0886fa51b308ce4e69c266a':
  Do not perform SDP during pairing
 2015-01-16 02:33:50 +00:00
Andre Eisenbach
906fc41724 Merge "Do not perform SDP during pairing" into lmp-mr1-dev 2015-01-16 02:01:05 +00:00
Maurice Lam
98f245069b [WifiSetup] Don't pan the window for IME 
Suppress panning the activity window for the IME because that is
causing garbage to be drawn.

Bug: 18974000
Change-Id: I42429241425be0e520e9b36d1e134748ae583076
 2015-01-15 11:55:15 -08:00
Andre Eisenbach
63e0f16c63 Do not perform SDP during pairing 
As a result of commit 7de119c (ag/591931), SDP is performed when the
pairing dialog pops up. There are multiple problems with this. On badly
behaved devices an SDP request might trigger pairing from the remote
side, other devices (like Logitech keyboards) will close the connection
once SDP disconnects, causing the pairing to fail.

Further more, fetchUuidsWithSdk() is an asynchronous call. The code that
was added does not wait for SDP to complete. Thus the check for the PBAP
UUID will always fail and cause the permission check to still be
displayed.

With this change, SDP is not performed when the dialog is popped up and
PBAP permission is granted after bonding and subsequent service
discovery in accordance with final consensus in bug 16964116.

Bug: 18948640
Change-Id: I149afa8ae59b63f59ba579c12f97c3ea3d70112c
 2015-01-15 11:24:49 -08:00
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