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

3208 Commits

Author SHA1 Message Date
Scott Main
44b48a377d am db76388e: am 9a05cfe5: docs: update docs for new screen support attributes and qualifiers 
* commit 'db76388e9af0019842ea2cca0b14d11f2e146d1a':
  docs: update docs for new screen support attributes and qualifiers
 2011-06-23 12:51:49 -07:00
Scott Main
db76388e9a am 9a05cfe5: docs: update docs for new screen support attributes and qualifiers 
* commit '9a05cfe5427a6cee988333e0d65f17b9854554a3':
  docs: update docs for new screen support attributes and qualifiers
 2011-06-23 12:26:33 -07:00
Scott Main
9a05cfe542 docs: update docs for new screen support attributes and qualifiers 
Change-Id: I8fdfd90e5d7970bdbb72e0b3271f047f5ed300ee
 2011-06-23 11:35:07 -07:00
Robert Greenwalt
0e0a759734 am 1d6ffd73: Merge "Restrict access to protected networks." into honeycomb-LTE 
* commit '1d6ffd7339c3dfa53de19e27ca09e57233cc25ef':
  Restrict access to protected networks.
 2011-06-23 08:19:48 -07:00
Robert Greenwalt
50393202f3 Restrict access to protected networks. 
Some networks should only be brought up and controlled by system apps.

bug: 4585677
Change-Id: I61b1ee3dcfca0ee54387cecffe5198a0b010d98b
 2011-06-22 16:35:12 -07:00
Robert Greenwalt
7a652bc86a resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp 
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713
 2011-06-20 12:15:24 -07:00
Robert Greenwalt
ccf83af101 Fix tethering upstream determination. 
Used to use iface names, but on mobile ifaces are multipurpose.
Refined to use ConnectivityService types.
bug:4530116

Change-Id: Iaa632d5f540d27ffff683bd7d94f8004bf422e71
 2011-06-20 11:09:23 -07:00
Maarten Hooft
769bf5d59e am 42781a11: am d76baeb4: Merge "Import revised Croatian translations." into gingerbread 
* commit '42781a11ce9e346a24fbb6214f8f214845464213':
  Import revised Croatian translations.
 2011-06-16 15:55:14 -07:00
Maarten Hooft
42781a11ce am d76baeb4: Merge "Import revised Croatian translations." into gingerbread 
* commit 'd76baeb4d836c33cc68cbb0c2e237c066f368529':
  Import revised Croatian translations.
 2011-06-16 15:48:55 -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 Wang
ff42c04d15 Merge "Support SIM permanently disabled state." into honeycomb-LTE 2011-06-16 11:22:53 -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
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
Eric Fischer
5f0c1d2ad8 Import revised Croatian translations. 
Change-Id: I9fb9bf6796d19e4b419381a0dd398f53bf2e879f
 2011-06-15 12:10:52 -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
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
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
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
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
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
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
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
Dianne Hackborn
426431adcc Enforce public resource restriction on bag parents. 
Need to put some more styles in the SDK to avoid breaking apps.

Also, welcome Android 3.2.

Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
 2011-06-09 15:27:39 -07:00
Dan Morrill
c2e1e32908 am a1a107b8: Merge "Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it." into gingerbread 
* commit 'a1a107b8cb8cbb7eea796f375eb72958e8b148e3':
  Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it.
 2011-06-09 14:52:40 -07:00
Justin Ho
e9f203e443 am 9b0a8f9a: am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 
* commit '9b0a8f9a92b7b4579ecf5973d3fe61da7950fa93':
  Updating default wallpaper of large devices to match xlarge
 2011-06-09 12:50:10 -07:00
Justin Ho
9b0a8f9a92 am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 
* commit '1d3173c3dc93bb4f2efc5b059fec8e7577b3258a':
  Updating default wallpaper of large devices to match xlarge
 2011-06-09 10:22:17 -07:00
Justin Ho
3116496837 Updating default wallpaper of large devices to match xlarge 
Change-Id: I3fbcefce70e862fdc8e332f919485f1ec904a1b1
 2011-06-09 09:42:22 -07:00
Dan Morrill
e33fc82cc9 Adding a new config value used to tell StatusBarPolicy to always use CDMA 
signal strength value even when on EVDO. Default is off, but devices that need
to can override it.

Change-Id: I675af3f3ecfe34a72954ae8241965b0a882edbb8
 2011-06-08 21:58:06 -07:00
John Wang
3948a2b420 am 735463d1: Merge "Fix layout issue on Xoom when device thinks there\'s a SIM." into honeycomb-LTE 
* commit '735463d1d9a1e490fa6b30d4273d24fc2f12bcd9':
  Fix layout issue on Xoom when device thinks there's a SIM.
 2011-06-08 19:41:39 -07:00
John Wang
735463d1d9 Merge "Fix layout issue on Xoom when device thinks there's a SIM." into honeycomb-LTE 2011-06-08 19:37:56 -07:00
Jim Miller
b0cdc2baa5 Fix layout issue on Xoom when device thinks there's a SIM. 
bug:4411799
Change-Id: I2c7deff557bcd226444730401c8347ea3d6cab56
 2011-06-08 18:48:58 -07:00
Adam Powell
fb339016ff am 73d54e7b: am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2 
* commit '73d54e7b54f95401ad290bf9d305cad449db7ae3':
  Public styles for action bar tabs
 2011-06-08 17:16:16 -07:00
Adam Powell
73d54e7b54 am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2 
* commit '4381f6421ca408d1dc66430ddfb107c5011bfe25':
  Public styles for action bar tabs
 2011-06-08 16:58:35 -07:00
Adam Powell
1a4678b93f Public styles for action bar tabs 
Change-Id: Id77d32c6d83ea72662ae8972710860f5fe42e617
 2011-06-08 15:13:50 -07:00
Jake Hamby
7d259626d0 resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp 
Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2
 2011-06-07 15:01:50 -07:00
John Wang
1f8665895f am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 
* commit '71030e536522449f34dc584fda94f34e7be6ee19':
  Add SIM PUK unlockscreen.
 2011-06-07 13:16:09 -07:00
John Wang
71030e5365 Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 2011-06-07 12:56:49 -07:00
Adam Powell
a7d01a7519 am 212d15c7: am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public. 
* commit '212d15c746f2611339026c16e5fa1aeb7f9090b7':
  Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
 2011-06-07 11:36:32 -07:00
Adam Powell
212d15c746 am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public. 
* commit 'a476813dccec241632810c1cbb11bcfbf17841b0':
  Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
 2011-06-07 11:32:23 -07:00
John Wang
0f7b3f8ba5 Add SIM PUK unlockscreen. 
Puk unlockscreen is implemented as SimPukUnlockScreen.

Added config_enable_puk_unlock_screen to control the display of puk unlock screen.

Using config_voice_capable to control the display of emergency call button.

bug:4384956

Change-Id: I2b8256b4ecdf3d4f1e85c4e868fac1810cfd29be
 2011-06-07 10:12:38 -07:00
Adam Powell
a476813dcc Make Theme.Holo.Light.NoActionBar and 
Theme.Holo.Light.NoActionBar.Fullscreen public.

Change-Id: I623b5908b080e8703b825707a024fa922cd954ab
 2011-06-07 10:11:59 -07:00
Jake Hamby
0cb17a52ee resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp 
Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275
 2011-06-06 15:33:37 -07:00
Nick Pelly
92279c0fa1 Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 2011-06-06 11:52:21 -07:00
TK MUN
51704fc9c2 am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection 
* commit 'cecb710a6de249a3847da2f07464a1aecf9459ac':
  Allow control over search order for tethering upstream interface selection
 2011-06-06 11:51:22 -07:00