3423 Commits

Author SHA1 Message Date
John Reck
179cfcf654 Merge "Inline SeekBarPreference" 2011-06-16 13:21:52 -07:00
John Wang
1766974b02 am 03cbb58e: am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE
* commit '03cbb58e2418dc22ae18a8648404382da4ee46e8':
  Support SIM permanently disabled state.
2011-06-16 12:49:17 -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
John Reck
014fea2a66 Inline SeekBarPreference
Dialog-based SeekBarPreference renamed to SeekBarDialogPreference
 New inline SeekBarPreference added

Change-Id: I7a5d8f7aa554c4af4086a9bcc74cf07879c8523c
2011-06-16 12:34:02 -07:00
John Wang
ff42c04d15 Merge "Support SIM permanently disabled state." into honeycomb-LTE 2011-06-16 11:22:53 -07:00
Dave Santoro
7ff1c2aefd Merge "Added profile string descriptions and limits." 2011-06-15 16:56:45 -07:00
Michael Jurka
d727cf7e3f Merge "Port recent apps from tablet to phone" 2011-06-15 16:51:22 -07:00
Michael Jurka
3b1fc47d00 Port recent apps from tablet to phone
- wire up to long press on home
- remove unused recents activity
- remove duplicate recents resources in -large directories (using -sw600dp instead)
- fix issue with zoom/scale translation when recents was brought up

Change-Id: I45538ccaff49b46ac3659c4828f9e2b0cd075241
2011-06-15 16:50:04 -07:00
Dave Santoro
7fb888ac89 Added profile string descriptions and limits.
Bug: 4584896
Change-Id: I0b73022a179a850c047a17ea03117f54931a748a
2011-06-15 16:47:26 -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
dbad552d17 Import revised translations. DO NOT MERGE
Change-Id: Iaff03724a335f856f7d28b1bc2c219f4208c4151
2011-06-15 15:06:18 -07:00
Marco Nelissen
181aafd75c am 9c3c3004: am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp
* commit '9c3c3004c4206da3f2579e863ce89a2f99269dd6':
  Ignore duplicate WAP push PDU source/destination port if configured
2011-06-15 13:44:56 -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
Chia-chi Yeh
f8905fd13d VPN: change some strings in VPN notifications.
Also remove a small piece of dead code.

Change-Id: Idd10f3d72a92228951278bf360d08ba9bede02d2
2011-06-15 11:06:52 -07:00
Fabrice Di Meglio
0acb8d3011 Merge "Fix Gravity start/end" 2011-06-15 10:34:09 -07:00
Elliott Hughes
c905dd3e92 Merge "de_DE "Mai" isn't an abbreviation." 2011-06-15 10:24:29 -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
Jeff Sharkey
497e4437af Data usage warning and limit notifications.
Watch for network statistics to cross NetworkPolicy warning or limit,
and show notifications to user as needed.  Currently checks during
any statistics update, but will eventually move to event registration
through netd when kernel supports.

Fixed accounting bug in getSummaryForNetwork().  Only apply UID policy
to applications; applying to system processes could break critical
services like RIL.

Change-Id: Iac0f20e910e205f3cbc54ec96395ff268b1aa379
2011-06-14 22:43:08 -07:00
Fabrice Di Meglio
67f8de04fc Fix Gravity start/end
- fix missing attribute value change
- update BiDiTest app

Change-Id: I0bb8a1ebf0b6097b7b8d488580fea6e882202e23
2011-06-14 17:08:32 -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
John Wang
7c1650d180 am aabe5f46: am 49572479: Update sim missing message in lock screen.
* commit 'aabe5f46846a45163be874dca2d19910ce38c232':
  Update sim missing message in lock screen.
2011-06-14 10:17:51 -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
Mike J. Chen
8068cb8e21 Merge "Handle always present wired ethernet interfaces at boot." 2011-06-14 09:53:23 -07:00
Jim Miller
70832a3d77 Some tuning for MultiWaveView animations and assets:
- allow individual chevrons to be specified for (top, bottom, left, right).
- move ring to pressed position (currently w/o animation)
- add top/bottom chevron handling and refactor code accordingly.
- constrain drag handle to the ring

Change-Id: I859b2d03d8f0397c68b87a8ee15df20d55c9552c
2011-06-13 23:57:31 -07:00
Mike J. Chen
c96a667162 Handle always present wired ethernet interfaces at boot.
Devices with always present wired ethernet interfaces (as opposed
to usb ethernet dongles) don't have the interface added and removed.
Instead, it is present already at boot time.  Change EthernetDataTracker
to support the already existing at boot time case.

Change-Id: I7b8e938f6b07aabd14f00ace55b35b7a05ea5a38
Signed-off-by: Mike J. Chen <mjchen@google.com>
2011-06-13 18:37:11 -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
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
Jeff Brown
854bbfd961 Fix LockScreen regression.
Seems to be an incorrect layout change.  The original change
intended to modify the ID of the WaveView but instead a TextView
was blasted away.

Change-Id: I9039179a16c8bf7b322d8008b9c7e0e5ab47a629
2011-06-10 23:18:22 -07:00
Jeff Sharkey
21c9c45e5c Interface-level network policy, persist policies.
Define NetworkPolicy as cycle-reset day and warning/limit values, and
set/get through NetworkPolicyManager.  Watch ConnectivityManager for
network connection events, and apply quota rules based on matching
interfaces.  Policy service matches based on strong identity to support
IMSI-specific policy values.

Calculates remaining quota based on current stats recorded since the
last reset cycle day.  Tests to verify edge cases around February.

Persist network and UID policies in XML, and restore on boot.

Change-Id: Id40ba7d6eed6094fbd5e18e6331286c606880d80
2011-06-10 19:35:20 -07:00
Jim Miller
b505074e82 Add new MultiWaveView widget and integrate it into LockScreen
This adds a new multi-target widget to the framework and integrates
it into LockScreen.

Now with updated assets.

Change-Id: Ib41595b9e80a7be6d647f44c803a77f9e5bfeca9
2011-06-10 18:02:29 -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
Dianne Hackborn
f7f413e118 am 0a63ccc6: am 5624b793: am 2bb2d48f: Commit final (maybe) MR 2 API.
* commit '0a63ccc63b833e8034cc941bf55a6e2003037309':
  Commit final (maybe) MR 2 API.
2011-06-10 14:08:49 -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
Dianne Hackborn
32ed8448d2 Merge "resolved conflicts for merge of f51ded0f to master" 2011-06-10 12:47:12 -07:00
Dianne Hackborn
6b592723c9 resolved conflicts for merge of f51ded0f to master
Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2
2011-06-10 12:45:36 -07:00
Adam Powell
679dd99cdc Merge "Fix some measurement/sizing with split action bars" 2011-06-10 11:59:03 -07:00
Adam Powell
cc2e5bea7d Fix some measurement/sizing with split action bars
Change-Id: I5fded370d214eb0a50d06fd6a14446227d3b30ac
2011-06-10 11:55:09 -07:00
Dan Morrill
75f27b56a6 Merge "Adding config_alwaysUseCdmaRssi. The change that added this didn't make it to master do to a merge conflict oversight." 2011-06-10 11:01:48 -07:00
Dan Morrill
5ffe6bc98d Adding config_alwaysUseCdmaRssi. The change that added this didn't make it to
master do to a merge conflict oversight.

Change-Id: I35e7b0e3ad008b2c350ce720848d1b91e2e9fc5b
2011-06-10 10:53:43 -07:00
Justin Ho
b2ba51e6de am e9f203e4: am 9b0a8f9a: am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
* commit 'e9f203e44363f0ee035aa2cd6aad3d5680e6c94f':
  Updating default wallpaper of large devices to match xlarge
2011-06-10 10:32:10 -07:00
Elliott Hughes
8e26790444 de_DE "Mai" isn't an abbreviation.
Change-Id: I5cf493bacf5082a67e3dfe7629b062e9a47e3773
2011-06-10 10:20:21 -07:00
Ben Komalo
2447edd85b New device policy to disable camera.
This introduces a new policy that a DeviceAdmin can use to disable _all_
cameras on the device. A separate CL will be made on the media side to
watch this policy bit and act accordingly.

Bug: 4185303
Change-Id: I700cfc4a8317bb74087ccae39346d74467fc58b2
2011-06-10 09:37:17 -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
Ben Murdoch
179c87f6e6 Merge WebKit at r84325: Update user agent string.
Change-Id: I927bd1cfadb3cc5b68f93f761d4d82cdc4f54439
2011-06-10 15:07:51 +01:00
Adam Powell
81cf3ecade Action buttons now use themable style.
Obey action view layoutparams.

Change-Id: Ia466008465b57659615fbf9d450ce3fdb3c06379
2011-06-09 22:01:16 -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
Dianne Hackborn
a8d7ea067c am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
* commit '220cd77de62956eb76c5084e1d1341d69bfd214a':
  Enforce public resource restriction on bag parents.
2011-06-09 16:02:02 -07:00