Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,864 Commits 1 Branch 0 Tags
87c04ba668ed856ec61326e90c1fade980d4e893
Commit Graph

1550 Commits

Author SHA1 Message Date
Jaikumar Ganesh
87c04ba668 am f3670df2: am 2c85966d: Merge "New strings for Bluetooth" into gingerbread 
* commit 'f3670df2ca8e521179907978c7009cba791df7c4':
  New strings for Bluetooth
 2011-06-20 15:58:25 -07:00
Jaikumar Ganesh
f3670df2ca am 2c85966d: Merge "New strings for Bluetooth" into gingerbread 
* commit '2c85966dd881917b426eefd9643adedf6b0d4ffc':
  New strings for Bluetooth
 2011-06-20 15:54:16 -07:00
Jaikumar Ganesh
2c85966dd8 Merge "New strings for Bluetooth" into gingerbread 2011-06-20 15:29:43 -07:00
Jaikumar Ganesh
0f44329c74 New strings for Bluetooth 
This is for the user dialog for incoming BT requests.

Change-Id: Ifa8f8e9e00861c65cf1d2f0520d072935b845785
 2011-06-20 15:10:53 -07:00
Eric Fischer
3c75fbc556 am 5bdc3e91: Import revised Croatian translations. 
* commit '5bdc3e9139a7b37b97a56554cc9a89abc196b437':
  Import revised Croatian translations.
 2011-06-16 15:48:43 -07:00
Eric Fischer
957bed6e52 am 3bf263c9: am b5c4437f: Import revised translations. DO NOT MERGE 
* commit '3bf263c97e23eeec199bd56ef520fba17a1e3917':
  Import revised translations.  DO NOT MERGE
 2011-06-16 14:41:45 -07:00
Eric Fischer
3bf263c97e am b5c4437f: Import revised translations. DO NOT MERGE 
* commit 'b5c4437f336c3e79d34428de0b1b7ce22785fb29':
  Import revised translations.  DO NOT MERGE
 2011-06-16 14:29:39 -07:00
Eric Fischer
b5c4437f33 Import revised translations. DO NOT MERGE 
Change-Id: I4fa5f4000565d487a86e858cb3520555b2147dd2
 2011-06-15 15:13:19 -07:00
Eric Fischer
5bdc3e9139 Import revised Croatian translations. 
Change-Id: Ib0067e98d8e3ce35d5e2868e61a8ad3680c62f1e
 2011-06-15 12:09:02 -07:00
Dianne Hackborn
8d7ecabc68 am 60d8b3f8: am 55c86911: Mark access to private resources now that aapt enforces this. 
* commit '60d8b3f875ae5630330feacc450169223e605166':
  Mark access to private resources now that aapt enforces this.
 2011-06-09 16:09:00 -07:00
Dianne Hackborn
60d8b3f875 am 55c86911: Mark access to private resources now that aapt enforces this. 
* commit '55c869119aabc27d3b6c6b4aab0e69faf57f1250':
  Mark access to private resources now that aapt enforces this.
 2011-06-09 16:04:44 -07:00
Dianne Hackborn
55c869119a Mark access to private resources now that aapt enforces this. 
Change-Id: Ifea6854d8295294011b5253640198a10e1b5c1e1
 2011-06-09 15:33:56 -07:00
Justin Ho
9209d20adc am ea8f103f: am 7825cb29: Fixing remaining SetupWizard backgrounds for Flyer Bug: 4523403 
* commit 'ea8f103f8310c869f84d8ad48a167e8e0b63923b':
  Fixing remaining SetupWizard backgrounds for Flyer Bug: 4523403
 2011-06-08 23:33:05 -07:00
Justin Ho
ea8f103f83 am 7825cb29: Fixing remaining SetupWizard backgrounds for Flyer Bug: 4523403 
* commit '7825cb295c5f08f84282b4bbaeb03da0a536a826':
  Fixing remaining SetupWizard backgrounds for Flyer Bug: 4523403
 2011-06-08 23:30:25 -07:00
Justin Ho
7825cb295c Fixing remaining SetupWizard backgrounds for Flyer 
Bug: 4523403

Change-Id: I568747b5b856f0418caaf81664dcfa5b8fdb2481
 2011-06-08 23:13:05 -07:00
Freeman Ng
ab48c22e7d am c47e9a1d: am 0fd7736b: Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2 
* commit 'c47e9a1d65dad04f778973b2898acf96c48b8914':
  use prefs-style layout for setup wizard date/time settings on non-xlarge screens
 2011-06-07 13:16:13 -07:00
Freeman Ng
c47e9a1d65 am 0fd7736b: Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2 
* commit '0fd7736b7153c1a304d7c6098ecf1223052f56d5':
  use prefs-style layout for setup wizard date/time settings on non-xlarge screens
 2011-06-07 12:58:06 -07:00
Freeman Ng
0fd7736b71 Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2 2011-06-07 12:53:41 -07:00
Marco Nelissen
079e30cd2a resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp 
Change-Id: I28154c6feb563712eeda3e1176d62c7d2a28eff8
 2011-06-06 16:29:34 -07:00
Freeman Ng
7f6f6e18c9 use prefs-style layout for setup wizard date/time settings on non-xlarge screens 
Adjusted the screen size test to fall back to phone version of
DateTimeSettingsSetupWizard on large screens.

I made the following changes from how the phone version works:

1. Some layout changes. (Tablet look, bigger margins.)
2. Use zone picker to select time zone.
3. Added isFirstRun boolean extra to hide the pref fields
we don't need to see from setup wizard

Furthermore, I made the following fixes to the existing phone flow
(which had probably never yet been tried on a phone):

1. Added conditionals around access to some variables that only
exist in the xlarge layout.
2. Implemented PreferenceFragment.OnPreferenceStartFragmentCallback
in DateTimeSettingsSetupWizard in order to catch the user tapping
on the timezone preference and show the time zone picker popup.
(Note: for phones in ICS, we might want to launch the zone picker
preferences style, like it would have been had this been a
PreferenceActivity. Or maybe we should just create a separate
DateTimeSettingsSetupWizardPhone activity that subclasses
PreferencesActivity and doesn't need to play this trick.)

Change-Id: Ib5774a005c9f44d730d86c13746d91eb712141cc
 2011-06-06 12:40:28 -07:00
Jeff Brown
bb8fc4a4ea am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2 
* commit '9fc039e7bcea7f1845a51fcb70d608663ceec227':
  Add a preference panel for mouse speed.
 2011-06-02 17:27:39 -07:00
Jeff Brown
9fc039e7bc Merge "Add a preference panel for mouse speed." into honeycomb-mr2 2011-06-02 17:26:13 -07:00
Ben Komalo
1e43e694ae am 57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2 
* commit '57b17f50436e4760ad0466aadaafe2599abce442':
  Fix cryptkeeper UI for 7" tablets.
 2011-06-02 17:24:42 -07:00
Jeff Brown
d82487b0ff Add a preference panel for mouse speed. 
Bug: 4124987

Change-Id: Icf166810ebbd3745f0065331c140a074b58a363c
 2011-06-02 15:13:27 -07:00
Ben Komalo
a1d57709c2 Fix cryptkeeper UI for 7" tablets. 
- fixes pw entry/keyboard overlap on landscape
- fixes progress screen to be centered

Bug: 4478944
Change-Id: I411ad3507f42029022815ec001d0d8e5464ac0a1
 2011-06-02 13:59:03 -07:00
Amith Yamasani
672ad8d66f am 8ac84564: Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2 
* commit '8ac8456491e1409a071c7cf4e164440aeec7c4dd':
  Move assets to default location, instead of xlarge only.
 2011-06-01 18:37:38 -07:00
Amith Yamasani
8ac8456491 Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2 2011-06-01 15:43:42 -07:00
Amith Yamasani
12f55852c0 Move assets to default location, instead of xlarge only. 
Bug: 4517184
Change-Id: I3d1e0c87f9c48470166dd5bfb34c02efa5854d68
 2011-06-01 15:29:55 -07:00
Amith Yamasani
9ef2713f28 am 1f7014a2: Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2 
* commit '1f7014a25aad4cd3fe5e6f34eb30d936f4da2fd4':
  Reduce padding to the left of progress category to match framework changes.
 2011-05-27 14:51:28 -07:00
Amith Yamasani
1f7014a25a Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2 2011-05-27 14:49:21 -07:00
Amith Yamasani
e7da064e4f Reduce padding to the left of progress category to match framework changes. 
Otherwise the WIFI/BT device names don't align with the header.

Change-Id: Ibd10cb7bb38c80a90ef895e2bdb1083b833a2824
 2011-05-27 14:31:28 -07:00
Jaikumar Ganesh
a6daa21db8 am 015788ca: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread 
* commit '015788ca9228312dfca30785b1801f33a3a32e9a':
  Import translations for cherry-picked Bluetooth changes.
 2011-05-27 13:47:08 -07:00
Jaikumar Ganesh
bd34e568bf am eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread 
* commit 'eddb21a2ebd39900893da63749a00570f37e5038':
  Changes for API of Bluetooth Discoverability. DO NOT MERGE
 2011-05-27 13:47:01 -07:00
Jaikumar Ganesh
aeca185107 am c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread 
* commit 'c955d8ee1d2b134f8c41989b545b7b3ed830d058':
  Allow users to change the length of BT disoverability. DO NOT MERGE
 2011-05-27 13:46:59 -07:00
Jaikumar Ganesh
015788ca92 Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread 2011-05-27 13:28:57 -07:00
Jaikumar Ganesh
eddb21a2eb Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread 2011-05-27 13:28:49 -07:00
Jaikumar Ganesh
c955d8ee1d Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread 2011-05-27 13:28:41 -07:00
Eric Fischer
afe7b0466a Import translations for cherry-picked Bluetooth changes. 
Change-Id: I03caaf58d9fd357801c05ae99b6131df992e7bdf
 2011-05-27 12:46:07 -07:00
Jaikumar Ganesh
32c7a774f5 Changes for API of Bluetooth Discoverability. DO NOT MERGE 
1. Apps can ask for any time between 0 and 3600 secs
2. O implies always discoverable
3. Any invalid values will default to the default - 120 secs.
A dialog is shown by the system to the users to accept the change
in discoverability values.

Change-Id: I34ebd907656a87508b0f0b1a4bce78134edcaebf
 2011-05-27 10:32:18 -07:00
Chris Wren
cdd9d033b0 Allow users to change the length of BT disoverability. DO NOT MERGE 
It can set to be two minues, five minutes, an hour, or forever discoverable.
The default is 120 secs.
This addresses the internal bug 2413429:
	http://b/issue?id=2413429
and external issue 6348:
	http://code.google.com/p/android/issues/detail?id=6348

Original Author: Chris Wren <crwen@google.com>
Modifications done by: Jaikumar Ganesh<jaikumar@google.com>

Change-Id: Ie12e56ac41aa01a161d263c7525b6e021d4eeb1f
 2011-05-27 10:27:14 -07:00
sy310.choi
531bed610c am 95364e4a: Allow alternate string to be used for min_number 
* commit '95364e4af3cb09bff58baab6fa4a6a2218e7fc94':
  Allow alternate string to be used for min_number
 2011-05-26 13:47:20 -07:00
Eric Fischer
c3786952cc am beee8290: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'beee8290a23794e0c7d89ce8e6e682564e4d5a52':
  Import revised translations.  DO NOT MERGE
 2011-05-26 13:46:20 -07:00
Eric Fischer
beee8290a2 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-05-26 11:37:50 -07:00
Eric Fischer
6514fd7398 Import revised translations. DO NOT MERGE 
Change-Id: I4728d6b761331990b1424fb9a676275648a99bf4
 2011-05-26 11:25:33 -07:00
sy310.choi
95364e4af3 Allow alternate string to be used for min_number 
"MSID" can be shown instead of "MIN" if config_msid_enable
is set to true.

Change-Id: I6d072a5db9a5b46b17a57257221e109ba9a86698
 2011-05-26 10:45:07 -07:00
Dianne Hackborn
b4799fc9ee am aef746c4: Implement new manage apps UI for compat mode. 
* commit 'aef746c45f14c8a170dba48c4b55f93cae0e24e4':
  Implement new manage apps UI for compat mode.
 2011-05-26 10:02:22 -07:00
Freeman Ng
6356b17a53 am d671182d: Merge "make setup wizard\'s wifi and datetime settings look good for 7"" into honeycomb-mr2 
* commit 'd671182d88a193bee25d82a1941a57a84ed0fdc4':
  make setup wizard's wifi and datetime settings look good for 7"
 2011-05-26 10:02:20 -07:00
Dianne Hackborn
aef746c45f Implement new manage apps UI for compat mode. 
Change-Id: Ia8db7f534b7294fbbb34e0acdedab3a96cea59e9
 2011-05-26 01:06:11 -07:00
Freeman Ng
d671182d88 Merge "make setup wizard's wifi and datetime settings look good for 7"" into honeycomb-mr2 2011-05-25 21:13:03 -07:00
Freeman Ng
edb03bf537 make setup wizard's wifi and datetime settings look good for 7" 
Note: this entailed locking datetime settings not into portrait
like everything else in the setup process, but landscape, because
the existing xlarge layout wasn't rearranging itself into a portrait
alignment very well. I can give it another try later if I can have
some help from UE.

Change-Id: Ia8ce8e8292ed768bd117beedf3d94a287e658f4b
 2011-05-25 19:06:21 -07:00