Eric Fischer
4993d73a0f
am c1c4aecd
: (-s ours) am b4bb7b47
: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'c1c4aecd4521e153218518d0a7383036b4e2a157':
Import revised translations. DO NOT MERGE
2011-01-18 21:55:24 -08:00
Kenny Root
851d7330bc
am 43282b19
: am 0ad922f0
: Merge "Display OBB usage as part of app details" into honeycomb
...
* commit '43282b19d14d49cdd00c3f8a054af2416d4dfe5c':
Display OBB usage as part of app details
2011-01-18 21:53:26 -08:00
Vasu Nori
15d433963d
am 99b6deb1
: am fdf7220a
: bug:3308791 appusage should include space used on /sdcard
...
* commit '99b6deb13419a330ae9ac7cf5d30c23b197c56d1':
bug:3308791 appusage should include space used on /sdcard
2011-01-18 21:51:37 -08:00
Eric Fischer
c1c4aecd45
am b4bb7b47
: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'b4bb7b470b033e654b277d77ce121e37f67deb0f':
Import revised translations. DO NOT MERGE
2011-01-18 15:17:27 -08:00
Eric Fischer
b4bb7b470b
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-18 15:14:06 -08:00
Eric Fischer
fed18746ec
Import revised translations. DO NOT MERGE
...
Change-Id: I876d6ce88a61ed0e4ce8e5d649fa12072ebe26bb
2011-01-18 15:07:02 -08:00
Kenny Root
43282b19d1
am 0ad922f0
: Merge "Display OBB usage as part of app details" into honeycomb
...
* commit '0ad922f0ceee31da2a5b242ecfbaeff74e1f0003':
Display OBB usage as part of app details
2011-01-18 14:14:14 -08:00
Kenny Root
0ad922f0ce
Merge "Display OBB usage as part of app details" into honeycomb
2011-01-18 14:12:00 -08:00
Kenny Root
a076212324
Display OBB usage as part of app details
...
Add the OBB usage to the application details for USB storage / SD card
storage usage.
Bug: 3356814
Change-Id: I06c97a73ae927316a2683ea15fd1a8b1aada31e3
2011-01-18 14:04:37 -08:00
Vasu Nori
99b6deb134
am fdf7220a
: bug:3308791 appusage should include space used on /sdcard
...
* commit 'fdf7220a03b6e823807b3786b727a9be598d01b5':
bug:3308791 appusage should include space used on /sdcard
2011-01-18 13:24:43 -08:00
Vasu Nori
fdf7220a03
bug:3308791 appusage should include space used on /sdcard
...
when "application usage" is clicked on, drop the screen into
Settings --> Applications --> Manage Applications
(all tab, sorted by size)
Change-Id: I64e11ae9a92529b5fb2781941e532951ad3d04c1
2011-01-18 13:19:13 -08:00
Daisuke Miyakawa
2373fb8fc9
am fb9ecde4
: am 18d6fe1a
: Widen default password field length in Wifi setup
...
* commit 'fb9ecde417113b3ffa075772252623c05bf6e36f':
Widen default password field length in Wifi setup
2011-01-18 10:15:37 -08:00
Daisuke Miyakawa
fb9ecde417
am 18d6fe1a
: Widen default password field length in Wifi setup
...
* commit '18d6fe1a3dddb55999801c34cd624f5f65f32d96':
Widen default password field length in Wifi setup
2011-01-18 10:14:07 -08:00
Daisuke Miyakawa
18d6fe1a3d
Widen default password field length in Wifi setup
...
Current password field doesn't show 26 characters which is
usual in some wifi devices.
Change-Id: Ifaf40f9174346451ae49f5f2ab0368326d7a9906
2011-01-18 10:06:31 -08:00
Amith Yamasani
7e8a919400
am b50a06a0
: am 2768ae05
: am f7fd4ca8
: Merge "Disable change PIN when PIN is inactive"
...
* commit 'b50a06a0e1835bfbd07dee5a49aa71637dcdd434':
Disable change PIN when PIN is inactive
2011-01-18 09:16:01 -08:00
Amith Yamasani
b50a06a0e1
am 2768ae05
: am f7fd4ca8
: Merge "Disable change PIN when PIN is inactive"
...
* commit '2768ae05bc675e08ab84499d6d0ef83231ff2b04':
Disable change PIN when PIN is inactive
2011-01-18 09:14:14 -08:00
Amith Yamasani
2768ae05bc
am f7fd4ca8
: Merge "Disable change PIN when PIN is inactive"
...
* commit 'f7fd4ca832e8ee28f0217d8096c3b401309a1f0f':
Disable change PIN when PIN is inactive
2011-01-18 09:08:41 -08:00
Amith Yamasani
f7fd4ca832
Merge "Disable change PIN when PIN is inactive"
2011-01-18 08:52:40 -08:00
Chia-chi Yeh
f17d86e2d9
am 49a70ac8
: am 12c665b2
: Merge "Remove obsolete code from SecuritySettings." into honeycomb
...
* commit '49a70ac80739bbc0a7147e80999884fcec853433':
Remove obsolete code from SecuritySettings.
2011-01-18 08:48:12 -08:00
Chung-yih Wang
2d2b23019d
am f8b8f78b
: am 80ca289b
: Merge "Fix the re-entrance of VpnSetting issue." into honeycomb
...
* commit 'f8b8f78b2130b281548ccf810b999d022aa6d252':
Fix the re-entrance of VpnSetting issue.
2011-01-18 08:48:10 -08:00
Daisuke Miyakawa
cf30f4f482
am d2cf4d3c
: am a0587d02
: Show correct title.
...
* commit 'd2cf4d3cb72b15104c736b359335f104916ad9db':
Show correct title.
2011-01-18 08:48:08 -08:00
Chia-chi Yeh
49a70ac807
am 12c665b2
: Merge "Remove obsolete code from SecuritySettings." into honeycomb
...
* commit '12c665b2b68cf6e556d498ccab10617503e8beec':
Remove obsolete code from SecuritySettings.
2011-01-18 08:26:02 -08:00
Chung-yih Wang
f8b8f78b21
am 80ca289b
: Merge "Fix the re-entrance of VpnSetting issue." into honeycomb
...
* commit '80ca289b64856f1b73038d7e07f447152ccb1e8a':
Fix the re-entrance of VpnSetting issue.
2011-01-18 08:24:32 -08:00
Daisuke Miyakawa
d2cf4d3cb7
am a0587d02
: Show correct title.
...
* commit 'a0587d028a79397b8c3c2ccf66ee1d5b2dacb625':
Show correct title.
2011-01-18 08:23:36 -08:00
Chia-chi Yeh
12c665b2b6
Merge "Remove obsolete code from SecuritySettings." into honeycomb
2011-01-18 01:19:43 -08:00
Chia-chi Yeh
7ade84bb9b
Remove obsolete code from SecuritySettings.
...
Change-Id: Ie1d7167ec8e748b86144e12bed72a3ca0dc99da1
2011-01-18 17:09:00 +08:00
Jim Miller
c378851629
am e2416380
: am 81f794df
: Merge "Fix 3296883: Hide PIN characters in ChooseLockPassword" into honeycomb
...
* commit 'e2416380132f61d5d61b3c70e18d1b668bc02866':
Fix 3296883: Hide PIN characters in ChooseLockPassword
2011-01-17 23:31:51 -08:00
Jim Miller
e241638013
am 81f794df
: Merge "Fix 3296883: Hide PIN characters in ChooseLockPassword" into honeycomb
...
* commit '81f794dfa11fa21527ea33335dc76ad488aa9bfa':
Fix 3296883: Hide PIN characters in ChooseLockPassword
2011-01-17 20:01:12 -08:00
Chung-yih Wang
80ca289b64
Merge "Fix the re-entrance of VpnSetting issue." into honeycomb
2011-01-17 18:57:41 -08:00
Daisuke Miyakawa
a0587d028a
Show correct title.
...
Bug: 3347865
Change-Id: Ide13ab46f480107c6be1ff22edf44c2ac465fbf9
2011-01-17 18:01:34 -08:00
Jim Miller
81f794dfa1
Merge "Fix 3296883: Hide PIN characters in ChooseLockPassword" into honeycomb
2011-01-17 16:36:34 -08:00
Jim Miller
3b46f49d2a
Fix 3296883: Hide PIN characters in ChooseLockPassword
...
This configures the password entry EditText to numeric password mode
to hide PIN entry characters.
Change-Id: I0e97210f6499c6557c1f0e9e861559a5f8ac1f07
2011-01-17 15:50:05 -08:00
Daisuke Miyakawa
847a4424da
am 8d372811
: am c69e1783
: Merge "Revise layout for Wifi Setup in XLarge screen" into honeycomb
...
* commit '8d372811b023e06d82b10a5229fba7b8b291cda6':
Revise layout for Wifi Setup in XLarge screen
2011-01-17 14:47:17 -08:00
Daisuke Miyakawa
72411bcab4
am 047f252c
: am 5be37c28
: Merge "Add WifiPickerActivity for PICK_WIFI_NETWORK" into honeycomb
...
* commit '047f252c7901a5a61c693755de30287c99d62773':
Add WifiPickerActivity for PICK_WIFI_NETWORK
2011-01-17 14:47:16 -08:00
Daisuke Miyakawa
8d372811b0
am c69e1783
: Merge "Revise layout for Wifi Setup in XLarge screen" into honeycomb
...
* commit 'c69e178350121bfa3a4cc7a6efc7717a9d9a8b14':
Revise layout for Wifi Setup in XLarge screen
2011-01-17 14:42:56 -08:00
Daisuke Miyakawa
047f252c79
am 5be37c28
: Merge "Add WifiPickerActivity for PICK_WIFI_NETWORK" into honeycomb
...
* commit '5be37c28f8e6a5b69a872656734ae15b7d9ae1ef':
Add WifiPickerActivity for PICK_WIFI_NETWORK
2011-01-17 14:42:06 -08:00
Daisuke Miyakawa
c69e178350
Merge "Revise layout for Wifi Setup in XLarge screen" into honeycomb
2011-01-17 14:17:10 -08:00
Daisuke Miyakawa
5be37c28f8
Merge "Add WifiPickerActivity for PICK_WIFI_NETWORK" into honeycomb
2011-01-17 13:40:33 -08:00
Daisuke Miyakawa
14cbcb7fe8
Revise layout for Wifi Setup in XLarge screen
...
- revise xml for new layout
- introduce padding View objects for resizing screen when
software keyboard is shown.
- We now don't show the detailed status of Wi-Fi module anymore
in SetupWizard flow (like "disconnected", "connecting", etc.)
- remove Forget button and relevant code.
Bug: 3347865
Change-Id: Ieab3246f06ee73af59e247b3f9f31c7570efc71f
2011-01-17 13:34:21 -08:00
Daisuke Miyakawa
79c5fd971e
Add WifiPickerActivity for PICK_WIFI_NETWORK
...
- We disable left pane when PICK_WIFI_NETWORK intent is used.
- Add ButtonBarHandler interface and let SettingsPreferenceFragment
use it instead of Settings. Note that
PreferenceActivity#hasNextButton() and
PreferenceActivity#getNextButton() are currently protected methods,
while Settings' relevants are public.
Bug: 3355247
Change-Id: Ie0fae8a1dbce9c7ce37375dff8395dc09b1cc74e
2011-01-17 13:26:45 -08:00
Fabrice Di Meglio
c4f918cafe
am 8d773beb
: am bbffd783
: Merge "Fix bug #3333939 (Add secondary Account UI needs some love)" into honeycomb
...
* commit '8d773beb21da2a216f1cd6d7652a1917aaf9d5b9':
Fix bug #3333939 (Add secondary Account UI needs some love)
2011-01-17 12:31:18 -08:00
Fabrice Di Meglio
8d773beb21
am bbffd783
: Merge "Fix bug #3333939 (Add secondary Account UI needs some love)" into honeycomb
...
* commit 'bbffd7835c819899d66da2852c46bdabd0c26c5f':
Fix bug #3333939 (Add secondary Account UI needs some love)
2011-01-17 12:29:50 -08:00
Fabrice Di Meglio
bbffd7835c
Merge "Fix bug #3333939 (Add secondary Account UI needs some love)" into honeycomb
2011-01-17 12:27:44 -08:00
Fabrice Di Meglio
100d51fbe9
Fix bug #3333939 (Add secondary Account UI needs some love)
...
- sort the feed list in lexicographic order
Change-Id: Iab998624d9cb4154b32fe8e726b462c55e726687
2011-01-17 12:26:42 -08:00
Daisuke Miyakawa
b35013fc00
am 0518b7f3
: am 3b9b6533
: Merge "Use style for buttons in setup wizard flow" into honeycomb
...
* commit '0518b7f36cf9f2bcc956b160e0292cb11932d27e':
Use style for buttons in setup wizard flow
2011-01-17 11:53:51 -08:00
Daisuke Miyakawa
0518b7f36c
am 3b9b6533
: Merge "Use style for buttons in setup wizard flow" into honeycomb
...
* commit '3b9b6533a5e50ed146ec24c084533fa35a2d1d01':
Use style for buttons in setup wizard flow
2011-01-17 11:41:31 -08:00
Daisuke Miyakawa
3b9b6533a5
Merge "Use style for buttons in setup wizard flow" into honeycomb
2011-01-17 11:34:00 -08:00
Daisuke Miyakawa
11eea9d0ee
Use style for buttons in setup wizard flow
...
- Use style
- Use minWidth instead of layout_width
Bug: 3362316
Change-Id: I16b99b234a50784e0a9bac3d3141ac9fe618f214
2011-01-17 10:28:09 -08:00
Kenny Root
d29caba298
am 552de6cb
: am 80bfb8a3
: Merge "Measure external storage application usage" into honeycomb
...
* commit '552de6cbf2816d11f4b4348231a5c64932eebfb2':
Measure external storage application usage
2011-01-17 10:17:48 -08:00
Kenny Root
552de6cbf2
am 80bfb8a3
: Merge "Measure external storage application usage" into honeycomb
...
* commit '80bfb8a3cf06e99df5ca20ea372634365da93d51':
Measure external storage application usage
2011-01-17 10:16:02 -08:00