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

109305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
623c734d87 Merge "Remove stopping activity from activities to stop" 2013-07-22 20:47:10 +00:00
Svetoslav Ganov
26bd5f1d3a Merge "Implement persistence/restoring of print spooler state." 2013-07-22 20:08:16 +00:00
Svetoslav Ganov
88d199130d Implement persistence/restoring of print spooler state. 
1. Implemented the persistence and restoring of the print spooler state.
   The print spooler state is saved as an XML on every print job change
   and is restored when we bind to the spooler. The system does not
   unbind from the spooler until the state persistence completes. We
   are now storing the entire state, i.e. all print jobs, when a single
   one changes. This is not optimal but we are not expecting to have
   many such at the same time, so for now we err for simplicity of
   implementation.

2. Enforcing a non-empty print job name.

3. Hidden the STATE_CREATED print job state which should never be visible to a
   client since this is the state of a print job during construction, i.e. the
   print dialog is up and we are doing back and forth with the app.

4. Fixed some PrintAttributes APIs that were incorrectly taking in a PackageManager
   instance.

5. Updated the PrintSpooler build file due to splitting the framework into multiple
   jars.

Change-Id: I52c88eaa1ec9c64920359cc143c79832a4c3d25b
 2013-07-22 13:07:09 -07:00
Craig Mautner
8817610747 Remove stopping activity from activities to stop 
When stopping an activity remove it from the list of activities to
be stopped when idle. Otherwise the activity gets stopped twice, at
the point of the fix here and later when idle.

Fixes bug 9755054.

Change-Id: If8d2249b75aeb9f8b6cea2d883046f3ad4c2e067
 2013-07-22 12:57:51 -07:00
Craig Mautner
36ceea801b Merge "Restore nav bar position when wm size is reset." 2013-07-22 18:13:09 +00:00
Craig Mautner
d4ec332428 Restore nav bar position when wm size is reset. 
The mNavigationBarCanMove variable was not reset when the dimensions
were restored using 'adb shell wm size reset'. This change restores
the correct value to it.

Fixes bug 9885741.

Change-Id: I6c9d3107fbc8a1e7acc0249691f4542cd8c07e93
 2013-07-22 10:37:43 -07:00
Joe Fernandez
7bfddb5434 am d8aae485: am abbcf372: am 60c4b16e: Merge "docs: NDK r9 Release Notes" into jb-mr2-dev 
* commit 'd8aae485bab2e17ba1321615351840ed587a8047':
  docs: NDK r9 Release Notes
 2013-07-22 09:21:58 -07:00
Joe Fernandez
d8aae485ba am abbcf372: am 60c4b16e: Merge "docs: NDK r9 Release Notes" into jb-mr2-dev 
* commit 'abbcf372b8aadd8ac53de5f25d4d82b2d57eaeaf':
  docs: NDK r9 Release Notes
 2013-07-22 09:19:18 -07:00
Joe Fernandez
abbcf372b8 am 60c4b16e: Merge "docs: NDK r9 Release Notes" into jb-mr2-dev 
* commit '60c4b16e28748d235d3b7c73906522b2c43d84a5':
  docs: NDK r9 Release Notes
 2013-07-22 09:16:07 -07:00
Joe Fernandez
60c4b16e28 Merge "docs: NDK r9 Release Notes" into jb-mr2-dev 2013-07-22 16:13:20 +00:00
Chet Haase
07cb345877 am 09a68ac9: am dbc51de4: am 53771e5f: Merge "Remove useless/repetitive code" 
* commit '09a68ac943e0d21ad61a94ed4eac1d6099657602':
  Remove useless/repetitive code
 2013-07-22 09:05:13 -07:00
Chet Haase
09a68ac943 am dbc51de4: am 53771e5f: Merge "Remove useless/repetitive code" 
* commit 'dbc51de44fe4f9a7f81528204250de32ec405d39':
  Remove useless/repetitive code
 2013-07-22 09:02:06 -07:00
Chet Haase
dbc51de44f am 53771e5f: Merge "Remove useless/repetitive code" 
* commit '53771e5f955f67035cf6b6432c34171a18ab14dc':
  Remove useless/repetitive code
 2013-07-22 08:59:30 -07:00
Chet Haase
53771e5f95 Merge "Remove useless/repetitive code" 2013-07-22 15:55:52 +00:00
Glenn Kasten
70c17f4703 Merge "Inform AudioFlinger of device's low RAM attribute" 2013-07-22 15:02:29 +00:00
Guang Zhu
bc668ac4b7 fix build 
Change-Id: Ie4bd7c3fe9320d22b7da2962e5e5a4abca510bd2
 2013-07-21 02:01:34 -07:00
Christopher Tate
d55e18ecea Merge "Add AlarmManager.setWindow(...) for supplying an explicit delivery window" 2013-07-20 01:56:17 +00:00
Jim Miller
37ee2647d4 Merge "Fix keyguard layout on hdpi devices" 2013-07-20 01:52:08 +00:00
Jim Miller
99054020b8 Fix keyguard layout on hdpi devices 
This reduces the size of the security area slightly to give
the widget more room.

Fixes bug 9642579

Change-Id: I58b861def932450901b17d6df74958dde8207769
 2013-07-19 18:37:12 -07:00
Christopher Tate
57ceaaa0aa Add AlarmManager.setWindow(...) for supplying an explicit delivery window 
Bug 9532215

Change-Id: I0efe32cbaaae8ce6ab223041eed116c3470a7326
 2013-07-19 18:11:45 -07:00
Mathias Agopian
d84feebba4 Merge "update to new Consumer APIs" 2013-07-20 01:03:22 +00:00
Colin Cross
4908d181ca Fix FrameworkPermissionTests build 
Change-Id: I516e333ca85c0e3c08c8fffc157a9e0360af02e5
 2013-07-19 17:26:54 -07:00
Dianne Hackborn
450d8c5b7c Fix issue #9940105: IllegalArgumentException in ArrayMap 
Try to deal with unmarshalling old parcels.  Turns out someone
was writing a parcel to disk storing a Bundle.  Naughty, naughty.
This helps us not completely keel over.

Change-Id: Id343da2690b7bab89f6c3cb6fad1b92f270dad03
 2013-07-19 17:05:30 -07:00
Joe Fernandez
bdbe56f6a8 docs: NDK r9 Release Notes 
Change-Id: I43cae1e306a8313ab2d003dbb762977f75bf8208
 2013-07-19 17:04:02 -07:00
Svetoslav
597945fd3a First pass of the print dialog UX 
Change-Id: I315a16d7f68c73ca180c76e722847b4b1bdea55b
 2013-07-19 16:23:12 -07:00
Michael Wright
7a5480d6d7 Merge "Debounce touch navigation taps and button presses" 2013-07-19 23:15:05 +00:00
Craig Mautner
acb837fe63 Merge "Fix home activity and user switch interactions." 2013-07-19 23:07:51 +00:00
Craig Mautner
ac6f843c91 Fix home activity and user switch interactions. 
- Make sure Home activity goes in the correct task and on the correct
stack.
- Do not allow different users to be in the same task.
- Do not set stacks aside for each user.

Fixes bug 9775492.

Change-Id: I0e7954e917aac8482a1015a36923e02914e2b692
 2013-07-19 16:05:59 -07:00
The Android Open Source Project
5fe91c4cb3 am c02fcf81: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit 'c02fcf81462346ee6fe3fca8eb4594344b13ddf7':
  Add gservices updater for carrier provisioning url
  Cleaner Tejat notification in Audio Package 11
  When a SIM is changed check mobile provisioning.
  Fix missing lock in power manager.
  Remove iterators (DO NOT MERGE)
 2013-07-19 16:02:25 -07:00
Michael Wright
7caaeeb6a8 Merge "Add input device property for buttons under touchpads" 2013-07-19 22:45:51 +00:00
Michael Wright
c5236deeb0 Merge "Properly set the tap down time when entering non-tap modes" 2013-07-19 22:44:57 +00:00
Michael Wright
5712ca7f2e Merge "Allow duration without source to be set for input commands" 2013-07-19 22:44:01 +00:00
Christopher Tate
a5bc070e9e Merge "EWRONGVARNAME" 2013-07-19 21:54:50 +00:00
Christopher Tate
e982faffc9 EWRONGVARNAME 
Bug 9940349

Change-Id: I60205899cd33070394752fc4b2f1e0cf6a2d9192
 2013-07-19 14:52:49 -07:00
Joe Fernandez
5846f7c9d8 am b9aa1789: am 379cb6b7: am ab00d352: am 658374d5: am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev 
* commit 'b9aa1789ee221c45bd3c01bae4ae99d7965c1437':
  docs: Android SDK 22.0.4 Release Notes
 2013-07-19 14:40:01 -07:00
Robert Greenwalt
bfc7634b36 resolved conflicts for merge of f9774dc7 to master 
Change-Id: Ia9509ab6897e27da8bf4fc61a4140f2f93acb80f
 2013-07-19 14:30:49 -07:00
Scott Main
a29447e142 am 8b5f79a0: am a74517d2: am ca3b4e9b: remove significant motion 
* commit '8b5f79a0cb72af51a057c27ca3f0511076577e1f':
  remove significant motion
 2013-07-19 14:22:14 -07:00
Scott Main
612e67eb44 am a12d5e0d: am 52a74a21: am 1be76349: Merge "more details about account access in restricted profiles" into jb-mr2-dev 
* commit 'a12d5e0dcab49fb02cac3e7982f1ad0ecf170a40':
  more details about account access in restricted profiles
 2013-07-19 14:22:12 -07:00
Scott Main
f5218a8fff am 8d6d93c3: am 1cf7b4a4: am d3ed45f8: am 991487c6: am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev 
* commit '8d6d93c3b2ed41324d2bcf8bbfc4c5a3b5d6416e':
  fix typo in code sample
 2013-07-19 14:22:09 -07:00
Dirk Dougherty
2289382cfa am 64127efb: am 46cc4dbb: am e0380d8f: resolved conflics for merge of 54201120 to jb-mr2-dev 
* commit '64127efbe65f73a01cf15366e08406bf7cb537d9':
  Doc change: Add Colopl video to carousel and spotlight.
 2013-07-19 14:22:06 -07:00
The Android Open Source Project
c02fcf8146 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I1d7f0e0f6a4cb8b9363c99a830dc1656424ad49d
 2013-07-19 14:20:43 -07:00
Robert Greenwalt
538cdb98ef resolved conflicts for merge of 85b5e4c4 to master 
Change-Id: Idd0ad9b1504fddf68c4c4cc04731de1eddd204b3
 2013-07-19 14:09:30 -07:00
Jean-Michel Trivi
f40a0535ac am a8f7659a: am f65c9189: am bbc9a62a: Cleaner Tejat notification in Audio Package 11 
* commit 'a8f7659aba2c9233fb61ae34dfc0d7477dc0ae91':
  Cleaner Tejat notification in Audio Package 11
 2013-07-19 13:42:39 -07:00
Wink Saville
0871ac2afb am b96cca27: am df43ba82: am e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev 
* commit 'b96cca27ba15121aab2c481786a292880c007bb6':
  When a SIM is changed check mobile provisioning.
 2013-07-19 13:42:36 -07:00
Deepanshu Gupta
903709d738 am 388f85eb: am a2f41b23: am bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev 
* commit '388f85eb451bd0b61c8f48b500de5db6bca941f1':
  Add orientation to configuration for layoutlib.
 2013-07-19 13:42:34 -07:00
Roman Nurik
796feda0f0 am d96c6956: am 0f33e44f: am 0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev 
* commit 'd96c6956807ca1644079a9e92d0e3af170c51c8f':
  Add Flo to device art generator.
 2013-07-19 13:42:30 -07:00
Jeff Brown
c48e0a5152 am 7afdf7f0: am 2445880c: am ba8a5413: Fix missing lock in power manager. 
* commit '7afdf7f0514bebe1188e0c1bc60e76f853065e82':
  Fix missing lock in power manager.
 2013-07-19 13:42:27 -07:00
Craig Mautner
1305bf7dc2 am 70eac41f: (-s ours) am a64325f6: am 7c6be10d: Remove iterators (DO NOT MERGE) 
* commit '70eac41f7044552305beae86eb0978cd74724ecf':
  Remove iterators (DO NOT MERGE)
 2013-07-19 13:42:24 -07:00
Joe Fernandez
b9aa1789ee am 379cb6b7: am ab00d352: am 658374d5: am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev 
* commit '379cb6b7f0f62009caeeda00a05d3185bc06b8aa':
  docs: Android SDK 22.0.4 Release Notes
 2013-07-19 13:38:02 -07:00
Robert Greenwalt
f9774dc796 am ddf17b5b: am 8c87b297: Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev 
* commit 'ddf17b5b82f25965502377588483abbc328c4e6d':
  Make CS.isTetheringSupported dynamic
 2013-07-19 13:37:58 -07:00