Commit Graph

5519 Commits

Author SHA1 Message Date
Fabrice Di Meglio
0cff0e4a51 Merge "Fix bug #12893337 Crash while set up SIM card lock" 2014-02-04 23:59:11 +00:00
Amith Yamasani
c7843db06c Remove unused DebugIntentSender
Bug: 12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit 26430486e4)
2014-02-04 23:48:05 +00:00
Fabrice Di Meglio
74abdfd3e6 Fix bug #12893337 Crash while set up SIM card lock
- remove Intent declaration in favor of a Fragment
- make PhoneFactory.getDefaultPhone() call work again

Change-Id: Ie1cb6894b0c00361c451af1f8542c905213a3c97
2014-02-04 15:42:47 -08:00
Fabrice Di Meglio
90e9e6cd30 Fix bug #12895706 BT settings crash with java.lang.ClassCastException: com.android.settings.Settings cannot be cast to android.preference.PreferenceActivity
- remove the PreferenceActivity related code as we are no more using PreferenceActivity (and Settings is a derive of
SettingsActivity)

Change-Id: I3c650c03cd205d9c06679974ae4d832ced25459b
2014-02-04 14:38:59 -08:00
Fabrice Di Meglio
dc77b738a7 Fix bug #12890490 Crash in Settings observed after tap on Preferred Engine settings and Cloud print option
- when setting the Fragment's title use the CharSequence when the titleRes ID is "0"

Change-Id: I54e5379172632acfc967b5ea401ba90f73b41748
2014-02-04 12:41:30 -08:00
Fabrice Di Meglio
263bcc8b73 Use Drawer in Settings app
- get rid of PreferenceActivity as much as we can and use fragments instead
- add Drawer widget
- add Dashboard high level entry into the Drawer (but this is work in progress and would be done in another CL)
- add bypass of fragment's Header  validation when launched from the Drawer but *force* validation if external
call thru an Intent

Be aware that WifiPickerActivity should remain for now a PreferenceActivity. It is used by SetupWizard and should
not trigger running the SettingsActivity's header building code. SetupWizard is a Home during the provisionnig process
and then deactivate itself as a Home but would make the Home header to appear in the Drawer (because momentarily we
would have two Home).

Also, verified that:

- the WiFi settings still work when called from SetupWizard
- when you have multiple Launchers, the Home header will appear in the list of Headers in the Drawer

Change-Id: I407a5e0fdd843ad7615d3d511c416a44e3d97c90
2014-02-03 16:36:46 -08:00
Lifu Tang
af79ddb358 Merge "Used BroadcastReceiver to monitor mode changes" 2014-01-31 20:46:49 +00:00
Lifu Tang
72bafff2b8 Used BroadcastReceiver to monitor mode changes
- Fix b/10648447

Change-Id: Ic6dc125b6548436e9786e50bc52908c39ea4579a
2014-01-31 12:20:23 -08:00
Amith Yamasani
a265301e09 Merge "Remove unused DebugIntentSender" 2014-01-31 17:00:50 +00:00
Brian Carlstrom
0105c00519 am f2e9be9a: Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit 'f2e9be9a4bb4c030c9bbcb29990e8b22bab809e4':
  packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
2014-01-31 13:00:33 +00:00
Brian Carlstrom
57b670e390 packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
Bug: 12798969

(cherry picked from commit 7a60db234a)

Change-Id: I3f72b5ce6c17ffa73f15c237d6bfbda85cdd9239
2014-01-30 16:30:00 -08:00
Brian Carlstrom
7a60db234a packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
Bug: 12798969
Change-Id: I1937c2ff758214e1c9d369e475ae4efbba4f9dec
2014-01-30 13:17:08 -08:00
Amith Yamasani
26430486e4 Remove unused DebugIntentSender
Bug: 12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
2014-01-29 16:11:03 -08:00
John Spurlock
e4255d3c3b am af87ce09: am 04119285: am cb8a5354: am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
* commit 'af87ce09915ae1b5cc3c3a46ab9fb241df1be13d':
  'When to daydream' dialog does not follow the JB dialog design guide
2014-01-28 15:52:03 +00:00
John Spurlock
af87ce0991 am 04119285: am cb8a5354: am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
* commit '041192855ed8b025246578d80f0b372bf346a2f1':
  'When to daydream' dialog does not follow the JB dialog design guide
2014-01-28 15:48:12 +00:00
John Spurlock
cb8a53541e am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
* commit '3f0f02b94e5be6724659f860aef5e637ff61d3aa':
  'When to daydream' dialog does not follow the JB dialog design guide
2014-01-28 15:40:45 +00:00
Dianne Hackborn
f87420af4c Merge "Update to follow per-version proc stats change." 2014-01-24 23:30:59 +00:00
Dianne Hackborn
ab89566e82 Update to follow per-version proc stats change.
Change-Id: Iea44f1c7e9bd59a2eeaa1739bbaa5c0bdc349b0b
2014-01-23 17:59:49 -08:00
Per Allard
6251d707b1 'When to daydream' dialog does not follow the JB dialog design guide
The dialog is a single selection popup and according to the
dialogs design guide the popup should close when the user
has make his/her choice, but in this case it does not.

Change-Id: Iac6bc19146a88236d3253d2d846212ce09b4925b
2014-01-23 18:15:56 +09:00
Dianne Hackborn
18083b1eb7 Battery: report calculated power, tweak signal strength colors.
BatteryHistoryHelper now computes the total power to be the total
including the unaccounted, so we don't go > 100%.  However for the
unaccounted/over-counted details, we want to report the actual
computed amount.  Use a new API to do this.

Also tweak the signal strength colors so that the "no signal" state
is stronger, by being reddish instead of bright yellow.

Change-Id: I6af9fbcce8c3324883db0184f7ac215cb41b6230
2014-01-22 14:18:39 -08:00
Dianne Hackborn
c140590060 Merge "Switch to BatteryStatsHelper implementation in the framework." 2014-01-16 01:39:22 +00:00
Dianne Hackborn
7c80af410b Switch to BatteryStatsHelper implementation in the framework.
Change-Id: I3ad051e029885af70a6bd14a1351b32860ba565d
2014-01-15 16:24:28 -08:00
Fabrice Di Meglio
56ba582647 Merge "More code cleaning (missing items)" 2014-01-16 00:06:46 +00:00
Selim Gurun
617e0897ee Merge "Display certificate chain" 2014-01-15 19:46:24 +00:00
Wei Wang
f4f8d9f346 BLE peripheral mode (4/4): Settings change for advertising preference.
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
2014-01-14 18:06:42 -08:00
Wei Wang
c0af0c4633 Merge "BLE peripheral mode (4/4): Settings change for advertising preference." 2014-01-15 01:43:37 +00:00
Fabrice Di Meglio
a3d0158ff6 More code cleaning (missing items)
- corrected the missed "switch_" variable naming
- optimize imports more

Change-Id: I8501c99d65e91f26fc56f589e02a1fd1be3d81a3
2014-01-14 16:32:10 -08:00
Fabrice Di Meglio
d45cf417bc Merge "More code cleaning" 2014-01-14 22:23:50 +00:00
Fabrice Di Meglio
ad38a88b95 More code cleaning
- remove some dead code
- better variable naming
- add debug log for exception
- clean some unused imports

Change-Id: Iec4239a7e75f29d860f286ab089e748e8a672281
2014-01-14 14:04:04 -08:00
Jun Su
f3a9578910 Fix memory leak in ManageApplication
ApplicationsAdapter new a Session member and make it has a reference to
it self. If we don't release it explicitly, the cross reference will
cause memory leak.

Change-Id: Iecce35ae1d56d98cee6347e84d3a3ff57f3b15a5
2014-01-14 03:47:01 +00:00
Dianne Hackborn
4792823f71 Merge "Add "unaccounted" item to battery use UI." 2014-01-14 01:52:12 +00:00
Wei Wang
eb56b9ccb8 BLE peripheral mode (4/4): Settings change for advertising preference.
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
2014-01-13 17:41:02 -08:00
Dianne Hackborn
5b6f59a072 Add "unaccounted" item to battery use UI.
Kind-of informative.

Change-Id: I10d2ee1ad8fe598a1ce1989df6628da11b82d906
2014-01-13 17:40:50 -08:00
Andres Morales
96b0b43a8a Merge "Reduce timeout of dismissing pairing dialog on success" 2014-01-14 00:26:37 +00:00
Jeff Sharkey
6235eb5466 am ba646e3a: am 0cd68e04: am 859909fe: am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"
* commit 'ba646e3af11db80936ad9f8df20deb7a318ed46a':
  Fix null pointer exceptions in NetworkPolicyEditor
2014-01-10 23:16:22 +00:00
Jeff Sharkey
859909fee8 am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"
* commit 'b5377a7165a1f09c3cbd5c76f5a5745f6efc28e5':
  Fix null pointer exceptions in NetworkPolicyEditor
2014-01-10 15:08:40 -08:00
Jeff Sharkey
b5377a7165 Merge "Fix null pointer exceptions in NetworkPolicyEditor" 2014-01-10 23:04:31 +00:00
Fabrice Di Meglio
57a7329cf6 Merge "Code cleaning for removing dual pane meta data as it is no more used" 2014-01-10 22:23:50 +00:00
Fabrice Di Meglio
8c4ccb87ca Code cleaning for removing dual pane meta data as it is no more used
- remove META_DATA_KEY_PARENT_TITLE and META_DATA_KEY_PARENT_FRAGMENT_CLASS

Change-Id: Ied38e9a26e3c47edec56437818bb6f2daa7f8621
2014-01-08 15:53:44 -08:00
RoboErik
813a54d216 b/12068020 Update calls to InputManager
This is part of work on making key layouts get saved per vendor/product
instead of per device. The corresponding change in fw is
https://googleplex-android-review.git.corp.google.com/#/c/399886/
This changes all uses of InputDevice descriptor to InputDeviceIdentifier.

Change-Id: I3eeebc0223820aeab62c2b8aa822f4d91adaf2d1
2014-01-08 13:57:34 -08:00
Yuhao Zheng
f20f5ce89a Merge "Make wifi dialog persist after orientation change" 2014-01-07 19:39:13 +00:00
Amith Yamasani
ecc1730a9c am 200b6c63: am 3cfb6767: am e7d8485a: am 5be77489: Merge "Dont show "Erase SD Card" when there is none"
* commit '200b6c63237bcf1d911d5e8b48a4cd2f05d0ce3d':
  Dont show "Erase SD Card" when there is none
2014-01-07 19:23:09 +00:00
Yuhao Zheng
6c81d90be3 Make wifi dialog persist after orientation change
Wifi "cancel/forget/connect" pop-up window does not persist after orientation
changes. Specifically, after orientation changes, the connect button disappears.

This is because dialog information is not saved properly. When a saved wifi
config is found in the scan results, this entry is BOTH a wifi config AND a scan
result. Previous implementation has 2 issues:

1. Scan result part isn't saved. That's why the connect button after orientation
   changes, as UI didn't see a scan result section and thought it's not in range.

2. When both wifi config and scan result are saved, they are not restored
   correctly. Restoring wifi config will reset mRssi field in scan result part,
   while restoring scan result will reset netowrkId in wifi config part.

Both issuses are fixed.

bug: 9053186
Change-Id: Ic3ee7b5931c91d4b2f5c723fb8718cf752463109
2014-01-07 10:59:30 -08:00
Amith Yamasani
e7d8485a23 am 5be77489: Merge "Dont show "Erase SD Card" when there is none"
* commit '5be77489e2f1f7b5c68763cf7660e844587d5e9e':
  Dont show "Erase SD Card" when there is none
2014-01-07 10:42:15 -08:00
Amith Yamasani
5be77489e2 Merge "Dont show "Erase SD Card" when there is none" 2014-01-07 18:37:54 +00:00
John Spurlock
3e9110fe6a Merge "Remove rotation-lock from Display settings." 2014-01-06 19:22:15 +00:00
Elliott Hughes
d954e2cc1c am 391af725: am 8995a94d: am 97886741: am f85d9841: Merge "Fix elapsed time formatting."
* commit '391af72514dfca243249fb873b639401bcf0c129':
  Fix elapsed time formatting.
2014-01-03 21:45:43 +00:00
Elliott Hughes
97886741b9 am f85d9841: Merge "Fix elapsed time formatting."
* commit 'f85d9841f8e198de656973a2102d3239e628390a':
  Fix elapsed time formatting.
2014-01-03 13:36:27 -08:00
Elliott Hughes
f7cb4b0dda Fix elapsed time formatting.
We should extend DateUtils to provide this kind of elapsed time
formatting via icu4c, but for now let's at least fix our
arithmetic.

Bug: https://code.google.com/p/android/issues/detail?id=61479
Change-Id: I6c087dbb9fdbff0a21d9243d239126fee180454c
2014-01-03 12:14:13 -08:00
Andres Morales
13c42cfefc Reduce timeout of dismissing pairing dialog on success
Change-Id: If4b74559cd6f628164b8b114c8c8b509dcb6b884
2013-12-30 12:56:55 -08:00