Commit Graph

14837 Commits

Author SHA1 Message Date
John Spurlock
85ba0ee6ec Fix crash when launching zen mode settings.
The switch bar is only accessible in onActivityCreated.  Defer
initialization until then.

Bug:15214851
Change-Id: Ie026d46250dae397ba0af02e833bb178631fe708
2014-05-24 14:40:05 -04:00
Fabrice Di Meglio
22807d93a2 am 7ca0cd41: Merge "Make smooth transition between Search fragment and the others" into lmp-preview-dev
* commit '7ca0cd415c4d5069e4981a6d5e41e8aa9a43f23e':
  Make smooth transition between Search fragment and the others
2014-05-24 01:34:11 +00:00
Fabrice Di Meglio
7ca0cd415c Merge "Make smooth transition between Search fragment and the others" into lmp-preview-dev 2014-05-24 01:31:43 +00:00
Fabrice Di Meglio
0897f975c1 Add Indexing and Search for ChooseLockGenericFragment
- clean some imports
- add key and title to security_settings_picker.xml
- add ChooseLockGenericFragment in SearchIndexableResources

Change-Id: I867a1e11905cc4059d6eccabeab04d55cc3d799e
2014-05-23 18:17:09 -07:00
Dianne Hackborn
beb6088990 am 0171fdba: Merge "Fix issue #15185822: Stability: ArithmeticException: divide by zero" into lmp-preview-dev
* commit '0171fdba7bd9b5acdcf0d32ffa12e07c69045a5d':
  Fix issue #15185822: Stability: ArithmeticException: divide by zero
2014-05-24 00:02:05 +00:00
Dianne Hackborn
0171fdba7b Merge "Fix issue #15185822: Stability: ArithmeticException: divide by zero" into lmp-preview-dev 2014-05-23 23:59:24 +00:00
Fabrice Di Meglio
29b915d559 am 7e4855e8: Update Search recents behavior
* commit '7e4855e8f644bdecf68ec65b8c1b7c08624a4876':
  Update Search recents behavior
2014-05-23 23:48:57 +00:00
Dianne Hackborn
a32d81797f Fix issue #15185822: Stability: ArithmeticException: divide by zero
Also small visual improvements.

Change-Id: I55dc30539a4ef67e9261f338c8c5a729a6958d9b
2014-05-23 16:47:37 -07:00
Fabrice Di Meglio
59a4055cbb Make smooth transition between Search fragment and the others
- use TransitionManager.beginDelayedTransition() and
getFragmentManager().executePendingTransactions()

Change-Id: I5d583916afb8b87dfe2b17b4e685ef5384c5fbd2
2014-05-23 16:46:50 -07:00
Fabrice Di Meglio
7e4855e8f6 Update Search recents behavior
- per UX request
- Search recents show now by defaults with the recent searches
when the SearchView is empty
- when we press on a Serach recent, we are showing the Search results
and the recents are disappearing
- when keying text in the SearchView, we hide the recents and start
showing the results
- we still save the Search query when hitting on a result

Change-Id: I6c2be21660a30f6973dea27d4852b2068a05963d
2014-05-23 16:09:53 -07:00
Fabrice Di Meglio
9ad4a825a3 am 2416a3e0: Seventh batch of new Quantum Theme assets
* commit '2416a3e071785241c15463b20d1d34001ba931af':
  Seventh batch of new Quantum Theme assets
2014-05-23 21:13:42 +00:00
Fabrice Di Meglio
2416a3e071 Seventh 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: I93b060d016620a304f2e34cee498f9e2357a6cb6
2014-05-23 14:01:34 -07:00
Fabrice Di Meglio
74d8a7ee75 am 5370e2e7: (-s ours) Merge "Sixth batch of new Quantum Theme assets - DO NOT MERGE" into lmp-preview-dev
* commit '5370e2e7755082997d6811cba325941ead46518d':
  Sixth batch of new Quantum Theme assets - DO NOT MERGE
2014-05-23 20:13:51 +00:00
Fabrice Di Meglio
c5866cfded am 52ed90b3: (-s ours) Fifth batch of new Quantum Theme assets - DO NOT MERGE
* commit '52ed90b31184dc68cfac0edeeae5ba18aa2eea94':
  Fifth batch of new Quantum Theme assets - DO NOT MERGE
2014-05-23 20:13:50 +00:00
Fabrice Di Meglio
cadcd6d848 am 058df7d0: (-s ours) Merge "Fix bug #15173703 Crash in Settings is observed when Android Beam page orientation is changed. DO NOT MERGE" into lmp-preview-dev
* commit '058df7d01fa592b8b0068db9a7770a7eaf3f46f0':
  Fix bug #15173703 Crash in Settings is observed when Android Beam page orientation is changed. DO NOT MERGE
2014-05-23 20:13:50 +00:00
Fabrice Di Meglio
5370e2e775 Merge "Sixth batch of new Quantum Theme assets - DO NOT MERGE" into lmp-preview-dev 2014-05-23 20:10:09 +00:00
Fabrice Di Meglio
a218d0ed73 Sixth batch of new Quantum Theme assets - DO NOT MERGE
- needed for Quantum Theme support

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

Change-Id: Iaec517aa448b1590bcb355ac8694b2e4e0c90292
(cherry picked from commit 5847373448)
2014-05-23 19:31:21 +00:00
Fabrice Di Meglio
52ed90b311 Fifth batch of new Quantum Theme assets - DO NOT MERGE
- needed for Quantum Theme support

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

Change-Id: I04e31e277d59d97f7871dde6bdb6a7099c7a8d65
(cherry picked from commit dcfa52c524)
2014-05-23 19:27:42 +00:00
Fabrice Di Meglio
058df7d01f Merge "Fix bug #15173703 Crash in Settings is observed when Android Beam page orientation is changed. DO NOT MERGE" into lmp-preview-dev 2014-05-23 17:57:24 +00:00
Alan Viverette
511b1ea5a1 am 49dbbe17: Update references to private assets in Settings
* commit '49dbbe17b8bcda9d9df53f087ed21608192a70d4':
  Update references to private assets in Settings
2014-05-23 17:36:30 +00:00
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
Alan Viverette
49dbbe17b8 Update references to private assets in Settings
Change-Id: Id7a788c3f7015baf991427082b6592589e62d372
2014-05-22 20:43:37 -07:00
Fabrice Di Meglio
962a141f4c Fix bug #15173703 Crash in Settings is observed when Android Beam page orientation is changed. DO NOT MERGE
- use onActivityCreated() / onResume() / onPause() for the SwitchBar

Change-Id: I24b346fdc5c19acedbe845d3b7697718412b5e5d
(cherry picked from commit 4c42a88828)
2014-05-23 02:33:42 +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