Freeman Ng
148222fd43
Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2
2011-06-09 18:20:13 -07:00
Freeman Ng
0a67cdb7e1
Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2
2011-06-09 18:20:04 -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
Freeman Ng
03708e030a
remove disabling of Back/Dismiss button for 10" mode
...
bug: 4580049
Change-Id: Ifee699a3ff42282a30c3c7c61b6e7799ac902700
2011-06-09 16:00:34 -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
Jean-Baptiste Queru
9278404512
Reconcile with gingerbread-release
...
Change-Id: I59e35b5788a1c7855a97bd4577d0c44f066c0bd1
2011-06-09 15:01:35 -07:00
Freeman Ng
9df47ed19e
add "behind" screen orientation to prevent spurious flipping
...
Calling setRequestedOrientation() before setContentView() used to
start activities off in the desired orientation even if the device
was in the opposite orientation, but now, there's a kind of lag
where they display briefly in the device orientation before
flipping to the request one. This change eliminates this effect.
bug: 4581374
Change-Id: I807b0a0a8a247ec8e51b85707afcbd9f75ed9956
2011-06-09 12:00:35 -07:00
Jeff Sharkey
fc8873a208
Merge "Checkpoint of data usage UI, graphs and lists."
2011-06-09 11:22:14 -07:00
Joe Onorato
8682f3b74b
Merge "Remove this setting that never really got finished."
2011-06-09 09:44:56 -07:00
Joe Onorato
aa0e48f939
Remove this setting that never really got finished.
...
Change-Id: Id52d7e4f735a2a289533fc9d8461f70218601764
2011-06-09 09:44:30 -07:00
Jeff Sharkey
ab2d8d3a38
Checkpoint of data usage UI, graphs and lists.
...
Chart of network usage over time, with draggable "sweep" bars for
inspection region and warning/limits. Talks with NetworkStatsService
for live data, and updates list of application usage as inspection
region changes.
Change-Id: I2a406e6776daf7d74143c07ec683c10fe711c277
2011-06-09 09:26:30 -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
Irfan Sheriff
32232fd9f2
am 4a1b8898
: am f448c32d
: Merge "Fix UI settings display issues" into honeycomb-LTE
...
* commit '4a1b8898c76a98f14bbc1690f172ec0e6171fab2':
Fix UI settings display issues
2011-06-08 17:32:04 -07:00
Jaikumar Ganesh
32c05cae80
am 3f3f390b
: am a6daa21d
: (-s ours) am 015788ca
: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
...
* commit '3f3f390b87113444c41b38b145f9a6ce0984d31d':
Import translations for cherry-picked Bluetooth changes.
2011-06-08 14:46:27 -07:00
Freeman Ng
1bc2f0c995
Merge "fix breakage caused by recent automerge"
2011-06-08 14:35:18 -07:00
Freeman Ng
4412e88e83
fix breakage caused by recent automerge
...
Change-Id: Ifb4c8428f5ebc728146da848cb0319626854c667
2011-06-08 14:34:23 -07:00
Freeman Ng
3a5764a4bf
resolved conflicts for merge of ab48c22e
to master
...
Change-Id: Ia69df4acb1eed7d728e310e4fde3f75a520377a0
2011-06-08 13:33:42 -07:00
satok
2e2eb63ff6
Merge "Use getDisplayName for the name of InputMethodSubtype"
2011-06-08 04:09:14 -07:00
satok
f0ae329740
Use getDisplayName for the name of InputMethodSubtype
...
Change-Id: I9ad7790bc36ff2950e0238cae8ce3b785bb8eaa1
2011-06-08 18:44:52 +09:00
Freeman Ng
0a24ca3b18
am 6beb924e
: am 351367bb
: am f368d4dc
: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
...
* commit '6beb924ec2b147d259cd3438f56cd88691fc57e5':
add options to lock suw wifi setup orientation into portrait or landscape
2011-06-07 18:20:19 -07:00
Jaikumar Ganesh
020e5e3ce5
am 37940170
: (-s ours) am bd34e568
: (-s ours) am eddb21a2
: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread
...
* commit '37940170d00130d55d379178413f115b3feb59c4':
Changes for API of Bluetooth Discoverability. DO NOT MERGE
2011-06-07 17:53:29 -07:00
Jaikumar Ganesh
2d15a154b8
am eeb7803a
: (-s ours) am aeca1851
: (-s ours) am c955d8ee
: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
...
* commit 'eeb7803a9545e5574ef70831285f5121fe68a564':
Allow users to change the length of BT disoverability. DO NOT MERGE
2011-06-07 17:53:26 -07:00
Gilles Debunne
94129ad9a2
am 62634b30
: am 440ca974
: am 8f1bd8a7
: Bug 4539424: confirmation dialog always shown
...
* commit '62634b309ab6c352a37c4d79d50fc78ab806304f':
Bug 4539424: confirmation dialog always shown
2011-06-07 17:17:56 -07:00
Irfan Sheriff
4a1b8898c7
am f448c32d
: Merge "Fix UI settings display issues" into honeycomb-LTE
...
* commit 'f448c32d9b4718e657fd4811f43d8df0f9d921af':
Fix UI settings display issues
2011-06-07 13:58:28 -07:00
Irfan Sheriff
f448c32d9b
Merge "Fix UI settings display issues" into honeycomb-LTE
2011-06-07 13:54:53 -07:00
Jaikumar Ganesh
3f3f390b87
am a6daa21d
: (-s ours) am 015788ca
: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
...
* commit 'a6daa21db833191a4e83aac5c488f971bff4578c':
Import translations for cherry-picked Bluetooth changes.
2011-06-07 13:17:35 -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
Irfan Sheriff
317e0aa530
Fix UI settings display issues
...
- Update access points to reflect the latest IP configuration
- Show IP list for static IP networks
Bug: 4391449
Change-Id: If8fb6fe8bdca9d6e635b1b12927c17e1661f200c
2011-06-07 12:28:26 -07:00
Freeman Ng
6beb924ec2
am 351367bb
: am f368d4dc
: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
...
* commit '351367bbd830646ddeed49227ab37442479556f9':
add options to lock suw wifi setup orientation into portrait or landscape
2011-06-07 11:51:23 -07:00
Freeman Ng
351367bbd8
am f368d4dc
: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
...
* commit 'f368d4dc525f79b09bd1e36b96d0ec5b179a1e8c':
add options to lock suw wifi setup orientation into portrait or landscape
2011-06-07 11:48:33 -07:00
Freeman Ng
f368d4dc52
Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
2011-06-07 11:46:02 -07:00
Marco Nelissen
adcbf72c80
am 079e30cd
: resolved conflicts for merge of 531bed61
to honeycomb-plus-aosp
...
* commit '079e30cd2a09388ba9ad2149a66de86be4f3a7ac':
Allow alternate string to be used for min_number
2011-06-07 11:15:26 -07:00
Gilles Debunne
19a5d81ed4
am cfe26919
: am 533b7b53
: am 90599cdf
: Merge "Used space visible in SD Card bar graph" into honeycomb-mr2
...
* commit 'cfe26919abcd3c466f40b437d084311bf025d449':
Used space visible in SD Card bar graph
2011-06-07 11:14:41 -07:00
Gilles Debunne
986897e770
am b7e7a8cb
: am 2a9dfc5c
: am 99da1a22
: Always show unmount confirmation dialog
...
* commit 'b7e7a8cb9cfa8b6fb7cd6b6d10913a00c45967f9':
Always show unmount confirmation dialog
2011-06-07 11:14:31 -07:00
Jaikumar Ganesh
37940170d0
am bd34e568
: (-s ours) am eddb21a2
: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread
...
* commit 'bd34e568bf0a986f7254b93ac3b69fe3c0459162':
Changes for API of Bluetooth Discoverability. DO NOT MERGE
2011-06-07 10:01:40 -07:00
Jaikumar Ganesh
eeb7803a95
am aeca1851
: (-s ours) am c955d8ee
: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
...
* commit 'aeca185107481f28ad248c4f811bd708be8f5bff':
Allow users to change the length of BT disoverability. DO NOT MERGE
2011-06-07 10:01:36 -07:00
Gilles Debunne
62634b309a
am 440ca974
: am 8f1bd8a7
: Bug 4539424: confirmation dialog always shown
...
* commit '440ca97483553d2656b90001beabe76d38773544':
Bug 4539424: confirmation dialog always shown
2011-06-06 18:18:31 -07:00
Gilles Debunne
440ca97483
am 8f1bd8a7
: Bug 4539424: confirmation dialog always shown
...
* commit '8f1bd8a7526edf49196430be214acb54e66a63ee':
Bug 4539424: confirmation dialog always shown
2011-06-06 17:14:03 -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
f54fec5939
add options to lock suw wifi setup orientation into portrait or landscape
...
bug: 4522454
Change-Id: I30ba3d4b5d0e4949ed6744cc9f0f68306fec9ce8
2011-06-06 16:27:55 -07:00
Eric Fischer
087db10687
Import revised translations.
...
Change-Id: I18b4dda593468e8af5823db665ee1fb1aac6a812
2011-06-06 16:08:40 -07:00
Gilles Debunne
8f1bd8a752
Bug 4539424: confirmation dialog always shown
...
Change-Id: Id1e2a52a07255e2c98cbd0e8151a82d7a2612517
2011-06-06 15:48:08 -07:00
Gilles Debunne
cfe26919ab
am 533b7b53
: am 90599cdf
: Merge "Used space visible in SD Card bar graph" into honeycomb-mr2
...
* commit '533b7b53bcff1a682f295398293878f85ec419e3':
Used space visible in SD Card bar graph
2011-06-06 15:22:53 -07:00
Gilles Debunne
b7e7a8cb9c
am 2a9dfc5c
: am 99da1a22
: Always show unmount confirmation dialog
...
* commit '2a9dfc5c0c8cd75a5eac7a75fda7e25e5ce9f27f':
Always show unmount confirmation dialog
2011-06-06 15:22:51 -07:00
Gilles Debunne
533b7b53bc
am 90599cdf
: Merge "Used space visible in SD Card bar graph" into honeycomb-mr2
...
* commit '90599cdfe8ff528b34e3578333c5eea83cf3b293':
Used space visible in SD Card bar graph
2011-06-06 15:18:37 -07:00