Commit Graph

13665 Commits

Author SHA1 Message Date
The Android Automerger
48d7efd2cb am 474c7042: merge in master-release history after reset to 931e6a8682
* commit '474c704221a945b0dc7a0a3676d9bdda2dd5df01': (27 commits)
  Fix bug #15001610 Java crash in settings is observed while adding Google account on wiped device
  Fix bug #15109661 Settings crash after tap on back key from print settings
  [WifiSettings] Fix NullPointerException during setup
  Allow restore instance before setValues() in ListDialogPreference
  Add a CREATOR in DashboardCategory to support Parcelable
  Fix crash on settings launch in secondary user.
  Fix crash when adding account
  Fix settings crash during pathological rotate.
  Fix bug #14228591 NPE in settings app when it is launched by UiAutomator
  Fix bug #13744434 Stability: ISE in Settings: Can't switch to header... ..that has no Fragment nor Intent at SettingsActivity.onHeaderClick(SettingsActivity.java:654)
  Add more logging for onHeaderClick(...)
  Fix bug #13794200 Settings crash when screen is locked and Power Usage... ...Settings is launched with an Intent
  Re-enable on/off switch for Wi-Fi and Bluetooth Settings
  Fix bug #13563247 Settings crash on launch in secondary user
  Fix bug #13394626 Settings app crashes on changing orientation to landscape mode
  Fix bug #13300024 Settings app crashes on changing device orientation
  Fix Fragment BackStack and Titles
  Fix bug #12957032 Stability-Sys: Java crash in com.android.settings: java.lang.NullPointerException: ...Attempt to invoke virtual method 'boolean android.os.Handler.sendEmptyMessage(int)' on a null object reference
  There are several painful issues with the initial CL. Doing a revert for now and will rework this.
  Fix bug #12910775 Settings crash after tap on Access Point Names under Mobile networks
  ...
2014-05-23 17:36:30 +00:00
Fabrice Di Meglio
81f63b3931 Merge "Fix bug #15173703 Crash in Settings is observed when Android Beam page orientation is changed." 2014-05-23 02:33:10 +00:00
Fabrice Di Meglio
4c42a88828 Fix bug #15173703 Crash in Settings is observed when Android Beam page orientation is changed.
- use onActivityCreated() / onResume() / onPause() for the SwitchBar

Change-Id: I24b346fdc5c19acedbe845d3b7697718412b5e5d
2014-05-22 19:32:29 -07:00
Fabrice Di Meglio
d25c354753 Merge "Sixth batch of new Quantum Theme assets" 2014-05-23 02:19:42 +00:00
Fabrice Di Meglio
5847373448 Sixth batch of new Quantum Theme assets
- needed for Quantum Theme support

See bug #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: Iaec517aa448b1590bcb355ac8694b2e4e0c90292
2014-05-22 19:17:36 -07:00
Fabrice Di Meglio
3b2314523c Merge "Fifth batch of new Quantum Theme assets" 2014-05-23 01:18:05 +00:00
Fabrice Di Meglio
dcfa52c524 Fifth batch of new Quantum Theme assets
- needed for Quantum Theme support

See bug #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: I04e31e277d59d97f7871dde6bdb6a7099c7a8d65
2014-05-22 18:14:24 -07:00
vandwalle
653cfeeb0a when vervbose logging, keep track of a list of ScanResults per AP
Change-Id: Ib8f797de360f11eb9914a6aa44d418e1d0571973
2014-05-22 15:03:48 -07:00
Fabrice Di Meglio
27ed053b76 Merge "Fix bug #15161058 Stability: ISE in Settings:Fragment DashboardSummary{588de71} not attached to Activity" 2014-05-22 18:29:40 +00:00
Fabrice Di Meglio
53d76860a5 Fix bug #15161058 Stability: ISE in Settings:Fragment DashboardSummary{588de71} not attached to Activity
- prevent rebuilding the UI until the fragment got attached

Change-Id: I6d5fcbce2581f3fc9900f1ca4fc8178ee959061e
2014-05-22 11:27:43 -07:00
Jason Monk
9c71fcc535 Merge "Add Editable PAC field to Proxy Configuration" 2014-05-22 18:24:58 +00:00
Jason Monk
0485b7c373 Add Editable PAC field to Proxy Configuration
Make PAC URL field not read only but now settable in advanced wifi
configuration options.

Bug: 14885470
Change-Id: I2c647f823d5c8a75b5fbf74434cbf0efcc4c50bf
2014-05-22 13:36:02 -04:00
Fabrice Di Meglio
167b5b0625 Merge "Optimize Dashboard loading" 2014-05-22 17:32:47 +00:00
Fabrice Di Meglio
b644f29313 Optimize Dashboard loading
- prevent loading categories twice
- add some logging to see the time taken for building the Dashboard titles

Change-Id: I31724c0e66fe3b453a87f12476f58db84c73423f
2014-05-22 10:30:03 -07:00
The Android Automerger
474c704221 merge in master-release history after reset to 931e6a8682 2014-05-22 07:22:30 -07:00
Robert Greenwalt
a821f8324a Merge "Move mobile data dis/enable to Telephony" 2014-05-22 13:23:07 +00:00
The Android Automerger
5e49a71626 merge in master-release history after reset to c8e7e43a9d 2014-05-22 05:51:01 -07:00
Robert Greenwalt
0d4c500e98 Move mobile data dis/enable to Telephony
ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
2014-05-21 23:18:02 -07:00
vandwalle
931e6a8682 Merge "make verbose logging a wifimanager hidden API" 2014-05-22 03:36:48 +00:00
vandwalle
c9a6698fd4 make verbose logging a wifimanager hidden API
Change-Id: I092b7f507ad4dfdab16658929f02584a1fc22ba4
2014-05-21 20:25:15 -07:00
Baligh Uddin
f7406c03b5 am a8e1e7c9: (-s ours) am 6a0bfc9f: (-s ours) Import translations. DO NOT MERGE
* commit 'a8e1e7c9d08b0ccca7ccce7d5462fc2cdaaa3315':
  Import translations. DO NOT MERGE
2014-05-22 03:24:23 +00:00
Baligh Uddin
a8e1e7c9d0 am 6a0bfc9f: (-s ours) Import translations. DO NOT MERGE
* commit '6a0bfc9f2b8989b971b12738906804b8e1abbdb5':
  Import translations. DO NOT MERGE
2014-05-22 03:15:46 +00:00
Alan Viverette
c8e7e43a9d Merge "Update highlight attribute" 2014-05-22 01:12:03 +00:00
Fabrice Di Meglio
7b9134c229 Merge "Fourth batch of new Quantum Theme assets" 2014-05-22 00:37:35 +00:00
Fabrice Di Meglio
c46bfb1c38 Fourth batch of new Quantum Theme assets
- needed for Quantum Theme support

See bug #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: Ib0c8ef37e069a0c6ed9dd3461bc52055cf199de7
2014-05-21 17:35:53 -07:00
Fabrice Di Meglio
4eb86b66f2 Merge "Improve Preference highlighting for Search" 2014-05-21 23:25:25 +00:00
Alan Viverette
36950406e6 Update highlight attribute
Change-Id: Ib9373bd3c89dbf28b4586d95306d02a3999b119e
2014-05-21 16:24:34 -07:00
Fabrice Di Meglio
4a2ee7e2b6 Improve Preference highlighting for Search
- cache hightlight Drawable
- set mPreferenceHighlighted as early as possible

Change-Id: I512d4677e94309175ead22c46b7a78e2aa387e1c
2014-05-21 16:19:41 -07:00
Baligh Uddin
6a0bfc9f2b Import translations. DO NOT MERGE
Change-Id: Idbb361c506a6d3d88653e6699b00d79c344b8c98
Auto-generated-cl: translation import
2014-05-21 14:52:35 -07:00
Fabrice Di Meglio
de1bf1e32a Merge "Fix HighlightingFragment" 2014-05-21 21:32:19 +00:00
Fabrice Di Meglio
bbfaa11cf7 Fix HighlightingFragment
- get themed highlight drawable

Similar fix as I945eca98e1d73fda3b290a6ababfd1fb41118d8f

Change-Id: Ieabee16433ec29044a7a26875c3325231a287c88
2014-05-21 14:26:52 -07:00
Dianne Hackborn
7e315ee5e1 Merge "Update battery use chart to better match new mocks." 2014-05-21 21:26:24 +00:00
Dianne Hackborn
5a9ace3a7a Update battery use chart to better match new mocks.
Change-Id: I714cb30ccd9b8144785aee16a23ae2b723df4347
2014-05-21 14:19:11 -07:00
Alan Viverette
347d195a1a Merge "Fix typo in Settings" 2014-05-21 21:10:15 +00:00
Alan Viverette
e1d7e03464 Fix typo in Settings
Change-Id: I343242def31448fa5697e21bec3b35ee55e22d13
2014-05-21 14:09:15 -07:00
Fabrice Di Meglio
db9773a4e5 Merge "Fix bug #15115542 Ripple effect is crashing Settings with java.lang.NullPointerException" 2014-05-21 21:02:30 +00:00
Fabrice Di Meglio
676751ebbd Fix bug #15115542 Ripple effect is crashing Settings with java.lang.NullPointerException
- for having the tint attribute to be populated you need to have the Theme passed.
This is why Fragment.getActivity().getDrawable(...) should be used instead of
Fragment.getResources().getDrawable(...)

Change-Id: I945eca98e1d73fda3b290a6ababfd1fb41118d8f
2014-05-21 13:58:46 -07:00
Christoph Studer
53509f24cf Update NotificationListenerService API
Change-Id: I09089bf5063031c08e67a5e63e2997f8df727bfd
2014-05-21 21:31:04 +02:00
Baligh Uddin
a5e1d3037f Merge "Import translations. DO NOT MERGE" 2014-05-21 15:42:52 +00:00
Paul Lawrence
238d40d236 Merge "Add tablet pattern layout to avoid outsize patterns" 2014-05-21 14:09:00 +00:00
Paul Lawrence
1571cc08c9 Merge "Fix landscape mode for pattern decrypt dialog" 2014-05-21 14:08:45 +00:00
The Android Automerger
761ab6df10 merge in master-release history after reset to 645b709de8 2014-05-21 05:50:47 -07:00
Fabrice Di Meglio
645b709de8 Merge "Fix bug #14323392 Old Settings screen is shown while choosing Settings shortcut" 2014-05-21 02:25:34 +00:00
Fabrice Di Meglio
181b98032d Fix bug #14323392 Old Settings screen is shown while choosing Settings shortcut
- move the Theme from styles.xml to themes.xml
- update the theme "Theme.CreateShortCut" to match the Settings App one
for Quantum Paper theming

Change-Id: I491c1e8e34eebea8c63e056e9514190e72ffa994
2014-05-20 19:23:27 -07:00
Fabrice Di Meglio
7c67b677cf Merge "Remove tweak for Font size" 2014-05-21 02:13:38 +00:00
Fabrice Di Meglio
7307096e4a Remove tweak for Font size
See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: Id91360f9e0b3b34baa3ea5db8f090233e61bbeaa
2014-05-20 19:07:10 -07:00
Fabrice Di Meglio
53e255242f Merge "Tune SwitchBar padding" 2014-05-21 02:01:20 +00:00
Fabrice Di Meglio
40a66f4c14 Tune SwitchBar padding
- remove hardcoded values
- use UX specs padding values for Phone and Tablet UI

Change-Id: Ic907c52860a1cc17acddd271943c8b2da20fb957
2014-05-20 18:59:21 -07:00
Andres Morales
319229db77 Merge "Fix master: deleting remaining file from revert." 2014-05-21 00:56:30 +00:00
Andres Morales
916c6fe341 Fix master: deleting remaining file from revert.
Change-Id: I9aab25b8a7135bbc59556bc30d538a7c450de060
2014-05-20 17:49:30 -07:00