Commit Graph

19979 Commits

Author SHA1 Message Date
Jason Monk
c6f3d75d77 am f4db340d: Consistently use weight to get average mem usage
* commit 'f4db340daeb50572d7e0ab12f4745affae8b567f':
  Consistently use weight to get average mem usage
2015-05-07 20:07:46 +00:00
Jason Monk
f4db340dae Consistently use weight to get average mem usage
Rather than just for the labels...

Also update bg mem to be converted to the same memory scale for
the bars.  Also undo some bad average calculations that only made
things worse.

Bug: 20694769
Change-Id: I676803bf76d336355441891e768ba3c228dbfbca
2015-05-07 15:44:37 -04:00
Jason Monk
216d9bcb7f am e2d63fef: Merge "Updates/fixes to memory settings" into mnc-dev
* commit 'e2d63fef3ccbfd3001b7e794b3ee1203fc1c77af':
  Updates/fixes to memory settings
2015-05-07 18:54:51 +00:00
Jason Monk
ad28b96716 am 68d6d465: Merge "Always start storage list sorting by size" into mnc-dev
* commit '68d6d465746a6dcec6f7e0a44fadae19b886fa42':
  Always start storage list sorting by size
2015-05-07 18:54:50 +00:00
Jason Monk
e2d63fef3c Merge "Updates/fixes to memory settings" into mnc-dev 2015-05-07 17:45:39 +00:00
Jason Monk
1de522323f Updates/fixes to memory settings
- Update memory states to be Good performance, Ok performance, etc.
 - Update header info to be based on history rather than
   instantaneous
 - Color memory bar differently based on state
 - Fix run frequency bucketing to be correct
 - Show dialog for selecting duration, and fix duration selection
 - Update process naming to:
      - If process name is "anything:xxxx" then show "Xxxx"
      - If process name is "com.app.package.interface" then show "Interface"
      - If process name is the package name then show the app name
      - Otherwise fallback to the process name string

Bug: 20694769
Change-Id: Ic1fab28bfd2422bde84dd10bd305a4cc34be98cf
2015-05-07 13:45:08 -04:00
Jason Monk
68d6d46574 Merge "Always start storage list sorting by size" into mnc-dev 2015-05-07 17:35:39 +00:00
Alan Viverette
38c883363d am 840002d6: Merge "Use theme colors in battery stats widget" into mnc-dev
* commit '840002d66c19af51618489850c7ccea465cd23f8':
  Use theme colors in battery stats widget
2015-05-07 17:30:02 +00:00
Jason Monk
069732c5f9 Always start storage list sorting by size
Bug: 20075068
Change-Id: I50a39decaa61bf7c3489243924c0d3928c4fe2ce
2015-05-07 13:09:48 -04:00
Alan Viverette
840002d66c Merge "Use theme colors in battery stats widget" into mnc-dev 2015-05-07 16:57:10 +00:00
Jason Monk
bb70e07f83 am 59de14e2: Merge "Fix app headers in settings" into mnc-dev
* commit '59de14e2197e84baf663fa700ee7b2323fbaef6b':
  Fix app headers in settings
2015-05-07 13:17:43 +00:00
Jason Monk
59de14e219 Merge "Fix app headers in settings" into mnc-dev 2015-05-07 13:08:29 +00:00
Jeff Brown
1df96a424c am 92d6b09e: Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
* commit '92d6b09ebbb7c810a52f1a69a376d06277820a4b':
  Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
2015-05-07 01:41:10 +00:00
John Spurlock
d527aa0bf5 am 673db350: Merge "Settings: Add setting to mute wireless charging sound." into mnc-dev
* commit '673db350c3315df2c3a0ef70092a1d63fd8021c7':
  Settings:  Add setting to mute wireless charging sound.
2015-05-07 00:11:17 +00:00
Jeff Brown
92d6b09ebb Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
Bug: 20641986
Change-Id: Ief6c0d6048abc9411f1e9930cec1edde4a582cf9
2015-05-06 16:02:22 -07:00
John Spurlock
673db350c3 Merge "Settings: Add setting to mute wireless charging sound." into mnc-dev 2015-05-06 22:49:07 +00:00
Alan Viverette
9b2d47f445 Use theme colors in battery stats widget
Bug: 20633519
Change-Id: Ia83848ff506afbddf320fa0ed3d022f9a0e884dc
2015-05-06 15:17:27 -07:00
Sanket Padawe
7ff3fbd01e am 39ac24df: Merge "Fix SimStatus crash in Settings." into mnc-dev
* commit '39ac24df7913546d8f2db3f17bc3d3dca5638e4a':
  Fix SimStatus crash in Settings.
2015-05-06 22:14:28 +00:00
Sanket Padawe
39ac24df79 Merge "Fix SimStatus crash in Settings." into mnc-dev 2015-05-06 22:04:12 +00:00
John Spurlock
ae91c0a99a Settings: Add setting to mute wireless charging sound.
Bug: 19538553
Change-Id: I93228aee38f8eb035025409ce063f3050bf9bb9a
2015-05-06 17:42:30 -04:00
Sanket Padawe
a19723b4a6 am b7a1b5c3: Merge "Saved networks summary strings." into mnc-dev
* commit 'b7a1b5c310ccb33b6999041f2ba1f99d98cc0282':
  Saved networks summary strings.
2015-05-06 21:07:20 +00:00
Sanket Padawe
b7a1b5c310 Merge "Saved networks summary strings." into mnc-dev 2015-05-06 20:59:13 +00:00
Jason Monk
20f464edde Fix app headers in settings
Use SettingsPreferenceFragment's method for pinned headers where
possible, and add a frame within the fragment for them to live in
otherwise so that this view doesn't end up on the activity.

Bug: 20886475
Change-Id: I985eb1497744ea50bfabed862e5088eb89df5b61
2015-05-06 16:00:25 -04:00
Sudheer Shanka
11710005b8 am 5a817c6b: Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.
* commit '5a817c6bcc14033b08ad8ddec10625e4352ef194':
  Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.
2015-05-06 16:54:12 +00:00
Sudheer Shanka
5a817c6bcc Forward ACTION_OTHER_SOUND_SETTINGS intent to primary profile.
Change-Id: I55c169b280d7302c9e387f80be82ef47132798c2
2015-05-06 16:35:22 +01:00
Sanket Padawe
5a3b91cdbb Fix SimStatus crash in Settings.
Bug: 20862873
Change-Id: I1ae60ceb64a8af8b3f875e50dd62dfe9796192ca
2015-05-05 19:00:39 -07:00
John Spurlock
496aff371e am 0d2a8d20: Settings: Migrate calls & messages priority settings.
* commit '0d2a8d204bb7d62834d51393a1d4a6ddaa7753f8':
  Settings: Migrate calls & messages priority settings.
2015-05-06 00:39:41 +00:00
John Spurlock
0d2a8d204b Settings: Migrate calls & messages priority settings.
Bug: 18635172
Change-Id: Ib5fe3bc80590875bb4a1547013ac3444939ab6fd
2015-05-05 18:50:15 -04:00
Casper Bonde
5aa179886c am faadcd60: Settings UI for SIM access profile (1/2)
* commit 'faadcd60e7ab8fa6eb9b5be7be907129bd3f8575':
  Settings UI for SIM access profile (1/2)
2015-05-05 18:46:43 +00:00
Robin Lee
efe5a5c2d2 am 3342d762: Merge "VPN: Convert current-context IPCs to user context" into mnc-dev
* commit '3342d762e98996549aa5cae02ccdc3238eb3a33d':
  VPN: Convert current-context IPCs to user context
2015-05-05 18:45:57 +00:00
Brian Colonna
5e8ce3d9a3 am 229d06a8: Removed some dead Face Unlock code.
* commit '229d06a83943a2c924d9c06e0f31d71e5e8801b9':
  Removed some dead Face Unlock code.
2015-05-05 18:45:55 +00:00
John Spurlock
604f4b8872 am 42ae11d4: Merge "Settings: Remove zenswitch from DND settings page." into mnc-dev
* commit '42ae11d4d58cbe09dbbd377a4c3e2760ffa3034e':
  Settings: Remove zenswitch from DND settings page.
2015-05-05 18:45:44 +00:00
John Spurlock
7c84eecc31 am a924f3d6: Merge "Settings: Calendar event zen rule string updates." into mnc-dev
* commit 'a924f3d6bbd3b304d962a76f75b3f91567ee045b':
  Settings: Calendar event zen rule string updates.
2015-05-05 18:45:43 +00:00
Zoltan Szatmary-Ban
ffce3b4eaa am aea57bab: Merge "Forward WiFi settings intents to primary profile" into mnc-dev
* commit 'aea57babc0ced100995076caf3284c89a4a2aa11':
  Forward WiFi settings intents to primary profile
2015-05-05 18:45:40 +00:00
Casper Bonde
faadcd60e7 Settings UI for SIM access profile (1/2)
Change-Id: Iff14295ac0eb65561a2097f25c70e8b5f8be5003
2015-05-05 16:59:17 +00:00
Robin Lee
3342d762e9 Merge "VPN: Convert current-context IPCs to user context" into mnc-dev 2015-05-05 15:34:41 +00:00
Brian Colonna
229d06a839 Removed some dead Face Unlock code.
I checked to see if any dead Face Unlock code remains in settings.  Most of it
has been removed, but I did find some strings and an xml file that can be
removed.

Bug: 16139545
Change-Id: I16d7b3a258c72d6788348d1fbe35a7f6bc12ee8e
2015-05-05 11:23:12 -04:00
John Spurlock
42ae11d4d5 Merge "Settings: Remove zenswitch from DND settings page." into mnc-dev 2015-05-05 14:42:16 +00:00
John Spurlock
a924f3d6bb Merge "Settings: Calendar event zen rule string updates." into mnc-dev 2015-05-05 14:42:05 +00:00
John Spurlock
4b43b72054 Settings: Calendar event zen rule string updates.
- Remove Attendance option.
 - Use new reply value, tweak wording and summaries.

Bug: 20064962
Change-Id: I6977b494e54752fa87ea08df0ed085129a09a3d3
2015-05-05 10:12:26 -04:00
John Spurlock
beff087b3a Settings: Remove zenswitch from DND settings page.
- Remove the ability to view/modify zen mode/condition from
   the Settings app.

Bug: 20064962
Change-Id: I8757780e5e9ef578e05203577871b9f513997798
2015-05-05 07:32:31 -04:00
Robin Lee
ab6a65c03b VPN: Convert current-context IPCs to user context
These fetch info for the wrong user, which may be either wrong or worse
wholly nonexistent.

Bug: 20747154
Change-Id: Ibd5f2e5d3c5dfd252a032ebdfe204de7166fa3a5
2015-05-05 10:54:24 +00:00
Zoltan Szatmary-Ban
aea57babc0 Merge "Forward WiFi settings intents to primary profile" into mnc-dev 2015-05-05 10:07:07 +00:00
Prerepa Viswanadham
3c52d38b55 am f09497a2: Merge changes from topic \'mwd-merge-050415\' into mnc-dev
* commit 'f09497a2a702484a78b9462fc6d10eb3dc5c430d':
  DO NOT MERGE - Disable data sim selection when phone call is going on.
  Bluetooth: HID: Use proper values of connection status
2015-05-05 01:16:11 +00:00
Sanket Padawe
eb3ff59333 Saved networks summary strings.
Bug: 20667217
Change-Id: I13930f8d0d99bc874692568de713003798b98a87
2015-05-04 18:14:33 -07:00
Prerepa Viswanadham
f09497a2a7 Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
  Merge commit 'ab489de' into merge_try2
  Merge commit 'dd796e8' into merge_try2
2015-05-05 01:07:17 +00:00
Yorke Lee
61b82ac4cb am 3066f832: Merge "Rename default dialer to default phone app" into mnc-dev
* commit '3066f832435af08bbc2ed5fcef45228d5ff86e33':
  Rename default dialer to default phone app
2015-05-05 01:04:15 +00:00
Yorke Lee
3066f83243 Merge "Rename default dialer to default phone app" into mnc-dev 2015-05-05 00:22:13 +00:00
Jason Monk
ed1bf50d12 am 0ab13b83: Merge "Add high power whitelist for apps" into mnc-dev
* commit '0ab13b8326d6f31caff922fd95828254cb95a618':
  Add high power whitelist for apps
2015-05-04 18:59:15 +00:00
Jason Monk
0ab13b8326 Merge "Add high power whitelist for apps" into mnc-dev 2015-05-04 18:50:19 +00:00