Commit Graph

7771 Commits

Author SHA1 Message Date
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
Adrian Roos
ec9286eac9 Merge "Ensure new credentails are valid" 2015-02-05 19:20:49 +00: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
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
Stephan Huber
dc333212bd set tapjacking protection for deviceadmin permission dialog
Second try to commit tapjacking protection for device administrator permission dialog.
Remplaced tap by spaces
Signed-off-by: Stephan Huber <huber.stephan.sit@gmail.com>

Change-Id: I8e14e713d1f039ca79f5006cdeb12b65652884fb
2015-01-30 14:38:10 +01:00
Sanket Padawe
6439357c10 am b33c8ad5: am ef72625b: am ab845180: Remove sim status and imei for secondary user.
* commit 'b33c8ad518796e7931cff157b06f791384d575d8':
  Remove sim status and imei for secondary user.
2015-01-30 02:59:09 +00:00
Sanket Padawe
b33c8ad518 am ef72625b: am ab845180: Remove sim status and imei for secondary user.
* commit 'ef72625b5243f2afc6b63553ce57f439801d6977':
  Remove sim status and imei for secondary user.
2015-01-30 02:52:06 +00:00
Sanket Padawe
ab84518009 Remove sim status and imei for secondary user.
Bug: 19165700
Change-Id: I4cc4b09a66acb3c88ac33e6479b165b6872404c8
2015-01-29 17:19:26 -08:00
Fyodor Kupolov
290e137456 Merge "Use primaryUserOnly attribute to disable CryptKeeper" 2015-01-28 22:52:46 +00:00
Pavel Zhamaitsiak
dd8aa9d3d2 resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aosp
automerge: d67ad20

* commit 'd67ad203db73eb986f105cf65c85467ad610b221':
  Add button in "hidden" settings to flip "VoLTE Provisioned" flag
2015-01-28 21:28:39 +00:00
Pavel Zhamaitsiak
d67ad203db resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aosp
Change-Id: Ia6ad086dad93e5230ec59287d96e736e8d785320
2015-01-28 13:07:57 -08:00
Pavel Zhamaitsiak
882000f39b Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp-mr1-dev 2015-01-28 18:59:18 +00:00
Mick Lin
005f972b14 am c0570dc4: am 271aa608: am 09c9e5eb: [DS] Correct the access method for telephony system property
* commit 'c0570dc45529ab5fa3cbfcf33454a57b5eb16a23':
  [DS] Correct the access method for telephony system property
2015-01-27 23:33:04 +00:00
Fyodor Kupolov
19280af592 Use primaryUserOnly attribute to disable CryptKeeper
CryptKeeper activity is now disabled by using primaryUserOnly, instead of
broadcast receiver. This allows to avoid bringing up the process, when it
is not necessary.

Change-Id: I5d1f979b96093c6769f6c920b18517971835a7ad
2015-01-27 12:07:16 -08:00
Mick Lin
c0570dc455 am 271aa608: am 09c9e5eb: [DS] Correct the access method for telephony system property
* commit '271aa6081c16fe27d4d96f91c9530c7ec7f8b052':
  [DS] Correct the access method for telephony system property
2015-01-27 17:22:33 +00:00
Mick Lin
09c9e5eb5d [DS] Correct the access method for telephony system property
Bug: 18675498

    Review: https://partner-android-review.git.corp.google.com/#/c/198822

Change-Id: I7d6eab7d8f513de20bd8995b999a124097f725e7
2015-01-27 05:30:47 +00:00
Jeff Sharkey
971dd3bd97 am 78ab1669: am 4ec2b9e6: am 9c167e92: Fix secondary data usage color regression.
* commit '78ab16692baf21d1832e5376e79894c991abe85a':
  Fix secondary data usage color regression.
2015-01-26 23:49:33 +00:00
Jeff Sharkey
78ab16692b am 4ec2b9e6: am 9c167e92: Fix secondary data usage color regression.
* commit '4ec2b9e6160b386b70abb43ef2211ff0c6036345':
  Fix secondary data usage color regression.
2015-01-26 23:43:41 +00:00
Jeff Sharkey
9c167e92df Fix secondary data usage color regression.
Show overall usage with a 50% transparency when looking at a
specific app details page.  (Otherwise you can't tell them apart.)

Bug: 18927935
Change-Id: I0cad1ba0451a9dab3ed90fa5aa53c115dbe3e1d3
2015-01-26 14:18:19 -08:00
Sanket Padawe
a901b3d383 am 2b6ab796: Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev automerge: a8b78f9
automerge: d0f3755

* commit 'd0f3755197eef1a1c9a3b59765b1fc55c9115202':
  Hide APNs with type="ia" and apn=""
2015-01-24 00:20:34 +00:00
Sanket Padawe
d0f3755197 am 2b6ab796: Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev automerge: a8b78f9
* commit '2b6ab796f1ba4b6c29eb23eb3e71dd8c107497a9':
  Hide APNs with type="ia" and apn=""
2015-01-24 00:06:37 +00:00
Sanket Padawe
a8b78f96ae Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev 2015-01-23 23:55:13 +00:00
Sanket Padawe
a7f21a3100 Hide APNs with type="ia" and apn=""
APNs with type="ia" and no APN address (apn="") are used to
prevent an initial attach APN from being sent to the modem. This
in turn prevents the LTE ESM information procedure from being
used during the LTE attach. These APNs are meaningless and confusing to end users - so this
change hides them from the APN list.

Bug: 19101183
Change-Id: I9aacf787f8c175a301ad546f972f8972aad2a6b3
2015-01-23 09:53:48 -08:00
Zoltan Szatmary-Ban
489d03c0c3 am 400b8016: am 387597a2: Merge "Show removed user\'s data usage under its correct item" into lmp-mr1-dev
* commit '400b801664e59ef68072e231849a0e762edcd3c8':
  Show removed user's data usage under its correct item
2015-01-23 11:07:57 +00:00
Zoltan Szatmary-Ban
387597a256 Merge "Show removed user's data usage under its correct item" into lmp-mr1-dev 2015-01-23 10:57:14 +00:00
Pavel Zhamaitsiak
cb267a6f8c Add button in "hidden" settings to flip "VoLTE Provisioned" flag
VoLTE Provisioned flag can be lost when new device image is flashed. Currently
there is no way to trigger Verizon provisioning update from device. This patch
adds button in hidden settings which allow to manually change value of the
flag.

Bug: 19038362
Change-Id: I23f13004dbcf9eaf711c66261696772b1d7bfd6e
2015-01-22 02:57:37 +00:00
Maurice Lam
c7f8cac5c9 Merge "[WifiSetup] Don't show menu during setup" 2015-01-21 21:26:10 +00:00
Fyodor Kupolov
b992adebd3 Merge "Reset RunningState on user related changes" 2015-01-21 20:52:23 +00:00
Fyodor Kupolov
5c22ab9781 Reset RunningState on user related changes
RunningState now listens to user-related broadcasts and resets its state if
necessary.

Previously, user entry was visible even after the user had been removed.

Bug:18696308
Change-Id: I499956c434d0d05bfa2a99b5e3e71ac73fe83297
2015-01-21 10:43:03 -08:00
Maurice Lam
d9165c06a4 [WifiSetup] Don't show menu during setup
Hides the menu during Wi-Fi setup -- we removed the menu button from
the UI but the menu can still be started with a hardware menu button.
This change removes that ability as well (during setup).

If you want to test on a device without a hardware menu button, you
can use the command
    adb shell input keyevent 82

Change-Id: Ibe3cc679353a83c995e24680c3e7dc1575d32fe0
2015-01-21 09:48:42 -08:00
Sanket Padawe
913ebd7909 Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev automerge: 5f1eb2d automerge: 49c85c4
automerge: e3acb02

* commit 'e3acb02bb55d69fc7f1a6351927cf9b2ade058f8':
  Fixed data connection toggle crash in Settings.
2015-01-21 17:23:18 +00:00
Sanket Padawe
e3acb02bb5 Merge "Fixed data connection toggle crash in Settings." into lmp-mr1-dev automerge: 5f1eb2d
automerge: 49c85c4

* commit '49c85c4356ccfcb622e501b57d2893fc7e40bce0':
  Fixed data connection toggle crash in Settings.
2015-01-21 17:20:50 +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
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
Fyodor Kupolov
b0afc2a0dc Merge "Show Location restriction without the Settings item" 2015-01-16 21:00:03 +00:00
Zoltan Szatmary-Ban
3af2e4c35c Eliminate duplicated code in Settings for category headers
Change-Id: I5bdba2ad4f9e1987f9e818af9d5aa96a9d558f6b
2015-01-16 15:48:13 +00:00