Commit Graph

8004 Commits

Author SHA1 Message Date
Robin Lee
1a95d1de7e Merge "Badge Wi-Fi installer apps" 2015-02-27 16:13:56 +00:00
Robin Lee
0d8879ade7 Badge Wi-Fi installer apps
Consistent, and more importantly useful to know which version of an app
was responsible for installing a network.

Change-Id: I37e326f419e03b020e17daa7d65c713d1ea6ddc8
2015-02-27 15:57:53 +00:00
Sanket Padawe
a330b1a093 am 85b04c19: am 130a76c8: am 49d660ac: am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
* commit '85b04c19ed81e74709d74d2acffd4bd42a3b07de':
  Use TelephonyManager api to get SPN of sim to display in UI.
2015-02-26 23:43:07 +00:00
Sanket Padawe
85b04c19ed am 130a76c8: am 49d660ac: am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
* commit '130a76c806469b5b814b1d647713dd0cdec1fe9f':
  Use TelephonyManager api to get SPN of sim to display in UI.
2015-02-26 23:31:28 +00:00
Sanket Padawe
bd54ef0919 am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
* commit '4e838ca96ec1ebf1df3d75e729facf1fc012b431':
  Use TelephonyManager api to get SPN of sim to display in UI.
2015-02-26 22:04:10 +00:00
Pavel Zhamaitsiak
4ab32563f1 Add Wi-Fi Calling preference screen
Change-Id: Ie89902b55c5c4184236636f5039b3246a9c0bda5
2015-02-25 18:29:29 -08:00
Fyodor Kupolov
0ea4f60bb0 Merge "Allow alternative policy description for secondary users" 2015-02-25 20:21:26 +00:00
Fyodor Kupolov
7dc56bd2cf Allow alternative policy description for secondary users
For policies like wipe-data, device admin policy description should be
customizable for secondary users.

Bug: 19194766
Change-Id: I0907ffb973eae247707380af1be9894ca403010f
2015-02-25 12:00:49 -08:00
Sanket Padawe
8f77f435d8 Use TelephonyManager api to get SPN of sim to display in UI.
Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
2015-02-24 13:30:33 -08:00
xinhe
d51b9525c9 Do not provide 5GHz option for softap if there is no country code available
Bug:19414134
Change-Id: I3899d9daa33eca5d2c5528c2e4da97b02d019160
2015-02-24 10:09:56 -08:00
Jason Monk
88643ac6ba Support some changes to SettingsLib
SettingsLib has a couple of bluetooth changes to support quick
settings and as a result a few updates are needed in Settings.

Depends on I7f828f0038ad0cf39274986ece6d486d545f0286
Change-Id: I9b207b74abb0175148fd4a3c421d33ab9a861587
2015-02-24 14:01:47 +00:00
Jason Monk
67d71bef99 Merge "Move isolatable bluetooth code to SettingsLib" 2015-02-24 13:23:49 +00:00
Jason Monk
e77b04a64f Merge "Move some Tethering code to SettingsLib to share" 2015-02-24 13:16:43 +00:00
Mike Lockwood
7af238e181 Add support for MIDI USB configuration to MIDI settings screen
Change-Id: I41b7ef2090b8887d5d3c05494de9dd1fb4dd65eb
2015-02-20 15:55:29 -08:00
Santos Cordon
9a9c361523 Update Multi-SIM setting to use getSubIdForPhoneAccount API.
Settings app should not be parsing the subId direction from the phone
account.  Instead this CL updates the settings app to use a new API to
grab the sub ID.

Change-Id: Iefd1831b04c061168fa2b135a2d296a27e3d4e92
2015-02-19 21:29:35 -08:00
John Spurlock
d9bd1688c9 Settings: Reorder the "Calls/messages from" dropdown.
From least to most restrictive: Anyone/Contacts/Starred.

Bug: 19430944
Change-Id: I66326f3a02be615d0edbbd644b83b088f1e306c1
2015-02-18 20:57:39 -05:00
Dianne Hackborn
c5df5ddef0 Fix voice settings to not be broken. :(
It was setting the wrong recognizer activity, so when you
changed the voice interactor it would break the recognizer but
at least it would reset to the default interactor at boot and
not still be broken. :p

Change-Id: Icfec4f11526528b821e5fd67a6519bf5874ea133
2015-02-13 10:06:52 -08:00
Maurice Lam
3dd090d916 Merge "Setup lock screen go back one screen at a time" 2015-02-13 01:07:13 +00:00
Sanket Padawe
62197c9a97 am 4a7ca7d5: am bdfdf07c: am 0362e870: am 7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit '4a7ca7d5a7c83dc77921c9c32abc7b366c18b46c':
  Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
2015-02-13 00:07:22 +00:00
Sanket Padawe
4a7ca7d5a7 am bdfdf07c: am 0362e870: am 7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit 'bdfdf07ce3b788d2962f75027f6be615c9784e10':
  Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
2015-02-13 00:01:08 +00:00
Sanket Padawe
7e21fa5ab4 Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Bug: 19363726
Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4
2015-02-12 12:39:34 -08:00
Maurice Lam
9066a5c8b3 Setup lock screen go back one screen at a time
SetupChooseLockGeneric no longer finishes itself when it receives a
RESULT_CANCELED result from an activity it started.

Bug: 18631770
Change-Id: I892b76847904225fe607b9406d6e76f932daa062
2015-02-12 10:52:20 -08:00
Jason Monk
4896c01729 Move some Tethering code to SettingsLib to share
Change-Id: I43a356f2a14af4a15d1827919c39bbd1a04d3a94
2015-02-12 10:33:40 -05:00
Svet Ganov
2cd8c28027 Merge "Removing the unused for years app shortcuts feature." 2015-02-12 03:43:35 +00:00
Alex Klyubin
053f83d470 am e029b91c: am 1d33bca0: Merge "Hidden ApplicationInfo flags are now in privateFlags."
* commit 'e029b91c53323c27ea18a57c6af8c00ecab5576b':
  Hidden ApplicationInfo flags are now in privateFlags.
2015-02-11 19:58:03 +00:00
Alex Klyubin
e029b91c53 am 1d33bca0: Merge "Hidden ApplicationInfo flags are now in privateFlags."
* commit '1d33bca0e496f980ec1a364f58cccd457d40954a':
  Hidden ApplicationInfo flags are now in privateFlags.
2015-02-11 19:47:09 +00:00
Alex Klyubin
cc254f4da9 Hidden ApplicationInfo flags are now in privateFlags.
See b9f8a5204a1b0b3919fa921e858d04124c582828.

Change-Id: I98bbe4b1a5ac0939e0000e4da8b21a1964c75e8b
2015-02-11 11:10:12 -08:00
Adrian Roos
8481d64e32 Remove obsolete WifiSettingsForSetupWizardXL
Bug: 18405549
Change-Id: I30c7c9ee8f544054b13cfc24f7433bdc1448e339
2015-02-11 15:54:45 +01:00
Zoltan Szatmary-Ban
10045bc2f1 Merge "Make Settings > Security > Apps with Usage Access multiprofile aware" 2015-02-09 15:03:00 +00:00
Zoltan Szatmary-Ban
273a6e7ffd Merge "Eliminate duplicated code for creating circled user icons in Settings." 2015-02-09 13:13:38 +00:00
Zoltan Szatmary-Ban
2e18bd9dbc Merge "Remove frame and shadow from CircleFramedDrawable" 2015-02-09 13:06:57 +00:00
Zoltan Szatmary-Ban
2c228d8d7a Merge "Eliminate duplicated code in Settings for category headers" 2015-02-09 12:53:32 +00:00
Dianne Hackborn
324bd766ee Include home state in mem usage.
Change-Id: I7639e963386adf55a18139f395e7fc43277cc930
2015-02-06 16:35:41 -08:00
Svet Ganov
bbb3efe373 Removing the unused for years app shortcuts feature.
The shortcuts feature has been commented out since 2011. Now the setings
provider no longer has a bookmarks table since the only party aside of this
commented out feature using it was the ShortcutManager. We moved to an
in memory model for the settings provider's state. We do not want to keep
there anything that is not used. Therefore, we moved from a bookmarks table
to a resource which renders this settings feature unusable. If we decide
to revive the shortcut feature we can revert this change and add support
for in memory bookmarks state in the settings provider.

Change-Id: Ib1871f940bc27029a5dd941b901d6087914a2231
2015-02-05 14:11:37 -08:00
Adrian Roos
ec9286eac9 Merge "Ensure new credentails are valid" 2015-02-05 19:20:49 +00:00
Jason Monk
f2982a9ba1 Move isolatable bluetooth code to SettingsLib
Move the non-ui bluetooth control/tracking code to SettingsLib so
that it can be shared with others.

Mostly just move classes to frameworks/base/packages/SettingsLib,
however a few things had to move around.
 - Dock handling had to move back to code still in settings
 - Local preference related code had to be moved back to settings
 - Added an error flow from SettingsLib to Settings

Depends on I69fd888362c6dbb325f6113b32c4b15cc6a23a41
Bug: 19180466
Change-Id: Ie57fe26a27bbb0adc2ef69e042a05c7290c6a52a
2015-02-05 10:43:57 -05:00
Jason Monk
fc1b00cfe4 Move some wifi tracking code to SettingsLib
Move tracking of which networks are available/saved and their state
over to SettingsLib to share it with Quick Settings.

Bug: 19180466
Change-Id: Iaeef06b26da8cb38e1ba09a7d105d04d499dc181
2015-02-04 20:40:32 +00:00
Svetoslav
b428346fd3 Fix crash in print settings utils
Change-Id: I8000b674c0579988d6dfae2fcff136a06c721362
2015-02-03 21:58:11 -08:00
Amith Yamasani
29c99f1534 Merge "set tapjacking protection for deviceadmin permission dialog" automerge: 6317e06
automerge: 47ba346

* commit '47ba346e1ea491f925ad47a4fa04b217bfcb4019':
  set tapjacking protection for deviceadmin permission dialog
2015-02-03 21:31:56 +00:00
Amith Yamasani
47ba346e1e Merge "set tapjacking protection for deviceadmin permission dialog"
automerge: 6317e06

* commit '6317e06635ed52a9d1c1aeb0439017418f57ad0f':
  set tapjacking protection for deviceadmin permission dialog
2015-02-03 21:29:19 +00:00
Adrian Roos
4c00a61183 Ensure new credentails are valid
Follow-up to I6f369eb60f8f6bb1e33384cd06534c713ab52e79

Bug: 18931518
Change-Id: I311b255a034b0cec8fee70b0f4938e6ebb20d95e
2015-02-03 19:58:19 +01:00
Dianne Hackborn
1836796559 Merge "Make proc stats UI app-centric instead of process-centric." 2015-02-03 17:43:54 +00:00
Andres Morales
c91676e6d9 am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter automerge: 98d8a49
automerge: 4bd31b9

* commit '4bd31b9ac676a5d3c6943bc9f86f524eedad5bef':
  Use getDefaultAdapter instead of getNfcAdapter
2015-02-03 16:04:37 +00:00
Andres Morales
4bd31b9ac6 am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter
automerge: 98d8a49

* commit '98d8a490d5930c9f6179c8aefe792012c542ddbb':
  Use getDefaultAdapter instead of getNfcAdapter
2015-02-03 16:01:45 +00:00
Dianne Hackborn
b94079a704 Make proc stats UI app-centric instead of process-centric.
The UI now shows a much simpler overview of memory use for
the current measured duration, computing the weighted RAM
user per application.  (This is done basically by rolling up
each individual process into an app that can contain multiple
processes, and using the recently introduced weighted RAM for
all data processing.)

The details screen is updated to reflect this new design,
showing an overview of a particular application, which
separate entries for each process running for that app.

Change-Id: I47d79c30086d733eb37440a6c21b18a92b767d01
2015-02-02 18:03:40 -08:00
Andres Morales
2e75203a6e Use getDefaultAdapter instead of getNfcAdapter
getNfcAdapter can throw an exception if NFC is not
available

Bug: 19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f
2015-02-02 13:39:57 -08:00
Robin Lee
0b88b75aaf am 70dbf05d: am 528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev automerge: d16231d
* commit '70dbf05d50f29685f0754a35c96fe2b041b5ac2f':
  Repair broken keychain wifi_uid logic
2015-02-02 11:51:53 +00:00
Robin Lee
70dbf05d50 am 528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
automerge: d16231d

* commit 'd16231de248aeb5aeccb8f4aa226a2f1b34cc082':
  Repair broken keychain wifi_uid logic
2015-02-02 11:45:57 +00:00
Zoltan Szatmary-Ban
2bfd97ede9 Make Settings > Security > Apps with Usage Access multiprofile aware
Show badged apps with usage access together with non-badged ones.

Bug: 19157660
Change-Id: Ia294719678d5581c49b1fae3836a0b585ca5c140
2015-02-02 11:43:18 +00:00
Robin Lee
635426b0a7 Repair broken keychain wifi_uid logic
Check for cross-user installs was missing a short-circuit for installs
where no UID was specified. This is now added.

Bug: 19194391
Change-Id: I10aa8323b47e0fcabb59e7c30d677080bb80b976
2015-01-30 19:00:45 +00:00