Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,516 Commits 1 Branch 0 Tags
3d83f5ca9cb39a8f000da4c7f163a25108e1f478
Commit Graph

4521 Commits

Author SHA1 Message Date
Elliott Hughes
3d83f5ca9c am caeb7a6e: Merge "Get time zone names from CLDR." 
* commit 'caeb7a6e627a8326b3268a8ca588b7ea0d3d700c':
  Get time zone names from CLDR.
 2013-09-13 16:11:43 -07:00
Elliott Hughes
caeb7a6e62 Merge "Get time zone names from CLDR." 2013-09-13 23:08:12 +00:00
Amith Yamasani
ad54160844 am ad0f0edb: Merge "Call to equals() comparing different types" 
* commit 'ad0f0edb54fd61048b64053d7eb8fafa6c84b119':
  Call to equals() comparing different types
 2013-09-12 09:21:53 -07:00
Amith Yamasani
ad0f0edb54 Merge "Call to equals() comparing different types" 2013-09-12 16:08:20 +00:00
Elliott Hughes
f1582bc3f5 Get time zone names from CLDR. 
Since the intent appears to have been "use the zone's local names if
they're in the same country, and use exemplar locations otherwise",
this patch gets the localized CLDR time zone name or the localized
CLDR exemplar location as appropriate.

Bug: 8145760
Bug: 10179879
Change-Id: Ib3968a493de9f0d3040f3afa6ca07d9f44566a32
 2013-09-10 16:46:59 -07:00
Robert Greenwalt
a1fa7cef5d am 1faefa06: Merge "Fix one NPE in tethering setting" 
* commit '1faefa06a3a742123af8ea5be5bbfb730db16c7c':
  Fix one NPE in tethering setting
 2013-08-15 07:17:11 -07:00
Robert Greenwalt
1faefa06a3 Merge "Fix one NPE in tethering setting" 2013-08-15 14:13:10 +00:00
Jianzheng Zhou
508c7c16ab Fix one NPE in tethering setting 
Once we not declare BT feature, go Setting->more->tethering
will trigger this NPE.

Change-Id: I4736e7bade261475acda74e26250a81452018ffa
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
 2013-08-15 14:34:52 +08:00
Dianne Hackborn
fc222b8d3a am 8f00b771: Merge "Fix app ops details not displaying permissions under certain conditions." 
* commit '8f00b7711c48a102a70f9b7e6a563aa14b79f5a5':
  Fix app ops details not displaying permissions under certain conditions.
 2013-08-05 11:15:43 -07:00
Danny Baumann
67e72d9e8a Fix app ops details not displaying permissions under certain conditions. 
If there's a permission that is not granted, the loop is aborted instead
of just skipping said permission.

Change-Id: Icca567ebdd818f40ad6619f258c77590074d1deb
 2013-08-05 14:30:33 +02:00
Dianne Hackborn
ad38b60b37 am 0a09b13c: am a6683e0f: Reset app preferences now resets all app ops. 
* commit '0a09b13c81bb0ebe556e46e3859a25805b2cbdcf':
  Reset app preferences now resets all app ops.
 2013-08-02 19:32:14 -07:00
Dianne Hackborn
a6683e0f4a Reset app preferences now resets all app ops. 
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
 2013-08-02 19:20:48 -07:00
Robert Greenwalt
5b7bf112f5 am 35a2d796: Merge "Fix "Add Network" show last selected WiFi AP Dialog" 
* commit '35a2d796e3afbd7c2572c16f5c8655d89078198b':
  Fix "Add Network" show last selected WiFi AP Dialog
 2013-07-29 16:50:30 -07:00
Birdson_Chen
2dcf6083f7 Fix "Add Network" show last selected WiFi AP Dialog 
When user taps Wi-Fi add network button, the pop-up dialog is not empty (it shows last selected WiFi AP Dialog).
The above is observed after the following steps:
- Launch Settings application
- Turn on Wi-Fi
- Select any Wi-Fi Access Point which is not connected previously and change to portrait mode
- Press Cancel from the pop-up and select Add Network icon in menu

Because the "Rotation" operation will cause WifiDialog re-creating and the current settings
of selected Wi-Fi Access Point is saved before WifiDialog destroyed.
Then, the saved Wi-Fi Access Point is displayed when user tap on "Add Network".

It need to clear the saved Wi-Fi Access Point when WifiDialog re-creating.

Change-Id: I3e93943e5bee405329e309c3ec88a35ee9cafc43
 2013-07-29 10:37:36 +08:00
Robert Greenwalt
ea6b5d63d9 am 275c1dff: am 3c087a68: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev 
* commit '275c1dff7dbec58588b0c696fc5ff4dc80ca6942':
  Use ConnectivityManager for mobile provision url
 2013-07-19 13:43:04 -07:00
Robert Greenwalt
ba32c249ad resolved conflicts for merge of 4d9f670b to stage-aosp-master 
Change-Id: Ia5bb368dbbd857c6e201b821ae7c03a9f6f5006b
 2013-07-18 20:52:47 -07:00
Robert Greenwalt
4929e912c0 Use ConnectivityManager for mobile provision url 
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
 2013-07-16 14:39:50 -07:00
Wink Saville
eeb90735dd am 95c2a4a4: am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev 
* commit '95c2a4a43039705f573b346026908369aa5df2b6':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
 2013-07-12 12:03:54 -07:00
Wink Saville
b464478664 VZW wants the phoneNumber to be 10 zero's if there isn't one. 
Bug: 9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
 2013-07-10 22:19:26 -07:00
Chen Hong
3f9e2aec2e Fix issue 52986: Wifi settings abnormal when screen rotation 
When checked "Show Advanced settings" in wifi setup wifi setup wizard, and rotate the phone to landscape, the advanced settings are gone, but the checkbox is still checked. It's because of checkbox is set click listener but not checked changed listener, it can't handle checkbox's status properly.

Change-Id: I2930cab4d0878c3d91db46560f837ca21d45da4d
 2013-07-11 11:19:00 +08:00
Wink Saville
17f1fa4207 am 7319f2b1: am 5d5a269f: Add Manage mobile plan to Settings. 
* commit '7319f2b123772d72417cd09e8f3f04441c93d13d':
  Add Manage mobile plan to Settings.
 2013-07-01 16:33:01 -07:00
Wink Saville
5d5a269f59 Add Manage mobile plan to Settings. 
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
 2013-07-01 16:27:10 -07:00
Robert Greenwalt
50702355f2 am 5d3ef571: am a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode" 
* commit '5d3ef5715c43ca9c3c969deaf25c76a7d3e27624':
  Dont enable Wi-Fi if it's not toggleable in flight mode
 2013-06-28 08:08:17 -07:00
Robert Greenwalt
5d3ef5715c am a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode" 
* commit 'a1454529c3eb6d0e87b254888abfea3bb714f7fe':
  Dont enable Wi-Fi if it's not toggleable in flight mode
 2013-06-28 08:06:25 -07:00
Robert Greenwalt
a1454529c3 Merge "Dont enable Wi-Fi if it's not toggleable in flight mode" 2013-06-28 15:05:16 +00:00
Johan Redestig
2acaf22ad1 Dont enable Wi-Fi if it's not toggleable in flight mode 
Dont enable Wi-Fi if it's not toggleable in flight mode
by restoring the return which was removed by
e78c187905

Change-Id: I8ca5a3e9b3f36f148f08ce97b8a2b854bf7de21c
 2013-06-28 10:37:07 +02:00
Elliott Hughes
29bed78df6 am add37ef4: am 5f6e4339: Merge "Use SimpleDateFormat for time zone formatting." 
* commit 'add37ef4f2721bc791319e6794b310cfbd802533':
  Use SimpleDateFormat for time zone formatting.
 2013-06-27 14:59:08 -07:00
Elliott Hughes
add37ef4f2 am 5f6e4339: Merge "Use SimpleDateFormat for time zone formatting." 
* commit '5f6e43394dd89432b241f32cd2c96d87c3ad5040':
  Use SimpleDateFormat for time zone formatting.
 2013-06-27 14:55:54 -07:00
Elliott Hughes
81faf895d7 Use SimpleDateFormat for time zone formatting. 
There's no need to do time zone formatting manually.

Change-Id: Ibef222d11d04a327e9ef64ddc48322558028555d
 2013-06-25 10:16:27 -07:00
Elliott Hughes
2295035a85 am b17fef80: am 02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings." 
* commit 'b17fef801f4c26fdf116d706c3b9e30b522cb229':
  Clamp date setting for the SetupWizard as well as Settings.
 2013-06-25 09:57:43 -07:00
Elliott Hughes
b17fef801f am 02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings." 
* commit '02e23fb0eb96280c7874d8b5d65b56bb9fc284ba':
  Clamp date setting for the SetupWizard as well as Settings.
 2013-06-25 09:56:06 -07:00
Elliott Hughes
b85d48fa43 Clamp date setting for the SetupWizard as well as Settings. 
We fixed this for Settings in 7ccfa0614c,
but @sonymobile.com point out that it's still broken for SetupWizard.

Change-Id: I59348200105246f3ed7c0892e5f19b901d3e95ac
 2013-06-24 17:24:01 -07:00
Dianne Hackborn
7f74dea7a8 am 67571084: am 5da4c907: Merge "Fix issue #9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev 
* commit '675710849a1209f929e387b19e3a7705f702f5bd':
  Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps
 2013-06-20 14:40:57 -07:00
Dianne Hackborn
f5f08628cc Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps 
We need to resume the current tab before checking to see if
there are any disabled apps and deciding from that the number
of tabs to show.

Change-Id: I95037f15ff7a97f0234143d10ebcee79224a3114
 2013-06-19 17:01:51 -07:00
Amith Yamasani
893bdcd531 am 1b79c5c8: Merge "Allow hidden apps to opt-out" into jb-mr2-dev 
* commit '1b79c5c804e53fc63f602a5c4dcd876a0d2c7ab9':
  Allow hidden apps to opt-out
 2013-06-07 10:47:24 -07:00
Amith Yamasani
1b79c5c804 Merge "Allow hidden apps to opt-out" into jb-mr2-dev 2013-06-07 17:45:26 +00:00
Alex Klyubin
3c862fb5b6 am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev 
* commit '681b21f3e4ef0a63d982eca0e9d1896422bc30ff':
  Permit deactivation of malformed Device Admins.
 2013-06-06 17:51:57 -07:00
Alex Klyubin
681b21f3e4 resolved conflicts for merge of 5d21820a to jb-mr2-dev 
Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
 2013-06-06 15:45:23 -07:00
Alex Klyubin
5d21820a97 am a65fa934: am 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev 
* commit 'a65fa934f19ebfe59a8458be733e783292ad8d9c':
  Permit deactivation of malformed Device Admins.
 2013-06-06 15:35:41 -07:00
Alex Klyubin
5aa3f87824 am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. 
* commit '0c32da7ee01f7f523a889c5faf1a449e664f8bce':
  Ensure all active Device Admins are listed.
 2013-06-06 15:35:34 -07:00
Alex Klyubin
8d5aeffa7d am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev 
* commit '089d161588f07862ac1e8876a39227e4110b2bec':
  Permit deactivation of malformed Device Admins.
 2013-06-06 15:29:56 -07:00
Alex Klyubin
9f6a193394 am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. 
* commit '0ffbbad5b1ad34bb2add06f7ec030191ed94e866':
  Ensure all active Device Admins are listed.
 2013-06-06 15:29:56 -07:00
Alex Klyubin
089d161588 am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev 
* commit '01dbfbf9c3e14253b7c3a2e822c55c013d0e4b17':
  Permit deactivation of malformed Device Admins.
 2013-06-06 15:28:53 -07:00
Alex Klyubin
0ffbbad5b1 am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. 
* commit '60544e74b689c5c9e6e47e6b1c50582fe37d0a70':
  Ensure all active Device Admins are listed.
 2013-06-06 15:28:52 -07:00
Alex Klyubin
01dbfbf9c3 am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev 
* commit 'efd88e2c468db2169ff9bb17f2b89c246756dcda':
  Permit deactivation of malformed Device Admins.
 2013-06-06 15:26:49 -07:00
Alex Klyubin
60544e74b6 am 3dddd8cb: Ensure all active Device Admins are listed. 
* commit '3dddd8cbff8c8153363373ebe9911d67f0e50bcd':
  Ensure all active Device Admins are listed.
 2013-06-06 15:26:48 -07:00
Alex Klyubin
efd88e2c46 Merge "Permit deactivation of malformed Device Admins." into jb-dev 2013-06-06 22:25:29 +00:00
Alex Klyubin
29de9d5153 Permit deactivation of malformed Device Admins. 
Bug: 9074296
Change-Id: I4a3b2f972cb297b9f985a762219c8d67d8e3a425
 2013-06-06 14:56:24 -07:00
Amith Yamasani
48b8b8fd18 Allow hidden apps to opt-out 
When a system app doesn't have any UI, it wasn't being considered for
opt-out. Check for all system apps that want to opt-out and mark them
for uninstallation.

Bug: 8908632
Change-Id: Iad7ccbe544cc7c7ebf73f430fbab8d295eb40219
 2013-06-06 14:48:07 -07:00
Alex Klyubin
3dddd8cbff Ensure all active Device Admins are listed. 
Bug: 9074296
(cherry picked from commit d14258e50e)

Conflicts:
	src/com/android/settings/DeviceAdminSettings.java

Changes made to make the cherry-pick apply:
* Dropped PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS in the
  PackageManager.queryBroadcastReceivers invocation. The above
  flag was introduced in API Level 18.

Change-Id: I65596c49bedad7e39ceb1785859c129db1e3e6d7
 2013-06-06 14:08:34 -07:00