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

49630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
1431fd98b1 cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb 
Conflicts:

	docs/html/sdk/sdk_toc.cs

Change-Id: I03be3486734960c4c691d4d2abe6b17c5114b1a9
 2011-06-14 11:26:39 -07:00
Dianne Hackborn
c5193c6285 Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 2011-06-14 11:24:29 -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
Robert Ly
ef18aea78d cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac 
Change-Id: I7a1ca07b5aac9979b710e78b4d0e33f78ac18cee
 2011-06-14 11:21:30 -07:00
Robert Ly
de50cace6e cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d 
Change-Id: I88d74001d58176ac9ca24265512d92646c345488
 2011-06-14 11:20:33 -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
Dianne Hackborn
ce67da79e7 Update resources documentation with new qualifiers. 
Change-Id: I4a3e0d3ece64d8a177157e469c39dbb282094373
 2011-06-13 22:01:13 -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
Mathias Agopian
c031afc8e9 am 77079399: am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
* commit '77079399fca3e9c71e2ac06f3da26934e1c278b9':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-13 14:15:00 -07:00
Mathias Agopian
77079399fc am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
* commit 'a9c9a4baf24700e8817d47d8ea8da1742caea0b5':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-13 14:13:21 -07:00
Mathias Agopian
afffa8fa9f fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
Bug: 4595257
Change-Id: I4773cf4fe59b2509db0ed733739eb6961d473b25
 2011-06-13 13:58:34 -07:00
Mathias Agopian
a9c9a4baf2 fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
Bug: 4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
 2011-06-13 13:44:28 -07:00
Jean-Baptiste Queru
c793f521e5 Merge/Ignore 653fd9cf 
Change-Id: Ia17ee5cace2d97d87de821a82d4412f6e60aac65
 2011-06-13 12:25:38 -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
Dan Morrill
653fd9cfac am 8688d470: Moving flag to a member field instead of a stack variable. 
* commit '8688d4708117db446d6ba2855f1d8ad715bb4d72':
  Moving flag to a member field instead of a stack variable.
 2011-06-11 09:52:50 -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
db26be1fa6 am 5fe24ec7: am 8daefb9c: Fix layout issue on table when device thinks there\'s a SIM. 
* commit '5fe24ec77d183774dfb06262b80b32be608480c7':
  Fix layout issue on table when device thinks there's a SIM.
 2011-06-10 17:43:37 -07:00
Jim Miller
5fe24ec77d am 8daefb9c: Fix layout issue on table when device thinks there\'s a SIM. 
* commit '8daefb9c63cce5e0a87ba38c40dd4f48be3809e1':
  Fix layout issue on table when device thinks there's a SIM.
 2011-06-10 17:41:20 -07:00
John Wang
cc44bea040 am 2addaf97: Merge "Add toString for IccCard Status and App." into honeycomb-LTE 
* commit '2addaf97b319e257677ac3e5bbb772ba40cfa78a':
  Add toString for IccCard Status and App.
 2011-06-10 17:28:11 -07:00
John Wang
2addaf97b3 Merge "Add toString for IccCard Status and App." into honeycomb-LTE 2011-06-10 17:19:42 -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
Robert Greenwalt
75612e9c3f am 1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE 
* commit '1ea549e8990d2d73ccd9e92db1e7312423ee423e':
  CDMALTE: Get roaming status based on SID/NID
 2011-06-10 14:13:25 -07:00
Robert Greenwalt
1ea549e899 Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE 2011-06-10 14:08:28 -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
Dan Morrill
8688d47081 Moving flag to a member field instead of a stack variable. 
Change-Id: I2b281ec4d424f2c4286fb0bc8db263e3893ad898
 2011-06-10 10:44:01 -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
15e9d474d1 am 88748e6d: am d86302df: Quiet the log. 
* commit '88748e6dc0151916f6bd19ffde8ba96fe8fd0a87':
  Quiet the log.
 2011-06-10 07:46:27 -07:00
Dianne Hackborn
f14dff1219 am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles. 
* commit 'c6adfed6dcea8482e482db58bd396ea8de08426a':
  Okay *now* really enforce the limit on non-public styles.
 2011-06-10 07:45:38 -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
John Wang
c7a58b4de0 Add toString for IccCard Status and App. 
Enhance the debug info for GET_SIM_STATUS. Print out the
Card status and App status instead of Object id. It helps
to debug PUK lock and other SIM related issues.

Change-Id: I489f3933529a9719827a8799c41de8e999db6b40
 2011-06-09 19:10:12 -07:00
Dianne Hackborn
88748e6dc0 am d86302df: Quiet the log. 
* commit 'd86302df0eb5eb013f7521137eabdbfea4a3a867':
  Quiet the log.
 2011-06-09 17:40:08 -07:00
Dianne Hackborn
d86302df0e Quiet the log. 
Change-Id: Ie814b579997bb555eae014c22da0f41f1a46940f
 2011-06-09 17:37:00 -07:00
Dianne Hackborn
c6adfed6dc am f795e9a8: Okay *now* really enforce the limit on non-public styles. 
* commit 'f795e9a86d4f62e5314ef95978c3ea17d90975db':
  Okay *now* really enforce the limit on non-public styles.
 2011-06-09 17:28:00 -07:00
Kazuhiro Ondo
3fc9055c7f CDMALTE: Get roaming status based on SID/NID 
Change-Id: Iec70f2036c1c698331696ff9869bfb057604c637
 2011-06-09 16:42:18 -07:00
Dianne Hackborn
9980043e93 am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build. 
* commit '820caf7b04f1e5c83599437e9e783e91322eb4f9':
  Ummm...  f*, stop breaking the build.
 2011-06-09 16:18:07 -07:00
Dianne Hackborn
f795e9a86d Okay *now* really enforce the limit on non-public styles. 
Change-Id: Ie8df6acf7cc3dec00f615b2fa9a5122ec79a0aae
 2011-06-09 16:17:53 -07:00
Dianne Hackborn
820caf7b04 am 8821ba86: Ummm... f*, stop breaking the build. 
* commit '8821ba860693f5206c56ae727a4231e4d6f0a735':
  Ummm...  f*, stop breaking the build.
 2011-06-09 16:14:12 -07:00
Dianne Hackborn
8821ba8606 Ummm... f*, stop breaking the build. 
Change-Id: I6a42cb60e7cebda6d17222e6af1f327889323c40
 2011-06-09 16:09:15 -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
220cd77de6 Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 2011-06-09 15:55:54 -07:00