Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,949 Commits 3 Branches 0 Tags
1a4ebd42e2abbce86fcbdb0b68b2229892a4e8a5
Commit Graph

862 Commits

Author SHA1 Message Date
Jim Miller
1a4ebd42e2 am cfa2d7c9: am 700a9506: am cb52cb52: Fix SDK build. 2010-06-08 10:15:27 -07:00
Jim Miller
aed22d27bb am a9a0a0b2: am 7d70358a: am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 2010-06-08 10:15:21 -07:00
Jim Miller
700a95068e am cb52cb52: Fix SDK build. 
Merge commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0' into kraken

* commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0':
  Fix SDK build.
 2010-06-07 21:23:53 -07:00
Jim Miller
cb52cb5225 Fix SDK build. 
On branch fix_sdk
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   core/java/android/app/KeyguardManager.java

Change-Id: I56848db098822536f0ac32efc8f0eb1d725bf6f9
 2010-06-07 21:19:16 -07:00
Jim Miller
7d70358a03 am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 
Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into kraken

* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
  Fix 2737842: disable keyguard API when device policy is enabled.
 2010-06-07 19:25:49 -07:00
Jim Miller
d6b5705e18 Fix 2737842: disable keyguard API when device policy is enabled. 
This fix disables KeyguardManager's enable/disable API when any
device policy admin requests a policy that enforces a password.

Change-Id: Idb1da16b14ed8963142f7b1f62d2b060d84ffa65
 2010-06-07 19:19:29 -07:00
Dianne Hackborn
c39a5dcbe1 Fix issue #2733766: Crash in Gallery onDestroy: java.lang.RuntimeException 
Change-Id: I1c67a6603c23d15fef9a6912c86ffdf77aaa8654
 2010-06-04 14:34:29 -07:00
Dianne Hackborn
d0b15cecc6 resolved conflicts for merge of f3307ae8 to master 
Change-Id: Ic59db363391f73343eba32894113914ceea5a963
 2010-06-04 14:09:02 -07:00
Dianne Hackborn
860755faa6 Add support for heavy-weight applications. 
Only one can be running at a time, their process can not be killed,
and a notification is posted while it is running.

Change-Id: I843015723947e0c934ae63a1aeee139327c0bc01
 2010-06-04 10:09:13 -07:00
Vasu Nori
512596d425 Merge "new API in Context. on openDatabase, new param DatabaseErrorHandler" 2010-06-03 12:42:32 -07:00
Romain Guy
f8b0f11a94 Merge "Fix memory leak in LocalActivityManager. Also properly removes embedded activities. Bug #2738247" 2010-06-03 12:39:53 -07:00
Vasu Nori
74f170f946 new API in Context. on openDatabase, new param DatabaseErrorHandler 
add new method openOrCreateDatabase in Context.java to allow
callers specify a DatabaseErrorHandler object to be used when
database corruption occurs.
add new constructor in SQLiteOpenHelper to accept DatabaseErrorHandler
as an additional param to be used when SQLiteDatabase instance is
created.

Change-Id: I912a0202a74510f9ca0206dd8101c4abab9102ae
 2010-06-03 12:38:11 -07:00
Romain Guy
d315ee93c6 Fix memory leak in LocalActivityManager. Also properly removes embedded activities. 
Bug #2738247

Change-Id: Ib75be22fde5f1408250947566c69174c6f248c98
 2010-06-03 11:03:18 -07:00
Joe Onorato
98795669b6 am 9310277c: am 798ac4c7: Start moving resources to SystemUI.apk. 2010-06-02 22:40:33 -07:00
Joe Onorato
fb1bd96ffb am ef5ce59a: am 18e69dfc: Checkpoint. Data structures for Notifications in place. 2010-06-02 22:38:43 -07:00
Joe Onorato
37166e6d7e am ff97998a: am 4762c2d7: Add expand and collapse. 2010-06-02 22:38:20 -07:00
Joe Onorato
60a83af048 am ee5d0caf: am f3f0e053: Make disable() work. 2010-06-02 22:38:10 -07:00
Joe Onorato
e635a6bcc1 am 12cd606d: am 0cbda99f: The status bar draws its icons now. 2010-06-02 22:37:04 -07:00
Joe Onorato
eec1329048 am 627cfa94: am 90233a1e: Add IStatusBar 2010-06-02 22:36:11 -07:00
Joe Onorato
51b3c2f25f am e0b2ae11: am 25f95f92: Rename IStatusBar to IStatusBarService. 2010-06-02 22:35:58 -07:00
Joe Onorato
eeb42c4ebd am 2cbaf806: am 2314aab5: First pass at splitting the status bar for the different devices. 2010-06-02 22:35:46 -07:00
Joe Onorato
798ac4c7d7 Start moving resources to SystemUI.apk. 
Change-Id: Ibf30b8196d65d7fbca1177968cefa5f7a875bf1d
 2010-06-02 14:48:45 -07:00
Joe Onorato
18e69dfc72 Checkpoint. Data structures for Notifications in place. 
Change-Id: I146fb9bc1d349112541368e2c99a667821dfdf6e
 2010-06-02 14:48:43 -07:00
Joe Onorato
4762c2d75a Add expand and collapse. 
Change-Id: I58ad95c59b2c46d3f25349e137d5624aefc6c6cd
 2010-06-02 14:48:42 -07:00
Joe Onorato
f3f0e053f0 Make disable() work. 
Change-Id: I93fea37e777b3e04fe7f9171d5b84821587c24f5
 2010-06-02 14:48:42 -07:00
Joe Onorato
0cbda99f87 The status bar draws its icons now. 2010-06-02 14:48:41 -07:00
Joe Onorato
90233a1ee5 Add IStatusBar 
Change-Id: Ie73d665085d5ce7358c285bf332ef1dc96005d0f
 2010-06-02 14:48:40 -07:00
Joe Onorato
25f95f9200 Rename IStatusBar to IStatusBarService. 
Change-Id: Icfec2a830f037b21f6afaa796bf49da610567e7b
 2010-06-02 14:48:40 -07:00
Joe Onorato
2314aab506 First pass at splitting the status bar for the different devices. 
Change-Id: I2f568df92f88dfe8de18d24dd004239f52761aa6
 2010-06-02 14:48:39 -07:00
The Android Open Source Project
76b704982a am 8f1259be: am b705eea7: am 1bd7597b: merge from open-source master 2010-06-02 09:06:34 -07:00
The Android Open Source Project
b705eea702 am 1bd7597b: merge from open-source master 
Merge commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0' into kraken

* commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0':
  Replaced raw string arguments for Context.getSystemService() with final Context variables
 2010-06-02 09:03:04 -07:00
The Android Open Source Project
ed06eccce0 am afca60dd: am 59c82376: am c8763858: merge from open-source master 2010-06-02 08:58:37 -07:00
The Android Open Source Project
59c82376e5 am c8763858: merge from open-source master 
Merge commit 'c8763858cfcae8be89c0f88df87bf9a3ad90ae64' into kraken

* commit 'c8763858cfcae8be89c0f88df87bf9a3ad90ae64':
  Fix for issue 895 (missing android: prefix), Removed unused imports
 2010-06-02 08:54:59 -07:00
The Android Open Source Project
1bd7597b8c merge from open-source master 
Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb
 2010-06-02 08:54:47 -07:00
The Android Open Source Project
c8763858cf merge from open-source master 
Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6
 2010-06-02 08:41:59 -07:00
Christian Mehlmauer
ef367529f9 Replaced raw string arguments for Context.getSystemService() with final Context variables 
Change-Id: If5139a1526101292e5da557bfad3f4db80fb64a8
 2010-05-31 23:08:30 +02:00
Konstantin Lopyrev
a15dcfaf2b Fix 2677197: Adding minimum complex character support. 
Change-Id: I520bc5f9aa924bf9b5585b2235a91cc96cb99c25
 2010-05-27 15:27:06 -07:00
Konstantin Lopyrev
3255823de0 Fix 2673731: Adding support for password history to Device Admin. 
Change-Id: If3240048813e32b2bae79fe5cb8a73aea20ec56c
 2010-05-24 17:13:18 -07:00
Christian Mehlmauer
d6c1919779 Fix for issue 895 (missing android: prefix), Removed unused imports 
Change-Id: I5eeca1db7eb97251729dff728b4c482de4b14885
 2010-05-21 19:02:48 +02:00
Dianne Hackborn
cddfa6de1f Fix sdk build. 
Change-Id: I4106de6c85d69a68d80414db5dbf5cf48685ce54
 2010-05-19 22:56:37 -07:00
Dianne Hackborn
5ae74d6e89 More fragment work. 
Clean up FragmentTransaction API, add more animation control, add new
Fragment APIs for hiding and showing.

Change-Id: Iffe31351024a7a63d164270b8a955a499076600e
 2010-05-19 19:25:38 -07:00
Dianne Hackborn
b269735ca0 am 4a30bcf7: am 74323fd1: Update NativeActivity to allow direct surface access. 2010-05-18 18:28:57 -07:00
Dianne Hackborn
74323fd1ab Update NativeActivity to allow direct surface access. 
No actual native API for using a surface, but it's a step.

Change-Id: I627f26b705abc7a05edf9117411abfacf0fae64a
 2010-05-18 18:16:35 -07:00
Jeff Hamilton
9911b7f83d Add the Loader and supporting classes. 
Loaders are designed to make it easier to manage
asynchronously loading data.

Change-Id: I948db08c721411e94fca071dc6fb4db2b83ea4d6
 2010-05-18 00:07:15 -05:00
Scott Main
060341fa2d am 33c06f91: am 6c034325: am 6d8e4fd8: am b83a283a: docs: add dev guide for backup 2010-05-14 11:59:04 -07:00
Scott Main
6c034325a8 am 6d8e4fd8: am b83a283a: docs: add dev guide for backup 
Merge commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf' into kraken

* commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf':
  docs: add dev guide for backup
 2010-05-14 11:56:14 -07:00
Scott Main
b83a283ac1 docs: add dev guide for backup 
Change-Id: I168f6b15d3441c9cbea2cd9699612476c7244530
 2010-05-14 11:47:42 -07:00
Dianne Hackborn
0efa0c45a1 Merge "More fragment stuff:" 2010-05-14 11:26:40 -07:00
Dianne Hackborn
6e8304e57e More fragment stuff: 
- New startActivityForResult() API.
- Fragments now should have the correct lifecycle while hanging around
  in the back stack (not being destroyed and re-created).
- Rework of state save/restore to make it simpler and better.  In theory
  now any fragment (including layout and others in the hierarchy) can
  now be retained across config changes, though this hasn't been tested.

Change-Id: I2a7fe560e14e567f5675a2f172a23fca67b3e97f
 2010-05-14 11:22:48 -07:00
Adam Powell
a1700783b5 ActionBar - custom navigation views 
Change-Id: Ibc98565816c713474eefd4e96fb51175abfb0187
 2010-05-14 10:35:21 -07:00