drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,500 Commits 1 Branch 0 Tags
Commit Graph

21437 Commits

Author SHA1 Message Date
Robert Greenwalt
241b65aca9 am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE 
* commit '5f3505121b761dbd3bba62d1603fbab49de139b9':
  Reset connections AFTER we take down the network.
 2011-06-16 12:42:15 -07:00
John Wang
03cbb58e24 am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE 
* commit 'ff42c04d15e000f6295e796e154cc60c54aa078b':
  Support SIM permanently disabled state.
 2011-06-16 12:34:34 -07:00
Robert Greenwalt
5f3505121b Merge "Reset connections AFTER we take down the network." into honeycomb-LTE 2011-06-16 11:34:03 -07:00
Robert Greenwalt
ec896c6a86 Reset connections AFTER we take down the network. 
If you do it before you have a race condition and some apps will
manage to reconnect on the dieing network before it goes and then
get no notification when it goes.

bug: 3408025
Change-Id: I5386ff313c759b3f687bc38731454ab43dbe76b8
 2011-06-16 11:26:54 -07:00
John Wang
ff42c04d15 Merge "Support SIM permanently disabled state." into honeycomb-LTE 2011-06-16 11:22:53 -07:00
Dianne Hackborn
f28f1de391 am 413b53b5: am 70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2 
* commit '413b53b57d62b60e98cfe5b9359551315e7cb3a7':
  We must keep up with the Joneses.
 2011-06-15 17:12:45 -07:00
Dianne Hackborn
413b53b57d am 70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2 
* commit '70921d615496c5be8a19cbd1454378bb7d0201f3':
  We must keep up with the Joneses.
 2011-06-15 17:10:33 -07:00
Dianne Hackborn
70921d6154 Merge "We must keep up with the Joneses." into honeycomb-mr2 2011-06-15 17:08:04 -07:00
Eric Fischer
a5608e3a67 am c0e84cf3: am 5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'c0e84cf3210fc6b5929d024fafbe75f08167c44e':
  Import revised translations.  DO NOT MERGE
 2011-06-15 16:47:08 -07:00
Eric Fischer
c0e84cf321 am 5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit '5e451faa0c22e943fb76d812f699d51fa11c5495':
  Import revised translations.  DO NOT MERGE
 2011-06-15 16:41:44 -07:00
Eric Fischer
5e451faa0c Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-06-15 16:38:43 -07:00
Dianne Hackborn
0d4b9c993d We must keep up with the Joneses. 
Change-Id: Ifa2ab0167c09ba18b24c8b6c618db807e17519f5
 2011-06-15 15:09:54 -07:00
Eric Fischer
dbad552d17 Import revised translations. DO NOT MERGE 
Change-Id: Iaff03724a335f856f7d28b1bc2c219f4208c4151
 2011-06-15 15:06:18 -07:00
Irfan Sheriff
1195487228 am 5af3405f: am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2 
* commit '5af3405f0d24c853bd10eb239c081e31972d3e1d':
  Fix lease duration handling
 2011-06-15 14:07:54 -07:00
Irfan Sheriff
5af3405f0d am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2 
* commit 'ecda5461603b6de77beb045dfdf82dad7ae48d61':
  Fix lease duration handling
 2011-06-15 14:04:23 -07:00
Irfan Sheriff
56878760c3 Fix lease duration handling 
Convert lease time in seconds to long before alarm
set up and add sanity check

Change-Id: I99524c97d9a643ffa8234d016d0e819a284977a1
 2011-06-15 12:58:18 -07:00
Marco Nelissen
9c3c3004c4 am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp 
* commit 'd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0':
  Ignore duplicate WAP push PDU source/destination port if configured
 2011-06-15 12:20:57 -07:00
Marco Nelissen
d8f9a83cab resolved conflicts for merge of d027329c to gingerbread-plus-aosp 
Change-Id: I169c415bf998b9935ab36812511573db05717b91
 2011-06-15 08:58:38 -07:00
Dianne Hackborn
27bad6f33b am baa89d38: am f930232f: Fix a major problem in fragment lifecycle. 
* commit 'baa89d3839f70bd31e5219c636ac24a4cc29928d':
  Fix a major problem in fragment lifecycle.
 2011-06-14 20:57:48 -07:00
Dianne Hackborn
baa89d3839 am f930232f: Fix a major problem in fragment lifecycle. 
* commit 'f930232fd1c8d301d91853c8fe5dca43979ac807':
  Fix a major problem in fragment lifecycle.
 2011-06-14 20:54:40 -07:00
Dianne Hackborn
f930232fd1 Fix a major problem in fragment lifecycle. 
When animating away a fragment, we were not putting it through
the last part of its lifecycle (onDestroy() etc).

Also, retained fragments that have a target were broken.  Oops.

Change-Id: I5a669b77a2f24b581cde2a0959acf62edb65e326
 2011-06-14 20:47:44 -07:00
John Wang
b0b24b3df5 Support SIM permanently disabled state. 
SIM card can get permanently disabled due to too many
PUK retries. The PERM_BLOCKED pin state of SIM application
represents this state.

This change decodes permanent disabled state and broadcasts it
via ICC_ABSENT intent with PERM_DISABLED reason. It also update
the lockscreen to show the prompt message.

bug:4392059
Change-Id: I5e60dd65f48f42aa2e54db4cdebf803d6e666b99
 2011-06-14 16:50:03 -07:00
Amith Yamasani
2bcd9c6e7b am eb5e633a: am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2 
* commit 'eb5e633a2488456874f829263fa6cb96588d25aa':
  Stability fixes for PreferenceFragments.
 2011-06-14 15:42:36 -07:00
Amith Yamasani
eb5e633a24 am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2 
* commit '608a200d2ed19540bb356d54e96f72c8c6b089b1':
  Stability fixes for PreferenceFragments.
 2011-06-14 15:38:31 -07:00
Amith Yamasani
608a200d2e Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2 2011-06-14 15:35:13 -07:00
Dianne Hackborn
e95c07bd8a am 7c7f8e18: am 0a8a2324: Merge "Fix issue #4603422: Compatibility mode button doesn\'t always update" into honeycomb-mr2 
* commit '7c7f8e18dee8b582ec8e30a1412903ceec2ef5f5':
  Fix issue #4603422: Compatibility mode button doesn't always update
 2011-06-14 15:22:12 -07:00
Dianne Hackborn
7c7f8e18de am 0a8a2324: Merge "Fix issue #4603422: Compatibility mode button doesn\'t always update" into honeycomb-mr2 
* commit '0a8a2324239d7604e2a68349585aa67b59b25f4c':
  Fix issue #4603422: Compatibility mode button doesn't always update
 2011-06-14 15:14:34 -07:00
Amith Yamasani
c56fc753e2 Stability fixes for PreferenceFragments. 
Unregister the click listener as early as possible, so that clicks
don't get delivered after the activity is detached.

Bug: 4599586

This should also fix: 4603030, 4601105, 4598715, 4598712.

Change-Id: I7bcff719bed14ea61b482bd6d29ae1fa5e322e41
 2011-06-14 15:07:49 -07:00
Dianne Hackborn
7d04932ef5 Fix issue #4603422: Compatibility mode button doesn't always update 
We now tell the system bar every time the top activity has changed for
it to re-evaluate its UI state.

Also fix issue #: 4607102 Low rider notifications.  It turns out this
was due to the change in the dialog asset; the notification UI was relying
on this having a lot of padding to make it sit above the status bar.
Now we have an explicitly mechanism to set how much it overlaps (or doesn't)
the status bar.

Change-Id: Iab5ebd86e620ff4fc4cd77206e18af962ec2830e
 2011-06-14 15:05:16 -07:00
Dianne Hackborn
77fc8b8066 am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 
* commit '6c0533f994e7991b3bd60cab48362e8e2e6d86f0':
  Add new landscape and portrait orientation features.
 2011-06-14 11:40:06 -07:00
Dianne Hackborn
6c0533f994 am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 
* commit 'c5193c6285d7094fb86dcb5cd56f44a3788af7c2':
  Add new landscape and portrait orientation features.
 2011-06-14 11:36:05 -07:00
Dianne Hackborn
e289bff0ec Add new landscape and portrait orientation features. 
Updates aapt to know about these.  Also updates aapt badging to:

- No longer crash due to the change to how we match unspecified
configuration resources.
- Report the new "smallest screen" supported screen configs.
- Infer old screen size buckets based on new smallest width attrs.
- Report all of the different labels and icons in an app.

Change-Id: I7376042b817391bd070f549cebbc7f03be4635c8
 2011-06-14 11:23:52 -07:00
John Wang
aabe5f4684 am 49572479: Update sim missing message in lock screen. 
* commit '49572479a9cb479f2b323f011c1a9f8142ec1a46':
  Update sim missing message in lock screen.
 2011-06-14 10:05:40 -07:00
John Wang
49572479a9 Update sim missing message in lock screen. 
Update SIM missing message to include SIM corrupted situation.

bug:4392059
Change-Id: Icf2f8d801a2e2761a309442209118a6a71a4c633
 2011-06-13 16:17:39 -07:00
Derek Sollenberger
f11c52d246 Updates resulting from the Skia merge (revision 1327) 
Change-Id: I1d2cecbad6c30e6ebc9579093404742f17e14e84
 2011-06-13 15:07:30 -07:00
Dan Morrill
74e646cab9 Fix merge conflict for 'c2e1e329'. 
Conflicts:
	core/res/res/values/config.xml
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java

Change-Id: I5898fe2cbfb3a4bdcb28c27adb51d2aa93138f99
 2011-06-13 11:59:38 -07:00
Dianne Hackborn
ed1a9c778c am fc441bff: am fd63814a: Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2 
* commit 'fc441bfff9eb68be08eb922ea05c78c5d6fba27a':
  Fix some problems with moving in and out of detached state.
 2011-06-10 18:42:12 -07:00
Dianne Hackborn
fc441bfff9 am fd63814a: Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2 
* commit 'fd63814abe8e81d5e1e0eb75b5a5a18034e9b4c6':
  Fix some problems with moving in and out of detached state.
 2011-06-10 18:39:48 -07:00
Dianne Hackborn
fd63814abe Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2 2011-06-10 18:37:22 -07:00
Dianne Hackborn
afc4b283fd Fix some problems with moving in and out of detached state. 
Loaders were not being re-initialized correctly when coming back
(this would also impact the back stack).  The ListView also wasn't
working correctly, and there were also problems with simply
re-using a Fragment instance after it had been removed.

Change-Id: I534b091ae09c0ef7ffffe9d68049e6840e8926b3
 2011-06-10 18:34:54 -07:00
Jim Miller
8daefb9c63 Fix layout issue on table when device thinks there's a SIM. 
bug:4411799
Change-Id: I9d9ef036d4cf424ed760e0db157bb1f020b7c678
 2011-06-10 15:57:09 -07:00
Teng-Hui Zhu
5a9bbc34cb am b5141a9f: am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2 
* commit 'b5141a9fc7e841167c3e07f8797d8aef9a787d25':
  fix one NPE when webChromeClient don't have progress view support
 2011-06-10 14:27:13 -07:00
Teng-Hui Zhu
b5141a9fc7 am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2 
* commit '90bdb69bf95e5865547a55260dd61744b0bcc911':
  fix one NPE when webChromeClient don't have progress view support
 2011-06-10 14:22:52 -07:00
Teng-Hui Zhu
90bdb69bf9 Merge "fix one NPE when webChromeClient don't have progress view support" into honeycomb-mr2 2011-06-10 14:19:22 -07:00
Soojung Shin
d027329cd6 Ignore duplicate WAP push PDU source/destination port if configured 
Some carriers duplicate the OMADM wap push PDU source/destination
port.

e.g. MSGTYPE-TotalSegments-CurrentSegment
     -SourcePortDestPort-SourcePortDestPort-OMADM PDU

So the client has to ignore the duplicate source/destination
port.

Change-Id: I83df6e8e7d2e2e4275036a1b574247f9f40c5cf4
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
 2011-06-10 13:48:36 -07:00
Teng-Hui Zhu
2302fe5226 fix one NPE when webChromeClient don't have progress view support 
Change-Id: I5a88365f216d5dea38ab2eac9562d26b00a2d617
 2011-06-10 10:56:33 -07:00
Dianne Hackborn
0a63ccc63b am 5624b793: am 2bb2d48f: Commit final (maybe) MR 2 API. 
* commit '5624b793cb791621a586931d9f02eefdf6cfc7c8':
  Commit final (maybe) MR 2 API.
 2011-06-10 07:46:51 -07:00
Dianne Hackborn
5624b793cb am 2bb2d48f: Commit final (maybe) MR 2 API. 
* commit '2bb2d48f9ca1726b8de957ec7ea321c767409c12':
  Commit final (maybe) MR 2 API.
 2011-06-09 19:26:25 -07:00
Dianne Hackborn
2bb2d48f9c Commit final (maybe) MR 2 API. 
Change-Id: I42f72819a29d4ac7902b7be5af0b5d353d790eae
 2011-06-09 19:22:05 -07:00
Dianne Hackborn
f51ded0f8f am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
  Enforce public resource restriction on bag parents.
 2011-06-09 16:06:07 -07:00