PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,132 Commits 1 Branch 0 Tags
e147531fe8c8071e76d7b69e724b47ec2ca560ce
Commit Graph

2575 Commits

Author SHA1 Message Date
Eric Fischer
2f3b531433 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-10 15:40:45 -07:00
Amith Yamasani
7a3221bb95 Use Spinner instead of Tabs, so that a 4th entry doesn't disappear off the screen. 
This is for the 3 to 4 lists that you can switch between in the Settings->Apps
screen.

Bug: 6375122

Change-Id: I8a4e46b8aa3e06bc79edb5f65400462060fe5a29
 2012-05-10 15:18:25 -07:00
Russell Brenner
d7126a01a9 am 776cf39e: am 37088515: Change title to "Select Wi-Fi" 
* commit '776cf39e384c739bf9aeb63de17f0794a16a8955':
  Change title to "Select Wi-Fi"
 2012-05-10 14:48:43 -07:00
Eric Fischer
9a40976754 Import translations. DO NOT MERGE 
Change-Id: I6bcdcf1982414140e547d14cf4dcc586467fed2e
 2012-05-10 14:32:03 -07:00
Eric Fischer
9cc268efe5 Import translations. DO NOT MERGE 
Change-Id: Ie7165c02d6c1dff54464cdaa4121cc7364db0891
 2012-05-10 14:30:18 -07:00
Russell Brenner
37088515bf Change title to "Select Wi-Fi" 
Bug: 6471984
Change-Id: I91f9d49e61a4a6e0ee177a7a6304613324357426
 2012-05-10 09:54:16 -07:00
Russell Brenner
e680d58aa8 am b7c6380e: am 33806e72: Merge "Change title to "Wi-Fi network"" into jb-dev 
* commit 'b7c6380e3e20de063033f597c9849b6e1a62d0fe':
  Change title to "Wi-Fi network"
 2012-05-10 09:31:04 -07:00
Russell Brenner
33806e72b0 Merge "Change title to "Wi-Fi network"" into jb-dev 2012-05-09 22:48:38 -07:00
Russell Brenner
e57d992528 Change title to "Wi-Fi network" 
Bug: 6471984
Change-Id: I1b4a1b838f1751bf128978a17e1e01618cd3a26d
 2012-05-09 18:15:20 -07:00
Eric Fischer
d7eb103251 Merge "Import translations. DO NOT MERGE" 2012-05-09 16:51:14 -07:00
Eric Fischer
42149da5b9 Import translations. DO NOT MERGE 
Change-Id: I0b073fb2e580ebe5f44358df1d51743d456316d4
 2012-05-09 13:35:12 -07:00
Amith Yamasani
9435a6a400 am 05acd274: am 48c72676: Merge "Apps tabs align to title on 2-pane settings." into jb-dev 
* commit '05acd274a12615f8209b75d078fcd2b642230c72':
  Apps tabs align to title on 2-pane settings.
 2012-05-09 13:34:44 -07:00
Amith Yamasani
48c72676b3 Merge "Apps tabs align to title on 2-pane settings." into jb-dev 2012-05-09 13:30:48 -07:00
Amith Yamasani
f0b05de3e0 Apps tabs align to title on 2-pane settings. 
Pad the lists in Apps screen.
Pad the color bar to align with the list.

Bug: 6449489

Change-Id: I28c39e2aae04a1fe36c6b7dc447ae19da575edaf
 2012-05-09 12:05:17 -07:00
Daisuke Miyakawa
83d3d3bb2f am 76bd6bec: am fc363380: Merge "Introduce new "vibrate when ringing"" into jb-dev 
* commit '76bd6bec98487c393a4dd632e2bb65044fb8fef9':
  Introduce new "vibrate when ringing"
 2012-05-09 10:20:13 -07:00
Daisuke Miyakawa
fc363380c2 Merge "Introduce new "vibrate when ringing"" into jb-dev 2012-05-09 10:16:14 -07:00
Jean Chalard
9e3d4250c6 am 0d6c5c27: am 1571c0a3: Pass the shortcut to the user dictionary provider. 
* commit '0d6c5c277c2d294b9e9f3ddee359c294326f8d4b':
  Pass the shortcut to the user dictionary provider.
 2012-05-09 10:12:47 -07:00
Jean Chalard
83dd99cdd4 am 87b605a3: am 99e509cc: Rework the list interface 
* commit '87b605a3698bf6640b5fc02c22add921877b3f35':
  Rework the list interface
 2012-05-09 10:12:46 -07:00
Jean Chalard
deee65eff5 am 8dc98834: am ac499c34: Remove the useless parts in the \'add word\' dialog. 
* commit '8dc98834da7f258dd478af1b7ea001e0164fb191':
  Remove the useless parts in the 'add word' dialog.
 2012-05-09 10:12:43 -07:00
Jean Chalard
1571c0a377 Pass the shortcut to the user dictionary provider. 
Bug: 6026080

Change-Id: I87b7c8b1ae89856f393871e6d3440b43efc22a29
 2012-05-09 19:57:08 +09:00
Jean Chalard
99e509cc4c Rework the list interface 
Display the shortcut in the list, and remove the cross button.

Bug: 6026080
Change-Id: I7f594f07a84e4df3ad5b8160129d92d1a4b0fc28
 2012-05-09 18:35:12 +09:00
Dianne Hackborn
ea0565cc25 am 80859c27: am 821a4d8c: Merge "Settings to control traces." into jb-dev 
* commit '80859c2792eb537cdcbf4be50d5cc11bb9166ccf':
  Settings to control traces.
 2012-05-09 01:54:41 -07:00
Kenny Root
406ada6f06 am b9b2655f: am 267d43e6: Merge "Revert "Make verifier device id information visible"" into jb-dev 
* commit 'b9b2655f14db5acd7e28a378e948a9424a21f2f9':
  Revert "Make verifier device id information visible"
 2012-05-09 01:54:39 -07:00
Jean Chalard
819a65968f am 1d9e8f88: am be07e49a: Implement the "add word" screen according to new spec 
* commit '1d9e8f88b587770fd405a62268a4cfb8322927b6':
  Implement the "add word" screen according to new spec
 2012-05-09 01:54:34 -07:00
Jean Chalard
ac499c34fe Remove the useless parts in the 'add word' dialog. 
Bug: 6026080
Change-Id: Ic2bf6dcfc2abfe5fc07759530042299cc6a0b503
 2012-05-09 17:50:18 +09:00
Dianne Hackborn
821a4d8c34 Merge "Settings to control traces." into jb-dev 2012-05-08 18:55:30 -07:00
Daisuke Miyakawa
8b878db49d Introduce new "vibrate when ringing" 
We once removed "vibrate and ring" option with
I7168ed140266a7c754fb3d7209cf12e73041c306, while we still need
vibration setting which only affects Phone app.

This depends on I850d27629a75615647883fdaa2933f337c4824d1
See also I3a4ed2bd5e4bde05dfb97c7bb20b9284d1c6f13f for Phone app
side change.

Bug: 6036529
Change-Id: Idb0453e187f8025565d6744cd774613531e7cb8b
 2012-05-08 18:40:07 -07:00
Kenny Root
2f926bbb00 Revert "Make verifier device id information visible" 
This reverts commit 498fbe470e.

Conflicts:

	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java

Bug: 6438155
Change-Id: I3ab866d0a269e355388bb3ef41737a7d097df8f6
 2012-05-08 16:25:49 -07:00
Dianne Hackborn
34481b9cd4 Settings to control traces. 
Also some re-organization of the debug options, and check for
the case where the global debug setting is turned off but there
are some debug options turned on (in which case we just switch
to the global option being on).

Change-Id: I710e3a009e2be9c7c1a1879a853ac736abf1d8d8
 2012-05-08 15:42:53 -07:00
Jean Chalard
be07e49a92 Implement the "add word" screen according to new spec 
This is only the interface. It doesn't do anything yet, so as to
avoid a too large change.

Bug: 6026080
Change-Id: I0c7f0c09f71e01b18fcb3566a3c6c4b0f0b2a0fc
 2012-05-08 20:10:51 +09:00
Isaac Levy
e7c0d66e26 Fixed 'upto' spelling in WPS messages 
Change-Id: Ib8c627235de0455c6f239bff77e70080e3080d3d
 2012-05-07 16:41:47 -07:00
Eric Fischer
f2fa44e8cb Import translations. DO NOT MERGE 
Change-Id: I9859029eba761f90de6250f97f582d8c6b0954d5
 2012-05-07 14:02:44 -07:00
Eric Fischer
7e08807713 Import translations. DO NOT MERGE 
Change-Id: I5755d0e1a36dab74c96e27361421b0be4dc4d8b9
 2012-05-07 14:00:55 -07:00
Vikram Aggarwal
96d7eaf5f9 Merge "Center clock on phones" into jb-dev 2012-05-04 15:46:10 -07:00
Eric Fischer
b9d0f3cbb5 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-04 14:27:35 -07:00
Eric Fischer
eeb3a777a2 Import translations. DO NOT MERGE 
Change-Id: Ia8f1965490d5e34f0354724471feb2da0ee3b310
 2012-05-04 13:57:33 -07:00
Jeff Sharkey
37dfc0c1ac Merge "Avoid animation flashing and fix padding." into jb-dev 2012-05-04 12:04:18 -07:00
Jeff Sharkey
92811829b3 Avoid animation flashing and fix padding. 
Bug: 6446203
Change-Id: Icea64d5d30d894a6438af9278bc2d10b8b921d29
 2012-05-04 11:54:31 -07:00
Jeff Sharkey
d8a18ad87e Merge "Better messaging when Wi-Fi disabled." into jb-dev 2012-05-04 11:15:29 -07:00
Jeff Sharkey
37c222fdf0 Better messaging when Wi-Fi disabled. 
Bug: 6443166
Change-Id: I262e559e5c209d3f1959d5d2ab9a2aebb8180c59
 2012-05-04 10:26:58 -07:00
Vikram Aggarwal
69721802ee Center clock on phones 
Fix b/5579000

Change-Id: I80431999939fbecdf693649d58ad2031c03208b0
 2012-05-04 10:20:47 -07:00
Eric Fischer
0cdc3a1e16 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-03 16:01:16 -07:00
Eric Fischer
513fc4f973 Import translations. DO NOT MERGE 
Change-Id: Ifb5adb2d887e6264aca0e664a119e9421739b2e5
 2012-05-03 15:55:12 -07:00
Vikram Aggarwal
c62d321e8d UI fixes for tablets 
1. Center the clock on Xoom and large tablets. Fix b/5579000

2. Correctly remove the emergency call button if the device (*cough*
   Nakasi *cough*) does not have telephone capability.

Change-Id: Ib7552dc35392a1b9d6c0381c6167949e2b163ddc
 2012-05-03 12:48:48 -07:00
Vikram Aggarwal
277cf8cc5b Merge "Include the clock in landscape on Xoom" into jb-dev 2012-05-02 16:19:10 -07:00
Vikram Aggarwal
c85f040829 Include the clock in landscape on Xoom 
1. R.id.status was defined twice and was used inconsistently in code:
   (visibility set to enabled, but only on portrait...) This code removes
   the bad view.

2. The TextView date was never used, either by another layout or by
   code. Deleting this view too.

3. Including a standard status layout on smallest-width-600px, which includes
   a clock and a status message on Xoom.

Fix b/6061076

Change-Id: Ibb492e89f6a4a38ac6a22398ec9c14bbe3fb7e3d
 2012-05-02 15:23:37 -07:00
Eric Fischer
4b57e6e451 Import translations. DO NOT MERGE 
Change-Id: Ie7a0ad55aa358abded6d5fe7d9d75b34dfc1c450
 2012-05-02 14:11:40 -07:00
Eric Fischer
7706a2a143 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-01 13:49:40 -07:00
Eric Fischer
0f0e51baa9 Import translations. DO NOT MERGE 
Change-Id: Ie838fa4a75d736bb941cf0a626f0d1d017562dfa
 2012-05-01 13:32:21 -07:00
Jean-Baptiste Queru
299ed15213 Merge "Wifi: Update message when scan result is empty" 2012-05-01 12:40:13 -07:00