Commit Graph

13368 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
fd34453dd1 Merge "Fix bug #12890909 Tablets: Settings crashes when tapped on Add Account option in settings" 2014-02-04 22:09:26 +00:00
Fabrice Di Meglio
b1b935b0a3 Fix bug #12890909 Tablets: Settings crashes when tapped on Add Account option in settings
- remove android:theme="@android:style/Theme.Holo.DialogWhenLarge" for
com.android.settings.Settings$ChooseAccountActivity

Change-Id: Ife94e93e057029a71fe4a276f7ef9b98c9561b87
2014-02-04 14:01:39 -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
Geoff Mendal
b75d7275c1 Merge "Import translations. DO NOT MERGE" 2014-02-04 02:33:26 +00: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
Geoff Mendal
0be91620ad Import translations. DO NOT MERGE
Change-Id: Ic0d6d1818b69a76e523b68dede2b6256b0f16e12
Auto-generated-cl: translation import
2014-02-03 15:31:45 -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
b798cfddae am 0105c005: am f2e9be9a: Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '0105c0051980430a0ceeb13d71daa2f70efc7e68':
  packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
2014-01-31 16:41:22 +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
f2e9be9a4b Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default" 2014-01-30 21:50:53 +00: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
041192855e am cb8a5354: am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
* commit 'cb8a53541ec142ee5d57f163496583518ddb5c6e':
  'When to daydream' dialog does not follow the JB dialog design guide
2014-01-28 15:44:53 +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
John Spurlock
3f0f02b94e Merge "'When to daydream' dialog does not follow the JB dialog design guide" 2014-01-28 14:03:41 +00:00
Baligh Uddin
a101937354 Import translations. DO NOT MERGE
Change-Id: I675d41b04b76436681f56c81ffa8986dfda5dfaf
Auto-generated-cl: translation import
2014-01-27 12:13:36 -08:00
Dianne Hackborn
f87420af4c Merge "Update to follow per-version proc stats change." 2014-01-24 23:30:59 +00:00
Dianne Hackborn
627b4e2eb5 Merge "Battery: report calculated power, tweak signal strength colors." 2014-01-24 02:02:08 +00:00
Dianne Hackborn
ab89566e82 Update to follow per-version proc stats change.
Change-Id: Iea44f1c7e9bd59a2eeaa1739bbaa5c0bdc349b0b
2014-01-23 17:59:49 -08:00
Baligh Uddin
e22559c5f5 Import translations. DO NOT MERGE
Change-Id: Id0ec338a7ae2f850b102eff2f2a5f8df5cc0e493
Auto-generated-cl: translation import
2014-01-23 10:03:30 -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
Dave Daynard
a3c0a535d1 Allow tablets to send SMS if enabled in device overlays (1/2)
Change-Id: I51771c28415352ee0838fa1507a1461c652d56e8
2014-01-20 12:29:56 -05:00
Wei Wang
e179bb0133 Merge "Fix misspell of "otherdevices"" 2014-01-16 23:26:57 +00:00
Wei Wang
aa6e665a02 Fix misspell of "otherdevices"
Bug: 12569650

Change-Id: I2c75ddfed22ded6a15291956c0c167acf6d67b0b
2014-01-16 22:13:38 +00:00
Dianne Hackborn
c140590060 Merge "Switch to BatteryStatsHelper implementation in the framework." 2014-01-16 01:39:22 +00:00
Geoff Mendal
df062746f9 Merge "Import translations. DO NOT MERGE" 2014-01-16 00:59:05 +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
Geoff Mendal
fda2b12fea Import translations. DO NOT MERGE
Change-Id: I7aa8da8f75c22a70283b7125d993c3e38164cf4e
Auto-generated-cl: translation import
2014-01-15 13:20:24 -08:00
Selim Gurun
617e0897ee Merge "Display certificate chain" 2014-01-15 19:46:24 +00:00
Wei Wang
ab4029665b Merge commit 'f4f8d9f3' into manualmerge
Conflicts:
	res/values/strings.xml

Change-Id: Ifbcd6ef2447dbb95aab0ed1971f63a16ecf8035c
2014-01-14 23:42:41 -08:00
Wei Wang
eeb60f9473 Merge commit 'fc8d2556' into manualmerge
Conflicts:
	res/values/strings.xml

Change-Id: Ia2a4480d13f5afae7ecef321dadf5c4686907d99
2014-01-14 22:33:21 -08: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
fc8d255671 Add ble settings strings.
Change-Id: If8685aac2f36f56a534f3ba47b1cc60fed88a8a3
2014-01-14 18:06:32 -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